mirrors/packwiz
1
0
Fork 0
mirror of https://github.com/packwiz/packwiz.git synced 2025-10-22 09:14:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into pr/unascribed/258

Browse Source
This commit is contained in:
comp500
2024-08-28 18:53:47 +01:00
parent e1508134c7 4503e905d7
commit f05bbe1dd4
13 changed files with 95 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modrinth/export.go
View File

@@ -9,6 +9,7 @@ import (
"golang.org/x/exp/slices"
"net/url"
"os"
"sort"
"strconv"
"github.com/packwiz/packwiz/core"
@@ -172,6 +173,10 @@ var exportCmd = &cobra.Command{
}
}
}
// sort by `path` property before serialising to ensure reproducibility
sort.Slice(manifestFiles, func(i, j int) bool {
return manifestFiles[i].Path < manifestFiles[j].Path
})
err = session.SaveIndex()
if err != nil {

2
modrinth/modrinth.go
View File

@@ -186,7 +186,7 @@ func getProjectTypeFolder(projectType string, fileLoaders []string, packLoaders
var urlRegexes = [...]*regexp.Regexp{
// Slug/version number regex from https://github.com/modrinth/labrinth/blob/1679a3f844497d756d0cf272c5374a5236eabd42/src/util/validate.rs#L8
regexp.MustCompile("^https?://modrinth\\.com/(?P<urlCategory>[^/]+)/(?P<slug>[a-zA-Z0-9!@$()`.+,_\"-]{3,64})(?:/version/(?P<version>[a-zA-Z0-9!@$()`.+,_\"-]{1,32}))?"),
regexp.MustCompile("^https?://(www.)?modrinth\\.com/(?P<urlCategory>[^/]+)/(?P<slug>[a-zA-Z0-9!@$()`.+,_\"-]{3,64})(?:/version/(?P<version>[a-zA-Z0-9!@$()`.+,_\"-]{1,32}))?"),
// Version/project IDs are more restrictive: [a-zA-Z0-9]+ (base62)
regexp.MustCompile("^https?://cdn\\.modrinth\\.com/data/(?P<slug>[a-zA-Z0-9]+)/versions/(?P<versionID>[a-zA-Z0-9]+)/(?P<filename>[^/]+)$"),
regexp.MustCompile("^(?P<slug>[a-zA-Z0-9!@$()`.+,_\"-]{3,64})$"),