feat: parallel apply view (#47)

* feat: parallel apply view * chore: cleaner readme * chore: lint * chore: remove debug logging * chore: lint
satisfactorymodding · Dec 13, 2023 · b6592fe · b6592fe
1 parent 98b7c99
commit b6592fe
Show file tree

Hide file tree

Showing 23 changed files with 572 additions and 366 deletions.
diff --git a/.envrc b/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/.github/screenshot.png b/.github/screenshot.png
diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
@@ -10,7 +10,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.21
+          go-version: 1.21.4
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
@@ -33,7 +33,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.21
+          go-version: 1.21.4
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
@@ -47,7 +47,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.54
+          version: v1.55.2
           skip-pkg-cache: true
           skip-build-cache: true
 
@@ -62,7 +62,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.21
+          go-version: 1.21.4
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2

diff --git a/.gitignore b/.gitignore
@@ -127,4 +127,5 @@ dist/
 /testdata
 /.graphqlconfig
 schema.graphql
-*.log
+*.log
+.direnv
diff --git a/.golangci.yml b/.golangci.yml
@@ -50,7 +50,6 @@ linters:
     - contextcheck
     - durationcheck
     - errorlint
-    - goconst
     - goimports
     - revive
     - misspell

diff --git a/README.md b/README.md
@@ -1,7 +1,11 @@
+<img align="right" width="310" src="./.github/screenshot.png" />
+
 # ficsit-cli [![push](https://github.com/Vilsol/ficsit-cli/actions/workflows/push.yaml/badge.svg)](https://github.com/Vilsol/ficsit-cli/actions/workflows/push.yaml) ![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/vilsol/ficsit-cli) ![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/vilsol/ficsit-cli) [![GitHub license](https://img.shields.io/github/license/Vilsol/ficsit-cli)](https://github.com/Vilsol/ficsit-cli/blob/master/LICENSE) ![GitHub all releases](https://img.shields.io/github/downloads/vilsol/ficsit-cli/total)
 
 A CLI tool for managing mods for the game Satisfactory
 
+---
+
 ## Installation
 
 <table>
@@ -49,14 +53,21 @@ A CLI tool for managing mods for the game Satisfactory
     <td><a href="https://github.com/Vilsol/ficsit-cli/releases/latest/download/ficsit_linux_armv7.apk">armv7</a></td>
     <td><a href="https://github.com/Vilsol/ficsit-cli/releases/latest/download/ficsit_linux_ppc64le.apk">ppc64le</a></td>
   </tr>
+  <tr>
+    <th>Linux</th>
+    <td><a href="https://github.com/Vilsol/ficsit-cli/releases/latest/download/ficsit_linux_amd64">amd64</a></td>
+    <td><a href="https://github.com/Vilsol/ficsit-cli/releases/latest/download/ficsit_linux_386">386</a></td>
+    <td><a href="https://github.com/Vilsol/ficsit-cli/releases/latest/download/ficsit_linux_arm64">arm64</a></td>
+    <td><a href="https://github.com/Vilsol/ficsit-cli/releases/latest/download/ficsit_linux_armv7">armv7</a></td>
+    <td><a href="https://github.com/Vilsol/ficsit-cli/releases/latest/download/ficsit_linux_ppc64le">ppc64le</a></td>
+  </tr>
   <tr>
     <th>macOS</th>
     <td colspan="4" style="text-align: center"><a href="https://github.com/Vilsol/ficsit-cli/releases/latest/download/ficsit_darwin_all">darwin_all</a></td>
     <td>N/A</td>
   </tr>
 </table>
 
-
 ## Usage
 
 ### Interactive CLI

diff --git a/cli/cache/download.go b/cli/cache/download.go
@@ -14,10 +14,6 @@ import (
 )
 
 func DownloadOrCache(cacheKey string, hash string, url string, updates chan<- utils.GenericProgress, downloadSemaphore chan int) (*os.File, int64, error) {
-	if updates != nil {
-		defer close(updates)
-	}
-
 	downloadCache := filepath.Join(viper.GetString("cache-dir"), "downloadCache")
 	if err := os.MkdirAll(downloadCache, 0o777); err != nil {
 		if !os.IsExist(err) {

diff --git a/cli/dependency_resolver.go b/cli/dependency_resolver.go
@@ -34,7 +34,7 @@ type ficsitAPISource struct {
 	provider       provider.Provider
 	lockfile       *LockFile
 	toInstall      map[string]semver.Constraint
-	modVersionInfo *xsync.MapOf[string, ficsit.ModVersionsWithDependenciesResponse]
+	modVersionInfo *xsync.MapOf[string, ficsit.AllVersionsResponse]
 	gameVersion    semver.Version
 	smlVersions    []ficsit.SMLVersionsSmlVersionsGetSMLVersionsSml_versionsSMLVersion
 }
@@ -70,12 +70,15 @@ func (f *ficsitAPISource) GetPackageVersions(pkg string) ([]pubgrub.PackageVersi
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to fetch mod %s", pkg)
 	}
-	if response.Mod.Id == "" {
+	if !response.Success {
+		if response.Error != nil {
+			return nil, errors.Errorf("mod %s not found: %s", pkg, response.Error.Message)
+		}
 		return nil, errors.Errorf("mod %s not found", pkg)
 	}
 	f.modVersionInfo.Store(pkg, *response)
-	versions := make([]pubgrub.PackageVersion, len(response.Mod.Versions))
-	for i, modVersion := range response.Mod.Versions {
+	versions := make([]pubgrub.PackageVersion, len(response.Data))
+	for i, modVersion := range response.Data {
 		v, err := semver.NewVersion(modVersion.Version)
 		if err != nil {
 			return nil, errors.Wrapf(err, "failed to parse version %s", modVersion.Version)
@@ -88,9 +91,9 @@ func (f *ficsitAPISource) GetPackageVersions(pkg string) ([]pubgrub.PackageVersi
 				return nil, errors.Wrapf(err, "failed to parse constraint %s", dependency.Condition)
 			}
 			if dependency.Optional {
-				optionalDependencies[dependency.Mod_id] = c
+				optionalDependencies[dependency.ModID] = c
 			} else {
-				dependencies[dependency.Mod_id] = c
+				dependencies[dependency.ModID] = c
 			}
 		}
 		versions[i] = pubgrub.PackageVersion{
@@ -144,7 +147,7 @@ func (d DependencyResolver) ResolveModDependencies(constraints map[string]string
 		gameVersion:    gameVersionSemver,
 		lockfile:       lockFile,
 		toInstall:      toInstall,
-		modVersionInfo: xsync.NewMapOf[string, ficsit.ModVersionsWithDependenciesResponse](),
+		modVersionInfo: xsync.NewMapOf[string, ficsit.AllVersionsResponse](),
 	}
 
 	result, err := pubgrub.Solve(helpers.NewCachingSource(ficsitSource), rootPkg)
@@ -182,13 +185,13 @@ func (d DependencyResolver) ResolveModDependencies(constraints map[string]string
 		}
 
 		value, _ := ficsitSource.modVersionInfo.Load(k)
-		versions := value.Mod.Versions
+		versions := value.Data
 		for _, ver := range versions {
 			if ver.Version == v.RawString() {
 				targets := make(map[string]LockedModTarget)
 				for _, target := range ver.Targets {
-					targets[string(target.TargetName)] = LockedModTarget{
-						Link: viper.GetString("api-base") + target.Link,
+					targets[target.TargetName] = LockedModTarget{
+						Link: viper.GetString("api-base") + "/v1/version/" + ver.ID + "/" + target.TargetName + "/download",
 						Hash: target.Hash,
 					}
 				}

diff --git a/cli/installations.go b/cli/installations.go
@@ -588,15 +588,16 @@ func downloadAndExtractMod(modReference string, version string, link string, has
 	}
 
 	if updates != nil {
+		close(downloadUpdates)
+		close(extractUpdates)
+
 		updates <- InstallUpdate{
 			Type: InstallUpdateTypeModComplete,
 			Item: InstallUpdateItem{
 				Mod:     modReference,
 				Version: version,
 			},
 		}
-
-		close(extractUpdates)
 	}
 
 	wg.Wait()

diff --git a/cli/provider/ficsit.go b/cli/provider/ficsit.go
@@ -34,8 +34,8 @@ func (p ficsitProvider) SMLVersions(context context.Context) (*ficsit.SMLVersion
 	return ficsit.SMLVersions(context, p.client)
 }
 
-func (p ficsitProvider) ModVersionsWithDependencies(context context.Context, modID string) (*ficsit.ModVersionsWithDependenciesResponse, error) {
-	return ficsit.ModVersionsWithDependencies(context, p.client, modID)
+func (p ficsitProvider) ModVersionsWithDependencies(_ context.Context, modID string) (*ficsit.AllVersionsResponse, error) {
+	return ficsit.GetAllModVersions(modID)
 }
 
 func (p ficsitProvider) GetModName(context context.Context, modReference string) (*ficsit.GetModNameResponse, error) {

diff --git a/cli/provider/local.go b/cli/provider/local.go
@@ -176,26 +176,24 @@ func (p localProvider) SMLVersions(_ context.Context) (*ficsit.SMLVersionsRespon
 	}, nil
 }
 
-func (p localProvider) ModVersionsWithDependencies(_ context.Context, modID string) (*ficsit.ModVersionsWithDependenciesResponse, error) {
+func (p localProvider) ModVersionsWithDependencies(_ context.Context, modID string) (*ficsit.AllVersionsResponse, error) {
 	cachedModFiles, err := cache.GetCacheMod(modID)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get cache")
 	}
 
-	versions := make([]ficsit.ModVersionsWithDependenciesModVersionsVersion, 0)
+	versions := make([]ficsit.ModVersion, 0)
 
 	for _, modFile := range cachedModFiles {
-		versions = append(versions, ficsit.ModVersionsWithDependenciesModVersionsVersion{
-			Id:      modID + ":" + modFile.Plugin.SemVersion,
+		versions = append(versions, ficsit.ModVersion{
+			ID:      modID + ":" + modFile.Plugin.SemVersion,
 			Version: modFile.Plugin.SemVersion,
 		})
 	}
 
-	return &ficsit.ModVersionsWithDependenciesResponse{
-		Mod: ficsit.ModVersionsWithDependenciesMod{
-			Id:       modID,
-			Versions: versions,
-		},
+	return &ficsit.AllVersionsResponse{
+		Success: true,
+		Data:    versions,
 	}, nil
 }
 

diff --git a/cli/provider/mixed.go b/cli/provider/mixed.go
@@ -50,7 +50,7 @@ func (p MixedProvider) SMLVersions(context context.Context) (*ficsit.SMLVersions
 	return p.ficsitProvider.SMLVersions(context)
 }
 
-func (p MixedProvider) ModVersionsWithDependencies(context context.Context, modID string) (*ficsit.ModVersionsWithDependenciesResponse, error) {
+func (p MixedProvider) ModVersionsWithDependencies(context context.Context, modID string) (*ficsit.AllVersionsResponse, error) {
 	if p.Offline {
 		return p.localProvider.ModVersionsWithDependencies(context, modID)
 	}

diff --git a/cli/provider/provider.go b/cli/provider/provider.go
@@ -11,7 +11,7 @@ type Provider interface {
 	GetMod(context context.Context, modReference string) (*ficsit.GetModResponse, error)
 	ModVersions(context context.Context, modReference string, filter ficsit.VersionFilter) (*ficsit.ModVersionsResponse, error)
 	SMLVersions(context context.Context) (*ficsit.SMLVersionsResponse, error)
-	ModVersionsWithDependencies(context context.Context, modID string) (*ficsit.ModVersionsWithDependenciesResponse, error)
+	ModVersionsWithDependencies(context context.Context, modID string) (*ficsit.AllVersionsResponse, error)
 	GetModName(context context.Context, modReference string) (*ficsit.GetModNameResponse, error)
 	IsOffline() bool
 }
diff --git a/cli/resolving_test.go b/cli/resolving_test.go
@@ -86,7 +86,7 @@ func TestResolutionNonExistentMod(t *testing.T) {
 		},
 	}).Resolve(resolver, nil, math.MaxInt)
 
-	testza.AssertEqual(t, "failed resolving profile dependencies: failed to solve dependencies: failed to make decision: failed to get package versions: mod ThisModDoesNotExist$$$ not found", err.Error())
+	testza.AssertEqual(t, "failed resolving profile dependencies: failed to solve dependencies: failed to make decision: failed to get package versions: mod ThisModDoesNotExist$$$ not found: mod not found", err.Error())
 }
 
 func TestUpdateMods(t *testing.T) {