added async loading to radiolist and added playbackmanager to destroy()

Author: BuddySirJava

[email protected]/extension.js

@@ -183,23 +183,31 @@ export default class YetAnotherRadioExtension extends Extension {
     enable() {
         initTranslations(_);
         ensureStorageFile();
-        const stations = loadStations();
-
         this._settings = this.getSettings();
-
-        this._indicator = new Indicator(stations, () => this.openPreferences(), this.path, this._settings);
+        this._indicator = new Indicator([], () => this.openPreferences(), this.path, this._settings);
         Main.panel.addToStatusArea(this.uuid, this._indicator);
 
-        this._monitor = this._watchStationsFile();
+        loadStations().then(stations => {
+            if (this._indicator) {
+                this._indicator.setStations(stations);
+            }
+        }).catch(error => {
+            console.error('Failed to load stations:', error);
+        });
 
+        this._monitor = this._watchStationsFile();
         this._setupMediaKeys();
     }
 
     _watchStationsFile() {
         const file = Gio.File.new_for_path(STORAGE_PATH);
         const monitor = file.monitor_file(Gio.FileMonitorFlags.NONE, null);
         this._monitorHandlerId = monitor.connect('changed', () => {
-            this._indicator?.setStations(loadStations());
+            loadStations().then(stations => {
+                this._indicator?.setStations(stations);
+            }).catch(error => {
+                console.error('Failed to reload stations:', error);
+            });
         });
         return monitor;
     }

[email protected]/modules/playbackManager.js

@@ -250,17 +250,25 @@ export default class PlaybackManager {
     }
 
     _updateStationHistory(station) {
-        const stations = loadStations();
-        const stationIndex = stations.findIndex(s => s.uuid === station.uuid);
-        if (stationIndex >= 0) {
-            stations[stationIndex].lastPlayed = Date.now();
-            saveStations(stations);
-        }
+        loadStations().then(stations => {
+            const stationIndex = stations.findIndex(s => s.uuid === station.uuid);
+            if (stationIndex >= 0) {
+                stations[stationIndex].lastPlayed = Date.now();
+                saveStations(stations);
+            }
+        }).catch(err => {
+            console.error('Failed to update station history', err);
+        });
     }
 
     destroy() {
         this.stop();
 
+        if (this._metadataTimer) {
+            GLib.source_remove(this._metadataTimer);
+            this._metadataTimer = null;
+        }
+
         if (this._reconnectId) {
             GLib.source_remove(this._reconnectId);
             this._reconnectId = null;

[email protected]/prefs.js

@@ -907,8 +907,6 @@ export default class YetAnotherRadioPreferences extends ExtensionPreferences {
         window.set_default_size(720, 640);
 
         const settings = this.getSettings();
-        const stations = loadStations();
-
         const toastOverlay = new Adw.ToastOverlay();
         const viewStack = new Adw.ViewStack();
 
@@ -917,10 +915,15 @@ export default class YetAnotherRadioPreferences extends ExtensionPreferences {
             addStationsPage.setStations(newStations);
             generalSettingsPage.setStations(newStations);
         };
-
-        const generalSettingsPage = new GeneralSettingsPage(settings, stations, refreshCallback, toastOverlay);
-        const savedStationsPage = new SavedStationsPage(stations, refreshCallback);
-        const addStationsPage = new AddStationsPage(stations, refreshCallback, settings);
+        
+        const generalSettingsPage = new GeneralSettingsPage(settings, [], refreshCallback, toastOverlay);
+        const savedStationsPage = new SavedStationsPage([], refreshCallback);
+        const addStationsPage = new AddStationsPage([], refreshCallback, settings);
+        loadStations().then(stations => {
+            refreshCallback(stations);
+        }).catch(error => {
+            console.error('Failed to load stations in prefs:', error);
+        });
 
         viewStack.add_titled(generalSettingsPage, 'general', _('General'));
         viewStack.add_titled(savedStationsPage, 'saved', _('Saved Stations'));

[email protected]/radioUtils.js

@@ -1,4 +1,5 @@
 import GLib from 'gi://GLib';
+import Gio from 'gi://Gio';
 import Soup from 'gi://Soup';
 
 let _ = (s) => s;
@@ -30,7 +31,7 @@ export function ensureStorageFile() {
     }
 }
 
-export function loadStations() {
+export async function loadStations() {
     try {
         ensureStorageFile();
     } catch (error) {
@@ -39,7 +40,20 @@ export function loadStations() {
     }
 
     try {
-        const [, contents] = GLib.file_get_contents(STORAGE_PATH);
+        const file = Gio.File.new_for_path(STORAGE_PATH);
+        const [success, contents] = await new Promise((resolve, reject) => {
+            file.load_contents_async(null, (obj, res) => {
+                try {
+                    const result = obj.load_contents_finish(res);
+                    resolve(result);
+                } catch (e) {
+                    reject(e);
+                }
+            });
+        });
+
+        if (!success) return [];
+
         const text = new TextDecoder().decode(contents);
         const parsed = JSON.parse(text);
         if (!Array.isArray(parsed))
@@ -49,7 +63,7 @@ export function loadStations() {
             .map(_sanitizeStation);
     } catch (error) {
         console.error('Failed to load stations', error);
-        if (error.code === GLib.IOErrorEnum.NOT_FOUND) {
+        if (error.code === Gio.IOErrorEnum.NOT_FOUND || error.code === GLib.IOErrorEnum.NOT_FOUND) {
             console.warn('Stations file not found, returning empty list');
             return [];
         }