persistence

Author: Geoxor

src/renderer/components/OutputDiagram/blobs/SourceBlob.vue

@@ -17,7 +17,7 @@ import GenericBlob from "./GenericBlob.vue";
 import { MediaSourceType } from "@/logic/MediaSource";
 const router = useRouter();
 
-const sourceType = ref(MediaSourceType.Generic);
+const sourceType = ref(MediaSourceType.Local);
 
 const updateSourceType = (track: Track) => {
   sourceType.value = track.sourceType;

src/renderer/logic/MediaSource/SubsonicMediaSource.ts

@@ -52,7 +52,7 @@ export class SubsonicMediaSource extends MediaSource {
 
     setInterval(() => this.getScanStatus(), 1000);
     this.getScanStatus();
-    this.sync();
+    // this.sync();
     this.fetchFavoriteSongs();
   }
 

src/renderer/logic/queue.ts

@@ -8,6 +8,8 @@ import { type Amethyst, amethyst } from "@/amethyst.js";
 import { fisherYatesShuffle } from "@/logic/math.js";
 import { Track } from "@/logic/track.js";
 
+import { MediaSourceType } from "./MediaSource/index.js";
+
 const COMPARATORS_BY_METHOD = {
   default: () => 0,
   trackNumber: (a, b) => {
@@ -44,7 +46,7 @@ const COMPARATORS_BY_METHOD = {
 export type PossibleSortingMethods = keyof typeof COMPARATORS_BY_METHOD;
 
 export class Queue {
-  private savedQueue = useLocalStorage<string[]>("queuev2", []);
+  private savedQueue = useLocalStorage<{ path: string; type: MediaSourceType }[]>("queuev2", []);
   private list: Ref<Map<string, Track>> = ref(new Map());
   private lastSearch = "";
   private lastSearchList: Track[] = [];
@@ -55,9 +57,19 @@ export class Queue {
   public currentSortingDirection: Ref<"ascending" | "descending"> = ref("ascending");
 
   public constructor(private amethyst: Amethyst, paths?: string[]) {
-    paths
-      ? this.add(paths)
-      : this.add(this.savedQueue.value);
+    if (paths) this.add(paths);
+    else {
+      // load saved queue from local storage
+      this.savedQueue.value.forEach((item) => {
+        const track = new Track(this.amethyst, item.path);
+
+        if (item.type == MediaSourceType.Subsonic) {
+          track.sourceType = MediaSourceType.Subsonic;
+        }
+
+        this.add(track);
+      });
+    }
   }
 
   public getList() {
@@ -112,7 +124,7 @@ export class Queue {
    * Saves the current queue to local storage for persistance
    */
   private syncLocalStorage() {
-    this.savedQueue.value = this.getList().map((t) => t.absolutePath);
+    this.savedQueue.value = this.getList().map((t) => ({ path: t.absolutePath, type: t.sourceType }));
   }
 
   /**

src/renderer/logic/track.ts

@@ -320,25 +320,23 @@ export class Track {
       if (metadata) {
         metadata.common.picture = [];
       }
-
-      if (force && this.amethyst.getCurrentPlatform() == "desktop") {
-        window.fs.writeFile(this.getCachePath(true), JSON.stringify({
-          cover,
-          metadata,
-          sourceType: this.sourceType,
-          coverUrl: this.coverUrl,
-          title: this.title,
-          duration: this.duration,
-          album: this.album,
-          artists: this.artists,
-          size: this.size,
-          bitRate: this.bitRate,
-        }, null, 2)).catch((error) => {
-          console.error("Failed to write metadata cache file, did you delete the 'Metadata Cache' folder?", error);
-        });
-      }
     };
 
+    if (force && this.amethyst.getCurrentPlatform() == "desktop") {
+      window.fs.writeFile(this.getCachePath(true), JSON.stringify({
+        sourceType: this.sourceType,
+        coverUrl: this.coverUrl,
+        title: this.title,
+        duration: this.duration,
+        album: this.album,
+        artists: this.artists,
+        size: this.size,
+        bitRate: this.bitRate,
+      }, null, 2)).catch((error) => {
+        console.error("Failed to write metadata cache file, did you delete the 'Metadata Cache' folder?", error);
+      });
+    }
+
     this.isLoading.value = false;
     this.isLoaded.value = true;
   };