AlbumArt3.0 v2.3.6: Updates the to_string() function (#1677)

Author: claudiux

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

@@ -1,3 +1,6 @@
+### v2.3.6~20251122
+  * Updates the to_string() function.
+
 ### v2.3.4~20251107
   * Fixes error loading image.
 

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

@@ -25,9 +25,9 @@ const { timeout_add_seconds,
 const { to_string } = require("./lib/to-string");
 
 
-const DESKLET_UUID = "AlbumArt3.0@claudiux";
+const UUID = "AlbumArt3.0@claudiux";
 const HOME_DIR = GLib.get_home_dir();
-const DESKLET_DIR = HOME_DIR + "/.local/share/cinnamon/desklets/" + DESKLET_UUID;
+const DESKLET_DIR = HOME_DIR + "/.local/share/cinnamon/desklets/" + UUID;
 const ENABLED_DESKLETS_KEY = 'enabled-desklets';
 const XDG_RUNTIME_DIR = GLib.getenv("XDG_RUNTIME_DIR");
 const TMP_ALBUMART_DIR = XDG_RUNTIME_DIR + "/AlbumArt";
@@ -40,24 +40,25 @@ const DEL_SONG_ARTS_SCRIPT = DESKLET_DIR + "/scripts/del_song_arts.sh";
 const GET_IMAGE_SIZE_SCRIPT = DESKLET_DIR + "/scripts/get-image-size.sh";
 const INSTALL_TRANSLATIONS_SCRIPT = DESKLET_DIR + "/scripts/install-translations.sh";
 
-
-Gettext.bindtextdomain(DESKLET_UUID, HOME_DIR + "/.local/share/locale");
-//~ Gettext.bindtextdomain("cinnamon", "/usr/share/locale");
-
+/**
+ * _:
+ * @str: string to try to translate.
+ * Try firstly with UUID domain, secondly with "cinnamon" domain, then with general domain.
+ */
+Gettext.bindtextdomain(UUID, HOME_DIR + "/.local/share/locale");
+Gettext.bindtextdomain("cinnamon", "/usr/share/locale");
 function _(str) {
-    let customTrans = Gettext.dgettext(DESKLET_UUID, str);
-    if (customTrans != str && customTrans.length > 0)
+    let customTrans = Gettext.dgettext(UUID, str);
+    if (customTrans.length > 0 && customTrans !== str)
         return customTrans;
-
-    return str;
-    //~ customTrans = Gettext.dgettext("cinnamon", str);
-    //~ if (customTrans !== str && customTrans.length > 0)
-        //~ return customTrans;
-
-    //~ return Gettext.gettext(str);
+    customTrans = Gettext.dgettext("cinnamon", str);
+    if (customTrans.length > 0 && customTrans !== str)
+        return customTrans;
+    return Gettext.gettext(str);
 }
 
 
+
 class AlbumArtRadio30 extends Desklet.Desklet {
     constructor(metadata, desklet_id) {
         super(metadata, desklet_id);
@@ -89,7 +90,7 @@ class AlbumArtRadio30 extends Desklet.Desklet {
 
         this._updateDecoration();
 
-        this.settings = new Settings.DeskletSettings(this, DESKLET_UUID, this.instance_id);
+        this.settings = new Settings.DeskletSettings(this, UUID, this.instance_id);
         this.settings.bind('height', 'height', this.on_setting_changed);
         this.settings.bind('width', 'width', this.on_setting_changed);
         this.settings.bind('fade-delay', 'fade_delay', this.on_setting_changed);
@@ -116,7 +117,7 @@ class AlbumArtRadio30 extends Desklet.Desklet {
         var modify_ENABLED_DESKLETS_KEY = false;
         for (let i = 0; i < enabledDesklets.length; i++) {
             let [name, dId, x, y] = enabledDesklets[i].split(":");
-            if (name == DESKLET_UUID) {
+            if (name == UUID) {
                 if (Math.ceil(x) != Math.ceil(this.desklet_x)) {
                     modify_ENABLED_DESKLETS_KEY = true;
                     x = "" + this.desklet_x;
@@ -205,7 +206,7 @@ class AlbumArtRadio30 extends Desklet.Desklet {
         var enabledDesklets = global.settings.get_strv(ENABLED_DESKLETS_KEY);
         for (let i = 0; i < enabledDesklets.length; i++) {
             let [name, dId, x, y] = enabledDesklets[i].split(":");
-            if (name == DESKLET_UUID) {
+            if (name == UUID) {
                 this.desklet_x = Math.ceil(x);
                 this.desklet_y = Math.ceil(y);
                 break
@@ -279,7 +280,7 @@ class AlbumArtRadio30 extends Desklet.Desklet {
         var enabledDesklets = global.settings.get_strv(ENABLED_DESKLETS_KEY);
         for (let i = 0; i < enabledDesklets.length; i++) {
             let [name, dId, x, y] = enabledDesklets[i].split(":");
-            if (name == DESKLET_UUID) {
+            if (name == UUID) {
                 if (Math.ceil(x) != Math.ceil(this.desklet_x) || Math.ceil(y) != Math.ceil(this.desklet_y)) {
                     this.desklet_x = Math.ceil(x);
                     this.desklet_y = Math.ceil(y);

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

@@ -1,34 +1,48 @@
+const ByteArray = imports.byteArray;
+
 const to_string = function(data) {
-  return ""+stringFromUTF8Array(data);
+  if (ByteArray.hasOwnProperty("toString")) {
+    return ""+ByteArray.toString(data);
+  } else {
+    return ""+data.toString();
+  }
 }
 
-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);
-  }
+//~ 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;
+//~ }
 
-  return str;
+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.3.5",
+  "version": "2.3.6",
   "author": "claudiux"
 }