Radio3.0 v3.10.1: Repairs notifications (#8154)

Author: claudiux

Radio3.0@claudiux/files/Radio3.0@claudiux/CHANGELOG.md

@@ -1,3 +1,7 @@
+### v3.10.1~20260105
+  * Repairs notifications.
+  * Add option "Fastest" for "Quality of downloaded Album Art".
+
 ### v3.10.0~20251211
   * Working well with Cinnamon 6.6.
 

Radio3.0@claudiux/files/Radio3.0@claudiux/applet.js

@@ -35,7 +35,8 @@ const { Icon, IconType, Button, Widget, ScrollView, Align, Label, BoxLayout, Bin
 //Tooltips:
 const { Tooltip } = imports.ui.tooltips;
 //MessageTray:
-const { Urgency, MessageTray, SystemNotificationSource, Notification } = imports.ui.messageTray;
+//~ const { Urgency, MessageTray, SystemNotificationSource, Notification } = imports.ui.messageTray;
+const { Urgency, MessageTray, SystemNotificationSource, Notification } = require("./lib/messageTray");
 
 const TABS = ["Radios", "Search", "Import", "Menu", "Behavior", "Network", "Recording", "YT", "Scheduling", "Alarm Clock"];
 var RADIO_NOTIFICATION_TIMEOUT = 2;
@@ -702,7 +703,8 @@ RadioMessageTray.prototype = {
 
     if (this._notification.urgency != Urgency.CRITICAL) {
       this._updateNotificationTimeout(RADIO_NOTIFICATION_TIMEOUT * 1000);
-    } else if (AppletManager.get_role_provider_exists(AppletManager.Roles.NOTIFICATIONS)) {
+    //~ } else if (AppletManager.get_role_provider_exists(AppletManager.Roles.NOTIFICATIONS)) {
+    } else {
       this._updateNotificationTimeout(RADIO_NOTIFICATION_CRITICAL_TIMEOUT_WITH_APPLET * 1000);
     }
   }
@@ -724,7 +726,11 @@ RadioNotificationSource.prototype = {
     if (this.notifications.length > 0) {
       for (let i = this.notifications.length - 1; i >= 0; i--) {
         if (this.notifications[i]) {
-          this.notifications[i].destroy();
+          try {
+            this.notifications[i].destroy();
+          } catch(e) {
+            logError("Unable to destroy notification number "+i+". "+e);
+          }
         } else {
           // Do nothing.
           logError("Unable to destroy notification number "+i);
@@ -738,8 +744,9 @@ RadioNotificationSource.prototype = {
 }
 
 const messageTray = new RadioMessageTray();
-const source = new RadioNotificationSource("Radio3.0");
-messageTray.add(source);
+//~ const SOURCE = new RadioNotificationSource("Radio3.0");
+const SOURCE = new RadioNotificationSource();
+messageTray.add(SOURCE);
 
 class TitleSeparatorMenuItem extends PopupBaseMenuItem {
   constructor(title, icon_name, reactive=false) {
@@ -3354,7 +3361,7 @@ class WebRadioReceiverAndRecorder extends TextIconApplet {
 
   on_song_changed(radio="", title="") {
     //log("on_song_changed");
-    source.destroyAllNotifications();
+    SOURCE.destroyAllNotifications();
     let pid = this.record_pid;
 
     let is_recording = pid != null;
@@ -3479,8 +3486,8 @@ class WebRadioReceiverAndRecorder extends TextIconApplet {
         this.download_songArt(title, res);
       } else {
         let size = child.get_size();
-        if (size == 0 && res != "sd")
-          this.download_songArt(title, res="sd");
+        if (size == 0 && res != "default")
+          this.download_songArt(title, res="default");
       }
       children.close(null);
       return false;
@@ -3539,7 +3546,7 @@ class WebRadioReceiverAndRecorder extends TextIconApplet {
 
   start_mpv_radio(id) {
     this.showOSD = this.volume_show_osd && this.showOSDonStartup;
-    source.destroyAllNotifications();
+    SOURCE.destroyAllNotifications();
     let _id = ""+id;
     //log("start_mpv_radio: " + _id);
     if (_id.length === 0) return;
@@ -3639,7 +3646,7 @@ class WebRadioReceiverAndRecorder extends TextIconApplet {
     this.updateUI();
 
     if (notify_user) {
-      source.destroyAllNotifications();
+      SOURCE.destroyAllNotifications();
       this.radio_notify(_("Radio OFF"));
     }
 
@@ -5436,16 +5443,14 @@ class WebRadioReceiverAndRecorder extends TextIconApplet {
   }
 
   radio_notify(msg, submsg="", button=[]) {
-    //log("radio_notify:  msg:" + msg + " - submsg: " + submsg);
-
     RADIO_NOTIFICATION_TIMEOUT = 2;
 
     let icon = new Icon();
     icon.set_icon_name("webradioreceiver");
     icon.set_icon_type(IconType.SYMBOLIC);
     icon.set_icon_size(24);
 
-    let notification = new Notification(source, msg, submsg, { icon: icon, silent: true });
+    let notification = new Notification(SOURCE, msg, submsg, { icon: icon, silent: true });
     notification.setTransient(false);
 
     if (button.length === 3 && this.notif_buttons_allowed) {
@@ -5454,7 +5459,7 @@ class WebRadioReceiverAndRecorder extends TextIconApplet {
       if (button[1] === "callback") {
         notification.addButton("callback", button[0]); // button[0]: label
         notification.connect("action-invoked", button[2]); // button[2]: callback
-        source.notify(notification);
+        SOURCE.notify(notification);
         return notification;
       } else if (this.record_pid != null && !this.get_recording_ends_auto() && button[1] !== "stop-recording") {
         notification.addButton("stop-recording", _("Stop Current Recording"));
@@ -5522,7 +5527,7 @@ class WebRadioReceiverAndRecorder extends TextIconApplet {
       });
     }
 
-    source.notify(notification);
+    SOURCE.notify(notification);
     return notification;
   }