fix: Incorrect game save marker logic

fix: Make sure to clear on disk cache immediately when game saved

Author: colin969

src/back/DatabaseCache.ts

@@ -13,6 +13,7 @@ type TagCache = {
   tagCount: number;
 };
 
+const cacheKeyList: string[] = [];
 let gameSaved = false;
 let tagCache: TagCache | null = null;
 
@@ -91,7 +92,6 @@ type GameStringCache = {
 };
 
 async function loadStringCache(key: string, cachePath: string): Promise<GameStringCache> {
-  log.info('Cache', `Loading ${key} string cache from ${cachePath}`);
   try {
     const cache = await readJsonFile(cachePath);
     if (typeof cache?.gameCount !== 'number' ||
@@ -123,8 +123,16 @@ async function loadStringCache(key: string, cachePath: string): Promise<GameStri
   }
 }
 
-export function markGameSave() {
+export function markGameSave(fpPath: string) {
   gameSaved = true;
+  for (const key of cacheKeyList) {
+    const cachePath = path.join(fpPath, 'Cache', `${key}.json`);
+    try {
+      fs.unlinkSync(cachePath);
+    } catch {
+      // Doesn't exist or being edited, ignore
+    }
+  }
 }
 
 async function saveStringCache(cachePath: string, gameCount: number, filterKey: string, data: string[]) {
@@ -141,6 +149,7 @@ function getStringCachedDataFactory(
   doSearch: (search: GameSearch) => Promise<string[]>
 ): (state: BackState, tagFilters: TagFilterGroup[]) => Promise<string[]> {
   let cache: GameStringCache | null = null;
+  cacheKeyList.push(key);
 
   return async (state, tagFilters) => {
     console.log('Loading cache for ' + key);
@@ -152,20 +161,15 @@ function getStringCachedDataFactory(
       cache = await loadStringCache(key, cachePath);
     }
 
-    console.log('Checked existing cache for ' + key);
-
     return databaseReady()
     .then(async (db) => {
       const gameCount = await db.countGames();
-      if (gameSaved || cache!.gameCount === gameCount && cache!.filterKey === flatKey) {
+      if (!gameSaved && cache!.gameCount === gameCount && cache!.filterKey === flatKey) {
         // Same game count and filter key, pretty accurate cache
-        console.log('Returning existing cache for ' + key);
         return cache!.data;
       }
-      console.log('Rebuilding cache for ' + key);
       const search = getTaggedSearch(tagFilters);
       const data = await doSearch(search);
-      console.log('Saving cache for ' + key);
       await saveStringCache(cachePath, gameCount, flatKey, data);
       return data;
     });

src/back/responses.ts

@@ -546,7 +546,7 @@ export function registerRequestCallbacks(state: BackState, init: () => Promise<v
       state.platformAppPaths = processPlatformAppPaths(await fpDatabase.findPlatformAppPaths()); // Update cache
       const total = await fpDatabase.countGames();
       const cats = await fpDatabase.findAllTagCategories();
-      markGameSave();
+      markGameSave(state.config.flashpointPath);
       state.socketServer.broadcast(BackOut.POST_SYNC_CHANGES, state.suggestions.library, state.suggestions, state.platformAppPaths, cats, total, state.preferences.gameMetadataSources[sourceIdx]);
       state.socketServer.broadcast(BackOut.TOAST, 'sync', 'Update Complete', {
         type: 'success',
@@ -835,7 +835,7 @@ export function registerRequestCallbacks(state: BackState, init: () => Promise<v
 
   state.socketServer.register(BackIn.SAVE_GAMES, async (event, data) => {
     await fpDatabase.saveGames(data);
-    markGameSave();
+    markGameSave(state.config.flashpointPath);
   });
 
   state.socketServer.register(BackIn.SAVE_GAME, async (event, game) => {
@@ -855,7 +855,7 @@ export function registerRequestCallbacks(state: BackState, init: () => Promise<v
       //   info.game.activeGameConfigOwner = undefined;
       // }
       const savedGame = await fpDatabase.saveGame(game);
-      markGameSave();
+      markGameSave(state.config.flashpointPath);
       broadcastGameUpdate(state, game.id);
       return savedGame;
     } catch (err) {