iobroker.zigbee 1.7.1 → 1.7.2

package/README.md

@@ -126,11 +126,14 @@ You can thank the authors by these links:
     npm run release patch -- --all 0.9.8 -> 0.9.9
     npm run release prerelease beta -- --all v0.2.1 -> v0.2.2-beta.0
     Placeholder for the next version (at the beginning of the line):
-    
+     ## **WORK IN PROGRESS**
 -->
 
 
 ## Changelog
+### 1.7.2 (2022-05-28)
+* (arteck) download missing icons corr
+
 ### 1.7.1 (2022-05-28)
 * (arteck) available status in admin is colored
 * (arteck) disable Backups checkbox in settings

package/io-package.json

@@ -1,8 +1,20 @@
 {
     "common": {
         "name": "zigbee",
-        "version": "1.7.1",
+        "version": "1.7.2",
         "news": {
+            "1.7.2": {
+               "en": "corr download missing icon",
+               "de": "korrektur download fehlendes Icon",
+               "ru": "Корр скачать отсутствует значок",
+               "pt": "corr baixar ícone ausente",
+               "nl": "corr download ontbreekt icoon",
+               "fr": "corr télécharger l'icône manquante",
+               "it": "corr download icona mancante",
+               "es": "falta el icono de descarga corr",
+               "pl": "brak ikony pobierania corr",
+               "zh-cn": "更正下载丢失的图标"
+            },        
             "1.7.1": {
               "en": "Device status is displayed in admin interface with color and icon.\nInternal adapter backups can be disabled (for backups with BackItUp Adapter).\nOnly last 10 backups are kept (currently they accumulate and need to be deleted manually).\nNew function for missing icons in Admin Object tree.",
               "de": "Der Gerätestatus wird in der Admin-Oberfläche mit Farbe und Symbol angezeigt.\nInterne Adapter-Backups können deaktiviert werden (für Backups mit BackItUp Adapter).\nNur die letzten 10 Backups werden aufbewahrt (derzeit sammeln sie sich an und müssen manuell gelöscht werden).\nNeue Funktion für fehlende Symbole im Admin-Objektbaum.",
@@ -160,7 +172,7 @@
               "condition": {
                 "operand": "and",
                 "rules": [
-                  "oldVersion<1.6.18",
+                  "oldVersion<=1.6.18",
                   "newVersion>=1.7.0"
                 ]
               },              

package/lib/statescontroller.js

@@ -492,11 +492,17 @@ class StatesController extends EventEmitter {
         const modelDesc = statesMapping.findModel(model);
         let icon = (modelDesc && modelDesc.icon) ? modelDesc.icon : 'img/unknown.png';
         // clear icon if it external
-        const pathToIcon = this.adapter.adapterDir + '/admin/img/' + model + '.png';
+        const model_modif = model.replace('/','-');
+        const pathToIcon = this.adapter.adapterDir + '/admin/img/' + model_modif + '.png';
 
         if (icon.startsWith('http')) {
-            this.downloadIcon(icon, pathToIcon);
-            icon = 'img/' + model + '.png';
+            this.warn(`download icon from ${icon} saved into ${pathToIcon}`);
+            try {           
+                this.downloadIcon(icon, pathToIcon);          
+                icon = 'img/' + model_modif + '.png';
+            } catch (e) {
+                this.debug(`ERROR : icon not found from ${icon} saved into ${pathToIcon}`);
+            }
         }
         
         this.adapter.setObjectNotExists(id, {
@@ -511,28 +517,29 @@ class StatesController extends EventEmitter {
     }
 
     async downloadIcon(url, image_path) {
-        if (!fs.existsSync(image_path)) {
-            var download = function(uri, filename, callback){
-                request.head(uri, function(err, res, body){
-                    if (err) callback(err, filename);
-                    else {
-                        var stream = request(uri);
-                        stream.pipe(
-                            fs.createWriteStream(filename)
-                                .on('error', function(err){
-                                    callback(error, filename);
-                                    stream.read();
-                                })
-                        )
-                            .on('close', function() {
-                                // here admin upload
-                        });
-                    }
-                });
-            };
-            download(url,image_path);
-        }
+      if (!fs.existsSync(image_path)) {
+          return new Promise((resolve, reject) => {
+              request.head(url, function (err, res, body) {
+                  if (err) {
+                      return reject(err);
+                  }
+                  let stream = request(url);
+                  stream.pipe(
+                      fs.createWriteStream(image_path)
+                          .on('error',  err => {
+                              reject(err);
+                          })
+                      )
+                          .on('close', function () {
+                              // here admin upload and then
+                              resolve();
+                          });
+               });
+          });
+       }
     }
+    
+ 
     async syncDevStates(dev, model) {
         const devId = dev.ieeeAddr.substr(2);
         // devId - iobroker device id

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"