iobroker.squeezeboxrpc 1.3.11 → 1.3.14

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 oweitman <oweitman@gmx.de>
+Copyright (c) 2019-2024 oweitman <oweitman@gmx.de>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -201,6 +201,20 @@ For more information visit the CLI-documentation:
   Placeholder for the next version (at the beginning of the line):
    ### **WORK IN PROGRESS**
 -->
+### 1.3.14 (2024-08-05)
+
+-   fix formatting
+
+### 1.3.13 (2024-08-05)
+
+-   revert the fix for artist handling due to negative effect of spotify
+
+### 1.3.12 (2024-08-05)
+
+-   improve cmdGoto handling by kairauer, close PR #74
+-   fix issues from adapter checker
+-   integrate squeezenode lib
+
 ### 1.3.11 (2024-08-05)
 
 -   update adapter structure and switch to jsonconfig

package/io-package.json

@@ -1,8 +1,47 @@
 {
   "common": {
     "name": "squeezeboxrpc",
-    "version": "1.3.11",
+    "version": "1.3.14",
     "news": {
+      "1.3.14": {
+        "en": "fix formatting",
+        "de": "fixe formatierung",
+        "ru": "форматирование фиксации",
+        "pt": "corrigir formatação",
+        "nl": "formatteren herstellen",
+        "fr": "corriger le formatage",
+        "it": "correzione della formattazione",
+        "es": "arreglar formato",
+        "pl": "naprawić formatowanie",
+        "uk": "фіксувати форматування",
+        "zh-cn": "固定格式化"
+      },
+      "1.3.13": {
+        "en": "revert the fix for artist handling due to negative effect of spotify",
+        "de": "die fix für die künstlerhandhabung aufgrund negativer wirkung von spotify",
+        "ru": "возвратить фиксацию для работы с художником из-за негативного эффекта спотификации",
+        "pt": "reverter a correção para manipulação de artista devido ao efeito negativo de identificar",
+        "nl": "terugzetten van de fix voor artist handling als gevolg van negatief effect van spotify",
+        "fr": "retourner la correction pour la manipulation de l'artiste en raison de l'effet négatif de spotify",
+        "it": "ripristinare la correzione per la gestione dell'artista a causa dell'effetto negativo di spotify",
+        "es": "revertir la fijación para el manejo del artista debido al efecto negativo de spotify",
+        "pl": "revert fix do obsługi artysty ze względu na negatywny efekt spotify",
+        "uk": "перевернути фіксацію для обробки художника через негативний ефект плямистості",
+        "zh-cn": "恢复对艺术家处理的固定,因为发现有负面影响"
+      },
+      "1.3.12": {
+        "en": "improve cmdGoto handling by kairauer, close PR #74\nfix issues from adapter checker\nintegrate squeezenode lib",
+        "de": "verbessern cmd Goto Handling von kairauer, close PR #74\nprobleme von adapter checker beheben\npressnode lib integrieren",
+        "ru": "улучшить смс Goto handling by kairauer, close PR #74\nпроблемы с адаптером\nинтегрировать сжимнод lib",
+        "pt": "melhorar cm Goto manipulação por kairauer, close PR #74\ncorrigir problemas do verificador do adaptador\nintegrar o espremido lib",
+        "nl": "verbetering cmd Ga naar behandeling door Kairauer, sluit PR #74\nproblemen oplossen van adaptercontrole\nintegreer crownode lib",
+        "fr": "améliorer cmd Goto manipulation par kairauer, fermer PR #74\ncorrection des problèmes de l'adaptateur checker\nintégrer la lib de pressingnode",
+        "it": "migliorare cmd Goto handling by kairauer, close PR #74\nrisolvere problemi da adattatore checker\nintegrare compressione lib",
+        "es": "mejorar cmd Goto manejo por kairauer, cerrar PR #74\nsolucionar problemas desde el control de adaptador\nintegrar el exprimido lib",
+        "pl": "poprawić cmd Goto handling by kairauer, close PR # 74\nnaprawianie problemów z sprawdzaczem adaptera\nzintegrować lib wyciskacza",
+        "uk": "поліпшення cmd Goto обслуговування за допомогою kairauer, Закрити PR #74\nвиправити проблеми з перевіркою адаптера\nінтегрувати squeezenode lib",
+        "zh-cn": "改进 cmd 由Kairauer处理\n从适配器检查器中校正问题\n集成压缩节点 lib"
+      },
       "1.3.11": {
         "en": "update adapter structure and switch to jsonconfig",
         "de": "adapterstruktur aktualisieren und auf jsonconfig wechseln",
@@ -54,48 +93,8 @@
         "pl": "* napraw widget btn do przesyłania obiektów",
         "uk": "* виправити віджет btn для пересилання об’єктів",
         "zh-cn": "* 修复对象转发 btn 小部件"
-      },
-      "1.3.7": {
-        "en": "* fix object creation of states in player modul",
-        "de": "* Objekterstellung von Zuständen im Player-Modul behoben",
-        "ru": "* исправлено создание объектов состояний в модуле плеера",
-        "pt": "* corrigir a criação de objetos de estados no módulo do player",
-        "nl": "* probleem met het maken van statussen in de spelermodule",
-        "fr": "* Correction de la création d'objets d'états dans le module joueur",
-        "it": "* corretta la creazione di oggetti di stati nel modulo del lettore",
-        "es": "* Corregir la creación de objetos de estados en el módulo del reproductor.",
-        "pl": "* naprawiono tworzenie stanów obiektów w module odtwarzacza",
-        "uk": "* виправлено створення об'єктів станів у модулі гравця",
-        "zh-cn": "*修复玩家模块中状态的对象创建"
-      },
-      "1.3.6": {
-        "en": "* fix object creation of states",
-        "de": "* Objekterstellung von Zuständen behoben",
-        "ru": "* исправлено создание объектов состояний",
-        "pt": "* corrigir a criação de estados de objetos",
-        "nl": "* probleem met het maken van statussen voor objecten",
-        "fr": "* Correction de la création d'objets d'états",
-        "it": "* corretta la creazione degli stati da parte degli oggetti",
-        "es": "* arreglar la creación de objetos de estados",
-        "pl": "* naprawiono tworzenie obiektów w stanach",
-        "uk": "* виправити створення об'єктів станів",
-        "zh-cn": "* 修复状态的对象创建"
-      },
-      "1.3.5": {
-        "en": "* fix object creation for favorites",
-        "de": "* Objekterstellung für Favoriten korrigiert",
-        "ru": "* исправлено создание объектов для избранного",
-        "pt": "* corrigir a criação de objetos para favoritos",
-        "nl": "* probleem met het maken van objecten voor favorieten",
-        "fr": "* correction de la création d'objets pour les favoris",
-        "it": "* corretta la creazione di oggetti per i preferiti",
-        "es": "* arreglar la creación de objetos para favoritos",
-        "pl": "* naprawiono tworzenie obiektów dla ulubionych",
-        "uk": "* виправлено створення об'єктів для обраних",
-        "zh-cn": "* 修复收藏夹的对象创建"
       }
     },
-    "title": "SqueezeboxRPC: Controller for Logitech media Server over RPC-protokol",
     "titleLang": {
       "en": "SqueezeboxRPC: Controller for Logitech media Server over RPC-protokol",
       "de": "SqueezeboxRPC: Controller für Logitech Media Server über RPC-Protokoll",
@@ -126,17 +125,16 @@
       "oweitman <oweitman@gmx.de>"
     ],
     "keywords": [
-      "ioBroker",
-      "template",
-      "Smart Home",
-      "home automation"
+      "squeezebox",
+      "LMS",
+      "Logitech Media Server",
+      "music server"
     ],
     "licenseInformation": {
       "type": "free",
       "license": "MIT"
     },
     "platform": "Javascript/Node.js",
-    "main": "squeezeboxrpc.js",
     "icon": "squeezeboxrpc.png",
     "enabled": true,
     "extIcon": "https://raw.githubusercontent.com/oweitman/ioBroker.squeezeboxrpc/main/admin/squeezeboxrpc.png",
@@ -157,7 +155,7 @@
     },
     "dependencies": [
       {
-        "js-controller": ">=3.3.22"
+        "js-controller": ">=5.0.19"
       }
     ],
     "globalDependencies": [
@@ -166,6 +164,12 @@
       }
     ]
   },
+  "encryptedNative": [
+    "password"
+  ],
+  "protectedNative": [
+    "password"
+  ],
   "native": {
     "server": "0.0.0.0",
     "port": 9000,

package/lib/iosbplayer.js

@@ -585,48 +585,45 @@ function ioSBPlayer(server, playerdata) {
                             value = decodeURIComponent(m[1]);
                         }
                     }
-                    this.artisthandling = true;
-                    if (key == "artist" && !playerdata["artisthandling"] && this.artisthandling == true) {
-
-                        if (Object.prototype.hasOwnProperty.call(playerdata, "artist")) {
-                            value = playerdata["artist"];
-                        }
-                        if (Object.prototype.hasOwnProperty.call(playerdata, "composer")) {
-                            value = playerdata["composer"];
-                        }
-                        if (Object.prototype.hasOwnProperty.call(playerdata, "conductor")) {
-                            value = playerdata["conductor"];
-                        }
-                        if (Object.prototype.hasOwnProperty.call(playerdata, "band")) {
-                            value = playerdata["band"];
-                        }
-                        if (Object.prototype.hasOwnProperty.call(playerdata, "albumartist")) {
-                            value = playerdata["albumartist"];
-                        }
-                        if (Object.prototype.hasOwnProperty.call(playerdata, "trackartist")) {
-                            value = playerdata["trackartist"];
-                        }
-                        playerdata["artisthandling"] = true;
-                    }
-
-
+                    /*                     this.artisthandling = true;
+                                        if (key == "artist" && !playerdata["artisthandling"] && this.artisthandling == true) {
 
+                                            if (Object.prototype.hasOwnProperty.call(playerdata, "artist")) {
+                                                value = playerdata["artist"];
+                                            }
+                                            if (Object.prototype.hasOwnProperty.call(playerdata, "composer")) {
+                                                value = playerdata["composer"];
+                                            }
+                                            if (Object.prototype.hasOwnProperty.call(playerdata, "conductor")) {
+                                                value = playerdata["conductor"];
+                                            }
+                                            if (Object.prototype.hasOwnProperty.call(playerdata, "band")) {
+                                                value = playerdata["band"];
+                                            }
+                                            if (Object.prototype.hasOwnProperty.call(playerdata, "albumartist")) {
+                                                value = playerdata["albumartist"];
+                                            }
+                                            if (Object.prototype.hasOwnProperty.call(playerdata, "trackartist")) {
+                                                value = playerdata["trackartist"];
+                                            }
+                                            playerdata["artisthandling"] = true;
+                                        } */
 
                     this.setState(this.sbPlayerStatusLoop[key].name, this.convertState(this.sbPlayerStatusLoop[key], value), this.statePath, this.playername);
                 } else {
                     if (key == "remote_title" && this.remote == 0) {
                         value = "";
                     }
-                    if (key == "artist" && (Object.prototype.hasOwnProperty.call(playerdata, "albumartist") || "") == "") {
-                        value = "";
-                    } else {
-                        value = playerdata["albumartist"];
-                    }
-                    if (key == "albumartist" && (Object.prototype.hasOwnProperty.call(playerdata, "artist") || "") == "") {
-                        value = "";
-                    } else {
-                        value = playerdata["artist"];
-                    }
+                    /*                     if (key == "artist" && (Object.prototype.hasOwnProperty.call(playerdata, "albumartist") || "") == "") {
+                                            value = "";
+                                        } else {
+                                            value = playerdata["albumartist"];
+                                        }
+                                        if (key == "albumartist" && (Object.prototype.hasOwnProperty.call(playerdata, "artist") || "") == "") {
+                                            value = "";
+                                        } else {
+                                            value = playerdata["artist"];
+                                        } */
                     if (fullStatus) this.setState(this.sbPlayerStatusLoop[key].name, this.convertState(this.sbPlayerStatusLoop[key], value), this.statePath, this.playername);
                 }
             }
@@ -752,6 +749,12 @@ function ioSBPlayer(server, playerdata) {
             }
         }
         if (idParts[0] == "cmdGoTime") {
+            // state.val needs to be a string, although the time is set in seconds
+            // when settings cmdGoTime via ioBroker.simple-api its not possible to submit a number as string
+            // if we receive a number, we need to cast this to a string
+            if (typeof state.val === "number") {
+                state.val = state.val.toString();
+            }
             if (state.val.trim() !== "" && !isNaN(state.val.trim())) {
                 this.request(this.playerid, ["time", state.val.trim()]);
                 this.setState(idParts[0], " ", this.statePath, this.playername, false);

package/lib/iosbserver.js

@@ -3,7 +3,7 @@
 
 //const utils = require('@iobroker/adapter-core');
 const dgram = require('dgram');
-const SqueezeServer = require('squeezenode-oweitman');
+const SqueezeServerNew = require(__dirname + '/squeezenode/squeezeserver');
 const ioSBPlayer = require(__dirname + '/iosbplayer');
 
 function IoSbServer(adapter) {
@@ -212,7 +212,7 @@ function IoSbServer(adapter) {
     this.adapter.setState('info.connection', false, true);
     this.adapter.subscribeStates('*');
 
-    this.sbServer = (adapter.config.username != "") ? new SqueezeServer('http://' + this.adapter.config.server, Number.parseInt(this.adapter.config.port), adapter.config.username, adapter.config.password) : new SqueezeServer('http://' + this.adapter.config.server, Number.parseInt(this.adapter.config.port));
+    this.sbServer = (adapter.config.username != "") ? new SqueezeServerNew('http://' + this.adapter.config.server, Number.parseInt(this.adapter.config.port), adapter.config.username, adapter.config.password) : new SqueezeServerNew('http://' + this.adapter.config.server, Number.parseInt(this.adapter.config.port));
 
     this.log = {};
     this.islogsilly = this.adapter.config.outputserversilly;