fix(cache): change progress fetch & calculation and fix eviction check

Author: dvcol

src/services/trakt.service.ts

@@ -45,17 +45,18 @@ import { createTab } from '~/utils/browser/browser.utils';
 import { CacheRetention, ChromeCacheStore } from '~/utils/cache.utils';
 
 export const shouldEvict = (date?: string | number | Date, cache?: CacheResponse<unknown>): boolean => {
-  // no date or cache skip
-  if (!date || !cache?.evict) return false;
-  // date in the past skip
-  if (new Date(date) <= new Date()) return false;
+  // no cache skip
+  if (!cache?.evict) return false;
   // cached today skip
   if (cache?.current?.cachedAt) {
     const _cachedAt = new Date(cache.current.cachedAt).toLocaleDateString();
     const _today = new Date().toLocaleDateString();
     if (_cachedAt === _today) return false;
   }
-  return true;
+  // no date, force evict
+  if (date === undefined) return true;
+  // date in the future, force evict
+  return new Date(date) > new Date();
 };
 
 export class TraktService {

src/stores/data/show.store.ts

@@ -27,22 +27,37 @@ type SeasonEpisodesLoadingDictionary = Record<string, Record<number, boolean>>;
 type EpisodeLoadingDictionary = Record<string, Record<number, Record<number, boolean>>>;
 
 const watchProgressToListProgress = (progress: TraktWatchedProgress | TraktCollectionProgress, id: string | number): ShowProgress => {
-  return {
+  let completed = 0;
+  let aired = 0;
+
+  const result = {
     id,
     ...progress,
-    percentage: (progress.completed / progress.aired) * 100,
-    finished: progress.completed === progress.aired,
     type: 'last_watched_at' in progress ? ShowProgressType.Watched : ShowProgressType.Collection,
     date: new Date('last_watched_at' in progress ? progress.last_watched_at : progress.last_collected_at),
-    seasons: progress.seasons.map(season => ({
-      ...season,
-      percentage: (season.completed / season.aired) * 100,
-      finished: season.completed === season.aired,
-      episodes: season.episodes.map(episode => ({
-        ...episode,
-        date: new Date('last_watched_at' in episode ? episode.last_watched_at : episode.collected_at),
-      })),
-    })),
+    seasons: progress.seasons.map(season => {
+      if (season.number > 0) {
+        completed += season.completed;
+        aired += season.aired;
+      }
+
+      return {
+        ...season,
+        percentage: (season.completed / season.aired) * 100,
+        finished: season.completed === season.aired,
+        episodes: season.episodes.map(episode => ({
+          ...episode,
+          date: new Date('last_watched_at' in episode ? episode.last_watched_at : episode.collected_at),
+        })),
+      };
+    }),
+  };
+  return {
+    ...result,
+    completed,
+    aired,
+    percentage: (completed / aired) * 100,
+    finished: completed === aired,
   };
 };