AlbumArt3.0 v2.4.1: Ready for Linux Mint 23 (#1851)

Author: claudiux

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

@@ -1,3 +1,6 @@
+### v2.4.1~20260610
+  * Ready for Linux Mint 23.
+
 ### v2.4.0~20251122
   * Correctly resizes the album cover.
   * Fixes [#1674](https://github.com/linuxmint/cinnamon-spices-desklets/issues/1674)

AlbumArt3.0@claudiux/files/AlbumArt3.0@claudiux/desklet.js

@@ -11,6 +11,16 @@ const Tweener = imports.ui.tweener;
 const Util = imports.misc.util;
 const Settings = imports.ui.settings;
 const Gettext = imports.gettext;
+const Extension = imports.ui.extension;
+function _require(relPath) {
+    if (Extension.getCurrentExtension) {
+        var Me = Extension.getCurrentExtension();
+        return Me.imports[relPath];
+    } else {
+        return require(relPath);
+    }
+}
+
 //Mainloop:
 const { timeout_add_seconds,
         timeout_add,
@@ -21,8 +31,8 @@ const { timeout_add_seconds,
         source_exists,
         source_remove,
         remove_all_sources
-} = require("./lib/mainloopTools");
-const { to_string } = require("./lib/to-string");
+} = _require("./lib/mainloopTools");
+const { to_string } = _require("./lib/to-string");
 
 
 const UUID = "AlbumArt3.0@claudiux";
@@ -49,17 +59,18 @@ Gettext.bindtextdomain(UUID, HOME_DIR + "/.local/share/locale");
 Gettext.bindtextdomain("cinnamon", "/usr/share/locale");
 function _(str) {
     let customTrans = Gettext.dgettext(UUID, str);
-    if (customTrans.length > 0 && customTrans !== str)
-        return customTrans;
-    customTrans = Gettext.dgettext("cinnamon", str);
-    if (customTrans.length > 0 && customTrans !== str)
-        return customTrans;
-    return Gettext.gettext(str);
+    return customTrans;
+    //~ if (customTrans.length > 0 && customTrans !== str)
+        //~ return customTrans;
+    //~ customTrans = Gettext.dgettext("cinnamon", str);
+    //~ if (customTrans.length > 0 && customTrans !== str)
+        //~ return customTrans;
+    //~ return Gettext.gettext(str);
 }
 
 
 
-class AlbumArtRadio30 extends Desklet.Desklet {
+var AlbumArtRadio30 = class AlbumArtRadio30 extends Desklet.Desklet {
     constructor(metadata, desklet_id) {
         super(metadata, desklet_id);
 
@@ -295,14 +306,14 @@ class AlbumArtRadio30 extends Desklet.Desklet {
 
         if (!this.isLooping) return false;
         this._update();
-        
+
         if (this.isLooping) {
             if (this.oldRealWidth != this.realWidth || this.oldRealHeight != this.realHeight) {
                 this.oldRealWidth = this.realWidth;
                 this.oldRealHeight = this.realHeight;
                 this.on_setting_changed();
             }
-            
+
             this.update_id = timeout_add_seconds(this.delay, () => { this._update_loop() });
         } else {
             return false;
@@ -432,7 +443,7 @@ class AlbumArtRadio30 extends Desklet.Desklet {
         } else {
             if (this._bin != null) this._bin.set_child(this.currentPicture);
         }
-        
+
         this.updateInProgress = false;
     }
 

AlbumArt3.0@claudiux/files/AlbumArt3.0@claudiux/lib/mainloopTools.js

@@ -1,4 +1,5 @@
 const  GLib = imports.gi.GLib;
+const Extension = imports.ui.extension;
 
 /**
  * _sourceIds
@@ -165,7 +166,7 @@ function remove_all_sources() {
   }
 }
 
-module.exports = {
+if (!Extension.getCurrentExtension) module.exports = {
   _sourceIds,
   timeout_add_seconds,
   timeout_add,

AlbumArt3.0@claudiux/files/AlbumArt3.0@claudiux/lib/to-string.js

@@ -1,4 +1,5 @@
 const ByteArray = imports.byteArray;
+const Extension = imports.ui.extension;
 
 const to_string = function(data) {
   if (ByteArray.hasOwnProperty("toString")) {
@@ -8,41 +9,6 @@ const to_string = function(data) {
   }
 }
 
-//~ const to_string = function(data) {
-  //~ return stringFromUTF8Array(data);
-//~ }
-
-//~ const stringFromUTF8Array = function(data) {
-  //~ const extraByteMap = [ 1, 1, 1, 1, 2, 2, 3, 0 ];
-  //~ var count = data.length;
-  //~ var str = "";
-
-  //~ for (var index = 0;index < count;)
-  //~ {
-    //~ var ch = data[index++];
-    //~ if (ch & 0x80)
-    //~ {
-      //~ var extra = extraByteMap[(ch >> 3) & 0x07];
-      //~ if (!(ch & 0x40) || !extra || ((index + extra) > count))
-        //~ return null;
-
-      //~ ch = ch & (0x3F >> extra);
-      //~ for (;extra > 0;extra -= 1)
-      //~ {
-        //~ var chx = data[index++];
-        //~ if ((chx & 0xC0) != 0x80)
-          //~ return null;
-
-        //~ ch = (ch << 6) | (chx & 0x3F);
-      //~ }
-    //~ }
-
-    //~ str += String.fromCharCode(ch);
-  //~ }
-
-  //~ return str;
-//~ }
-
-module.exports = {
+if (!Extension.getCurrentExtension) module.exports = {
   to_string
 }

AlbumArt3.0@claudiux/files/AlbumArt3.0@claudiux/metadata.json

@@ -4,6 +4,6 @@
   "name": "Album Art for Radio3.0 and Enhanced Sound applets",
   "description": "A digital photo frame desklet to display an album art, if available",
   "prevent-decorations": true,
-  "version": "2.4.0",
+  "version": "2.4.1",
   "author": "claudiux"
 }