UpdateFileHashes doesn't convey that it also initializes the cache

replit · Jan 3, 2024 · ff8a787 · ff8a787
1 parent 1132e8c
commit ff8a787
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/internal/cli/cmds.go b/internal/cli/cmds.go
@@ -357,6 +357,7 @@ func runAdd(
 		maybeInstall(ctx, b, forceInstall)
 	}
 
+	store.Read(ctx, b)
 	store.ClearGuesses(ctx, b)
 	store.UpdateFileHashes(ctx, b)
 	store.Write(ctx)
@@ -416,6 +417,7 @@ func runRemove(language string, args []string, upgrade bool,
 		maybeInstall(ctx, b, forceInstall)
 	}
 
+	store.Read(ctx, b)
 	store.ClearGuesses(ctx, b)
 	store.UpdateFileHashes(ctx, b)
 	store.Write(ctx)
@@ -437,6 +439,7 @@ func runLock(language string, upgrade bool, forceLock bool, forceInstall bool) {
 		maybeInstall(ctx, b, forceInstall)
 	}
 
+	store.Read(ctx, b)
 	store.UpdateFileHashes(ctx, b)
 	store.Write(ctx)
 }
@@ -449,6 +452,7 @@ func runInstall(language string, force bool) {
 
 	maybeInstall(ctx, b, force)
 
+	store.Read(ctx, b)
 	store.UpdateFileHashes(ctx, b)
 	store.Write(ctx)
 }

diff --git a/internal/store/store.go b/internal/store/store.go
@@ -218,14 +218,19 @@ func ClearGuesses(ctx context.Context, b api.LanguageBackend) {
 	cache.GuessedImportsHash = ""
 }
 
+func Read(ctx context.Context, b api.LanguageBackend) {
+	//nolint:ineffassign,wastedassign,staticcheck
+	span, ctx := tracer.StartSpanFromContext(ctx, "store.Read")
+	defer span.Finish()
+	readMaybe()
+	initLanguage(b.Name, b.Alias)
+}
+
 // UpdateFileHashes caches the current states of the specfile and
 // lockfile. Neither file need exist.
 func UpdateFileHashes(ctx context.Context, b api.LanguageBackend) {
-	//nolint:ineffassign,wastedassign,staticcheck
 	span, ctx := tracer.StartSpanFromContext(ctx, "store.UpdateFileHashes")
 	defer span.Finish()
-	readMaybe()
-	initLanguage(b.Name, b.Alias)
 	cache := getLanguageCache(b.Name, b.Alias)
 	cache.SpecfileHash = hashFile(b.Specfile)
 	cache.LockfileHash = hashFile(b.Lockfile)