piwalker/FCLauncher
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 5 Wiki Activity

replace path separators again

Browse Source
This commit is contained in:
= 2024-11-26 16:45:08 -07:00
parent d5f8881d7e
commit c34652bc4a
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
fclauncher/InstanceManager.go
View File

@ -335,13 +335,14 @@ func (i *InstanceManager) InstallFabric(instance string, fabricVersion string) {
} }
client: client:
for _, lib := range metadata.LauncherMeta.Libraries.Client { for _, lib := range metadata.LauncherMeta.Libraries.Client {
tokens := strings.Split(ProcessMavenPath(lib.Name), "/") tokens := strings.Split(ProcessMavenPath(lib.Name), string(os.PathSeparator))
pkg := tokens[len(tokens)-2] pkg := tokens[len(tokens)-2]
instanceObject.Libraries = append(instanceObject.Libraries, ProcessMavenPath(lib.Name)+"/"+ProcessMavenFilename(lib.Name)) instanceObject.Libraries = append(instanceObject.Libraries, filepath.Join(ProcessMavenPath(lib.Name), ProcessMavenFilename(lib.Name)))
for ind, path := range instanceObject.Libraries { for ind, path := range instanceObject.Libraries {
tokens := strings.Split(path, "/") path = strings.ReplaceAll(path, "/", string(os.PathSeparator))
tokens := strings.Split(path, string(os.PathSeparator))
if pkg == tokens[len(tokens)-3] { if pkg == tokens[len(tokens)-3] {
instanceObject.Libraries[ind] = ProcessMavenPath(lib.Name) + "/" + ProcessMavenFilename(lib.Name) instanceObject.Libraries[ind] = filepath.Join(ProcessMavenPath(lib.Name), ProcessMavenFilename(lib.Name))
fmt.Printf("duplicate library %s\n", pkg) fmt.Printf("duplicate library %s\n", pkg)
continue client continue client
} }
@ -349,14 +350,15 @@ client:
} }
common: common:
for _, lib := range metadata.LauncherMeta.Libraries.Common { for _, lib := range metadata.LauncherMeta.Libraries.Common {
tokens := strings.Split(ProcessMavenPath(lib.Name), "/") tokens := strings.Split(ProcessMavenPath(lib.Name), string(os.PathSeparator))
pkg := tokens[len(tokens)-2] pkg := tokens[len(tokens)-2]
instanceObject.Libraries = append(instanceObject.Libraries, ProcessMavenPath(lib.Name)+"/"+ProcessMavenFilename(lib.Name)) instanceObject.Libraries = append(instanceObject.Libraries, filepath.Join(ProcessMavenPath(lib.Name), ProcessMavenFilename(lib.Name)))
for ind, path := range instanceObject.Libraries { for ind, path := range instanceObject.Libraries {
tokens := strings.Split(path, "/") path = strings.ReplaceAll(path, "/", string(os.PathSeparator))
fmt.Printf("Inspecing path %s with %d tokens", path, len(tokens)) tokens := strings.Split(path, string(os.PathSeparator))
fmt.Printf("Inspecing path %s with %d tokens\n", path, len(tokens))
if pkg == tokens[len(tokens)-3] { if pkg == tokens[len(tokens)-3] {
instanceObject.Libraries[ind] = ProcessMavenPath(lib.Name) + "/" + ProcessMavenFilename(lib.Name) instanceObject.Libraries[ind] = filepath.Join(ProcessMavenPath(lib.Name), ProcessMavenFilename(lib.Name))
fmt.Printf("duplicate library %s\n", pkg) fmt.Printf("duplicate library %s\n", pkg)
continue common continue common
} }
@ -394,13 +396,14 @@ func (i *InstanceManager) InstallQuilt(instance string, quiltVersion string) {
} }
client: client:
for _, lib := range metadata.LauncherMeta.Libraries.Client { for _, lib := range metadata.LauncherMeta.Libraries.Client {
tokens := strings.Split(ProcessMavenPath(lib.Name), "/") tokens := strings.Split(ProcessMavenPath(lib.Name), string(os.PathSeparator))
pkg := tokens[len(tokens)-2] pkg := tokens[len(tokens)-2]
instanceObject.Libraries = append(instanceObject.Libraries, ProcessMavenPath(lib.Name)+"/"+ProcessMavenFilename(lib.Name)) instanceObject.Libraries = append(instanceObject.Libraries, filepath.Join(ProcessMavenPath(lib.Name), ProcessMavenFilename(lib.Name)))
for ind, path := range instanceObject.Libraries { for ind, path := range instanceObject.Libraries {
tokens := strings.Split(path, "/") path = strings.ReplaceAll(path, "/", string(os.PathSeparator))
tokens := strings.Split(path, string(os.PathSeparator))
if pkg == tokens[len(tokens)-3] { if pkg == tokens[len(tokens)-3] {
instanceObject.Libraries[ind] = ProcessMavenPath(lib.Name) + "/" + ProcessMavenFilename(lib.Name) instanceObject.Libraries[ind] = filepath.Join(ProcessMavenPath(lib.Name), ProcessMavenFilename(lib.Name))
fmt.Printf("duplicate library %s\n", pkg) fmt.Printf("duplicate library %s\n", pkg)
continue client continue client
} }
@ -408,13 +411,14 @@ client:
} }
common: common:
for _, lib := range metadata.LauncherMeta.Libraries.Common { for _, lib := range metadata.LauncherMeta.Libraries.Common {
tokens := strings.Split(ProcessMavenPath(lib.Name), "/") tokens := strings.Split(ProcessMavenPath(lib.Name), string(os.PathSeparator))
pkg := tokens[len(tokens)-2] pkg := tokens[len(tokens)-2]
instanceObject.Libraries = append(instanceObject.Libraries, ProcessMavenPath(lib.Name)+"/"+ProcessMavenFilename(lib.Name)) instanceObject.Libraries = append(instanceObject.Libraries, filepath.Join(ProcessMavenPath(lib.Name), ProcessMavenFilename(lib.Name)))
for ind, path := range instanceObject.Libraries { for ind, path := range instanceObject.Libraries {
tokens := strings.Split(path, "/") path = strings.ReplaceAll(path, "/", string(os.PathSeparator))
tokens := strings.Split(path, string(os.PathSeparator))
if pkg == tokens[len(tokens)-3] { if pkg == tokens[len(tokens)-3] {
instanceObject.Libraries[ind] = ProcessMavenPath(lib.Name) + "/" + ProcessMavenFilename(lib.Name) instanceObject.Libraries[ind] = filepath.Join(ProcessMavenPath(lib.Name), ProcessMavenFilename(lib.Name))
fmt.Printf("duplicate library %s\n", pkg) fmt.Printf("duplicate library %s\n", pkg)
continue common continue common
} }
@ -456,13 +460,13 @@ func (i *InstanceManager) InstallForge(instance string, forgeVersion string) {
instanceObject.ForgeVersion = forgeVersion instanceObject.ForgeVersion = forgeVersion
outer: outer:
for _, lib := range installData.Libraries { for _, lib := range installData.Libraries {
tokens := strings.Split(lib.Downloads.Artifact.Path, "/") tokens := strings.Split(lib.Downloads.Artifact.Path, string(os.PathSeparator))
pkg := tokens[len(tokens)-2] pkg := tokens[len(tokens)-2]
instanceObject.Libraries = append(instanceObject.Libraries, lib.Downloads.Artifact.Path) instanceObject.Libraries = append(instanceObject.Libraries, lib.Downloads.Artifact.Path)
for ind, path := range instanceObject.Libraries { for ind, path := range instanceObject.Libraries {
tokens := strings.Split(path, "/") tokens := strings.Split(path, string(os.PathSeparator))
if pkg == tokens[len(tokens)-3] { if pkg == tokens[len(tokens)-3] {
instanceObject.Libraries[ind] = ProcessMavenPath(lib.Name) + "/" + ProcessMavenFilename(lib.Name) instanceObject.Libraries[ind] = filepath.Join(ProcessMavenPath(lib.Name), ProcessMavenFilename(lib.Name))
fmt.Printf("duplicate library %s\n", pkg) fmt.Printf("duplicate library %s\n", pkg)
continue outer continue outer
} }

1
fclauncher/fabric.go
View File

@ -133,7 +133,6 @@ func ProcessMavenPath(maven string) string {
pack := tokens[1] pack := tokens[1]
version := tokens[2] version := tokens[2]
path = filepath.Join(path, pack, version) path = filepath.Join(path, pack, version)
path = strings.ReplaceAll(path, "\\", "/")
return path return path
} }