mirrors/packwiz
1
0
Fork 0
mirror of https://github.com/packwiz/packwiz.git synced 2025-04-19 21:16:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Modrinth: version number resolution (fixes #103)

Browse Source
This commit is contained in:
comp500 2023-01-20 05:39:36 +00:00
parent c596179c5c
commit d57140c33a
2 changed files with 56 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
modrinth/install.go
View File

@ -39,9 +39,17 @@ var installCmd = &cobra.Command{
var projectID, versionID, versionFilename string
if projectIDFlag != "" {
projectID = projectIDFlag
if len(args) != 0 {
fmt.Println("--project-id cannot be used with a separately specified URL/slug/search term")
os.Exit(1)
}
}
if versionIDFlag != "" {
versionID = versionIDFlag
if len(args) != 0 {
fmt.Println("--version-id cannot be used with a separately specified URL/slug/search term")
os.Exit(1)
}
}
if versionFilenameFlag != "" {
versionFilename = versionFilenameFlag
@ -52,17 +60,15 @@ var installCmd = &cobra.Command{
os.Exit(1)
}
// Try interpreting the argument as a slug/project ID, or project/version/CDN URL
var version string
parsedSlug, err := parseSlugOrUrl(args[0], &projectID, &version, &versionID, &versionFilename)
if err != nil {
fmt.Printf("Failed to parse URL: %v\n", err)
os.Exit(1)
}
if version != "" && versionID == "" {
// TODO: resolve version (could be an ID, could be a version number) into ID
versionID = version
var parsedSlug bool
if projectID == "" && versionID == "" {
// Try interpreting the argument as a slug/project ID, or project/version/CDN URL
parsedSlug, err = parseSlugOrUrl(args[0], &projectID, &version, &versionID, &versionFilename)
if err != nil {
fmt.Printf("Failed to parse URL: %v\n", err)
os.Exit(1)
}
}
// Got version ID; install using this ID
@ -82,6 +88,22 @@ var installCmd = &cobra.Command{
project, err = mrDefaultClient.Projects.Get(projectID)
if err == nil {
// We found a project with that id/slug
if version != "" {
// Try to look up version number
versionData, err := resolveVersion(project, version)
if err != nil {
fmt.Printf("Failed to add project: %s\n", err)
os.Exit(1)
}
err = installVersion(project, versionData, versionFilename, pack, &index)
if err != nil {
fmt.Printf("Failed to add project: %s\n", err)
os.Exit(1)
}
return
}
// No version specified; find latest
err = installProject(project, versionFilename, pack, &index)
if err != nil {
fmt.Printf("Failed to add project: %s\n", err)

24
modrinth/modrinth.go
View File

@ -341,3 +341,27 @@ func getInstalledProjectIDs(index *core.Index) []string {
}
return installedProjects
}
func resolveVersion(project *modrinthApi.Project, version string) (*modrinthApi.Version, error) {
// If it exists in the version list, it is already a version ID (and doesn't need querying further)
if slices.Contains(project.Versions, version) {
versionData, err := mrDefaultClient.Versions.Get(version)
if err != nil {
return nil, fmt.Errorf("failed to fetch version %s: %v", version, err)
}
return versionData, nil
}
// Look up all versions
// TODO: PR a version number filter to Modrinth?
versionsList, err := mrDefaultClient.Versions.ListVersions(*project.ID, modrinthApi.ListVersionsOptions{})
if err != nil {
return nil, fmt.Errorf("failed to fetch version list for %s: %v", *project.ID, err)
}
for _, v := range versionsList {
if *v.VersionNumber == version {
return v, nil
}
}
return nil, fmt.Errorf("unable to find version %s", version)
}