(simatec) ESPHome Backup added

simatec · Nov 1, 2023 · 956f654 · 956f654
1 parent e31afb5
commit 956f654
Show file tree

Hide file tree

Showing 22 changed files with 233 additions and 6 deletions.
diff --git a/admin/i18n/de/translations.json b/admin/i18n/de/translations.json
@@ -78,6 +78,7 @@
   "Dropbox-API Type": "Dropbox-API Typ",
   "Dropbox: Yes": "Dropbox: Ja",
   "E-Mail": "E-Mail",
+  "ESPHome": "ESPHome",
   "Enable / disable log": "Log aktivieren / deaktivieren",
   "Enable Notifications": "Benachrichtigungen aktivieren",
   "Enable debug": "Debug aktivieren",

diff --git a/admin/i18n/en/translations.json b/admin/i18n/en/translations.json
@@ -78,6 +78,7 @@
   "Dropbox-API Type": "Dropbox-API Type",
   "Dropbox: Yes": "Dropbox: Yes",
   "E-Mail": "E-mail",
+  "ESPHome": "ESPHome",
   "Enable / disable log": "Enable / disable log",
   "Enable Notifications": "Enable Notifications",
   "Enable debug": "Enable debug",

diff --git a/admin/i18n/es/translations.json b/admin/i18n/es/translations.json
@@ -78,6 +78,7 @@
   "Dropbox-API Type": "Tipo de API de Dropbox",
   "Dropbox: Yes": "Dropbox: si",
   "E-Mail": "Correo electrónico",
+  "ESPHome": "ESPHome",
   "Enable / disable log": "Activar / desactivar registro",
   "Enable Notifications": "Permitir notificaciones",
   "Enable debug": "Habilitar depuración",

diff --git a/admin/i18n/fr/translations.json b/admin/i18n/fr/translations.json
@@ -78,6 +78,7 @@
   "Dropbox-API Type": "Type d'API Dropbox",
   "Dropbox: Yes": "Dropbox: oui",
   "E-Mail": "Email",
+  "ESPHome": "ESPHome",
   "Enable / disable log": "Activer / désactiver le journal",
   "Enable Notifications": "Activer les notifications",
   "Enable debug": "Activer le débogage",

diff --git a/admin/i18n/it/translations.json b/admin/i18n/it/translations.json
@@ -78,6 +78,7 @@
   "Dropbox-API Type": "Tipo di API Dropbox",
   "Dropbox: Yes": "Dropbox: Sì",
   "E-Mail": "E-mail",
+  "ESPHome": "ESPHIO",
   "Enable / disable log": "Attiva / disattiva registro",
   "Enable Notifications": "Attivare le notifiche",
   "Enable debug": "Abilita debug",

diff --git a/admin/i18n/nl/translations.json b/admin/i18n/nl/translations.json
@@ -78,6 +78,7 @@
   "Dropbox-API Type": "Dropbox-API-type",
   "Dropbox: Yes": "Dropbox: Ja",
   "E-Mail": "E-mail",
+  "ESPHome": "ESPHome",
   "Enable / disable log": "Activeer / deactiveer log",
   "Enable Notifications": "Notificaties aanzetten",
   "Enable debug": "Foutopsporing inschakelen",

diff --git a/admin/i18n/pl/translations.json b/admin/i18n/pl/translations.json
@@ -78,6 +78,7 @@
   "Dropbox-API Type": "Typ Dropbox-API",
   "Dropbox: Yes": "Dropbox: Tak",
   "E-Mail": "E-mail",
+  "ESPHome": "ESPHom",
   "Enable / disable log": "Aktywuj / dezaktywuj dziennik",
   "Enable Notifications": "Włącz powiadomienia",
   "Enable debug": "Włącz debugowanie",

diff --git a/admin/i18n/pt/translations.json b/admin/i18n/pt/translations.json
@@ -78,6 +78,7 @@
   "Dropbox-API Type": "Tipo de API do Dropbox",
   "Dropbox: Yes": "Dropbox: sim",
   "E-Mail": "O email",
+  "ESPHome": "ESPHome",
   "Enable / disable log": "Ativar / desativar log",
   "Enable Notifications": "Ativar notificações",
   "Enable debug": "Ativar depuração",

diff --git a/admin/i18n/ru/translations.json b/admin/i18n/ru/translations.json
@@ -78,6 +78,7 @@
   "Dropbox-API Type": "Тип Dropbox-API",
   "Dropbox: Yes": "Dropbox: Да",
   "E-Mail": "Эл. почта",
+  "ESPHome": "ESPГлавная",
   "Enable / disable log": "Включение / отключение логирования",
   "Enable Notifications": "Включить уведомления",
   "Enable debug": "Включить отладку",

diff --git a/admin/i18n/uk/translations.json b/admin/i18n/uk/translations.json
@@ -78,6 +78,7 @@
   "Dropbox-API Type": "Тип Dropbox-API",
   "Dropbox: Yes": "Dropbox: Так",
   "E-Mail": "Електронна пошта",
+  "ESPHome": "ESPбудинки",
   "Enable / disable log": "Увімкнути/вимкнути журнал",
   "Enable Notifications": "Увімкнути сповіщення",
   "Enable debug": "Увімкнути налагодження",

diff --git a/admin/i18n/zh-cn/translations.json b/admin/i18n/zh-cn/translations.json
@@ -78,6 +78,7 @@
   "Dropbox-API Type": "Dropbox-API 类型",
   "Dropbox: Yes": "保管箱：是的",
   "E-Mail": "电子邮件",
+  "ESPHome": "ESPHome",
   "Enable / disable log": "启用/禁用日志",
   "Enable Notifications": "启用通知",
   "Enable debug": "启用调试",

diff --git a/admin/index_m.html b/admin/index_m.html
@@ -126,6 +126,10 @@ <h6 class="translate title" style="background-color:#174475; font-size: 0.9rem;
                         <input class="value" id="jarvisEnabled" type="checkbox"/>
                         <label for="jarvisEnabled" class="translate">Jarvis Backup</label>
                     </div>
+                    <div class="input-field col s6 l2">
+                        <input class="value" id="esphomeEnabled" type="checkbox"/>
+                        <label for="esphomeEnabled" class="translate">ESPHome</label>
+                    </div>
                 </div>
                 <div class="row" style="padding: 2px;">
                     <h6 class="translate title" style="background-color:#174475; font-size: 0.9rem; border-radius: 4px;">Storage location</h6>

diff --git a/admin/index_m.js b/admin/index_m.js
@@ -12,6 +12,7 @@ var storageTyp = '';
 
 var oldJavascriptsEnabled;
 var oldZigbeeEnabled;
+var oldesphomeEnabled;
 var oldNoderedEnabled;
 var oldJarvisEnabled;
 var oldHistoryEnabled;
@@ -311,13 +312,13 @@ function checkAdapterInstall(name, backitupHost) {
                 for (var i = 0; i < res.rows.length; i++) {
                     var common = res.rows[i].value.common;
 
-                    if (common.host !== backitupHost && (adapterName == 'zigbee' || adapterName == 'zigbee2mqtt' || adapterName == 'node-red' || adapterName == 'yahka' || adapterName == 'jarvis' || adapterName == 'history')) {
+                    if (common.host !== backitupHost && (adapterName == 'zigbee' || adapterName == 'esphome' || adapterName == 'zigbee2mqtt' || adapterName == 'node-red' || adapterName == 'yahka' || adapterName == 'jarvis' || adapterName == 'history')) {
                         showMessage(_("No %s Instance found on this host. Please check your System", adapterName), _('Backitup Warning!'), 'info');
                         ignoreMessage.push(name);
                         break;
                     }
                 }
-            } else if (res.rows.length == 0 && (adapterName == 'zigbee' || adapterName == 'zigbee2mqtt' || adapterName == 'node-red' || adapterName == 'yahka' || adapterName == 'jarvis' || adapterName == 'history')) {
+            } else if (res.rows.length == 0 && (adapterName == 'zigbee' || adapterName == 'esphome' || adapterName == 'zigbee2mqtt' || adapterName == 'node-red' || adapterName == 'yahka' || adapterName == 'jarvis' || adapterName == 'history')) {
                 showMessage(_("No %s Instance found on this host. Please check your System", adapterName), _('Backitup Warning!'), 'info');
                 ignoreMessage.push(name);
             }
@@ -401,6 +402,7 @@ function load(settings, onChange) {
 
     oldJavascriptsEnabled = settings.javascriptsEnabled;
     oldZigbeeEnabled = settings.zigbeeEnabled;
+    oldesphomeEnabled = settings.esphomeEnabled;
     oldZigbee2MQTTEnabled = settings.zigbee2mqttEnabled;
     oldNoderedEnabled = settings.noderedEnabled;
     oldJarvisEnabled = settings.jarvisEnabled;
@@ -805,6 +807,7 @@ function load(settings, onChange) {
                                 file.search('influxDB') == -1 &&
                                 file.search('pgsql') == -1 &&
                                 file.search('zigbee') == -1 &&
+                                file.search('esphome') == -1 &&
                                 file.search('zigbee2mqtt') == -1 &&
                                 file.search('nodered') == -1 &&
                                 file.search('yahka') == -1 &&
@@ -1767,6 +1770,13 @@ function showHideSettings(settings) {
     } else {
         cleanIgnoreMessage('zigbee');
     }
+    if ($('#esphomeEnabled').prop('checked')) {
+        if (!oldesphomeEnabled) {
+            checkAdapterInstall('esphome', common.host);
+        }
+    } else {
+        cleanIgnoreMessage('esphome');
+    }
     if ($('#zigbee2mqttEnabled').prop('checked')) {
         if (!oldZigbee2MQTTEnabled) {
             checkAdapterInstall('zigbee2mqtt', common.host);

diff --git a/admin/tab_m.js b/admin/tab_m.js
@@ -315,6 +315,7 @@ function load(settings, onChange) {
                                 file.search('influxDB') == -1 &&
                                 file.search('pgsql') == -1 &&
                                 file.search('zigbee') == -1 &&
+                                file.search('esphome') == -1 &&
                                 file.search('zigbee2mqtt') == -1 &&
                                 file.search('nodered') == -1 &&
                                 file.search('yahka') == -1 &&
@@ -648,6 +649,7 @@ function fillBackupOptions(settings) {
     if (settings.redisEnabled) _options.push(_('Save Redis state'));
     if (settings.javascriptsEnabled) _options.push(_('Javascripts Backup'));
     if (settings.zigbeeEnabled) _options.push(_('Save Zigbee database'));
+    if (settings.esphomeEnabled) _options.push(_('ESPHome'));
     if (settings.zigbee2mqttEnabled) _options.push(_('Zigbee2MQTT'));
     if (settings.noderedEnabled) _options.push(_('Node-Red Backup'));
     if (settings.yahkaEnabled) _options.push(_('Yahka (Homekit) Backup'));

diff --git a/admin/words.js b/admin/words.js
diff --git a/flat b/flat
@@ -1 +1 @@
-[11:20:37] Using gulpfile /opt/iobroker/node_modules/iobroker.backitup/gulpfile.js
+[12:50:21] Using gulpfile /opt/iobroker/node_modules/iobroker.backitup/gulpfile.js
diff --git a/io-package.json b/io-package.json
@@ -379,6 +379,7 @@
     "historyPath": "media/usb/history",
     "javascriptsEnabled": false,
     "zigbeeEnabled": false,
+    "esphomeEnabled": false,
     "yahkaEnabled": false,
     "jarvisEnabled": false,
     "notificationEnabled": false,

diff --git a/lib/execute.js b/lib/execute.js
@@ -135,6 +135,12 @@ function executeScripts(adapter, config, callback, scripts, code) {
                         options = Object.assign({}, config[name]);
                     }
                     break;
+                case 'esphome':
+                    if (config.name === 'iobroker' && config[name] && config[name].enabled) {
+                        func = scripts[name];
+                        options = Object.assign({}, config[name]);
+                    }
+                    break;
                 case 'zigbee2mqtt':
                     if (config.name === 'iobroker' && config[name] && config[name].enabled) {
                         func = scripts[name];
@@ -318,6 +324,7 @@ function executeScripts(adapter, config, callback, scripts, code) {
                     if (_options.javascripts && !_options.javascripts.enabled) delete _options.javascripts;
                     if (_options.jarvis && !_options.jarvis.enabled) delete _options.jarvis;
                     if (_options.zigbee && !_options.zigbee.enabled) delete _options.zigbee;
+                    if (_options.esphome && !_options.esphome.enabled) delete _options.esphome;
                     if (_options.zigbee2mqtt && !_options.zigbee2mqtt.enabled) delete _options.zigbee2mqtt;
                     if (_options.nodered && !_options.nodered.enabled) delete _options.nodered;
                     if (_options.yahka && !_options.yahka.enabled) delete _options.yahka;
@@ -333,6 +340,7 @@ function executeScripts(adapter, config, callback, scripts, code) {
                     if (_options.grafana && _options.grafana.backupDir !== undefined) delete _options.grafana.backupDir;
                     if (_options.jarvis && _options.jarvis.backupDir !== undefined) delete _options.jarvis.backupDir;
                     if (_options.zigbee && _options.zigbee.backupDir !== undefined) delete _options.zigbee.backupDir;
+                    if (_options.esphome && _options.esphome.backupDir !== undefined) delete _options.esphome.backupDir;
                     if (_options.zigbee2mqtt && _options.zigbee2mqtt.backupDir !== undefined) delete _options.zigbee2mqtt.backupDir;
                     if (_options.nodered && _options.nodered.backupDir !== undefined) delete _options.nodered.backupDir;
                     if (_options.yahka && _options.yahka.backupDir !== undefined) delete _options.yahka.backupDir;

diff --git a/lib/restore.js b/lib/restore.js
@@ -50,7 +50,7 @@ function getFile(options, storageType, fileName, toSaveName, log, callback) {
     } else {
         const name = fileName.split('/').pop();
         let backupType = name.split('.')[0];
-        if (backupType !== 'nodered' && backupType !== 'zigbee' && backupType !== 'jarvis' && backupType !== 'yahka') {
+        if (backupType !== 'nodered' && backupType !== 'zigbee' && backupType !== 'jarvis' && backupType !== 'yahka' && backupType !== 'esphome') {
             backupType = name.split('_')[0];
         }
 
@@ -126,7 +126,7 @@ function restore(adapter, options, storageType, fileName, currentTheme, bashDir,
             if (!err && fs.existsSync(toSaveName)) {
                 let backupType = name.split('.')[0];
 
-                if (backupType !== 'nodered' && backupType !== 'zigbee' && backupType !== 'jarvis' && backupType !== 'yahka') {
+                if (backupType !== 'nodered' && backupType !== 'zigbee' && backupType !== 'jarvis' && backupType !== 'yahka' && backupType !== 'esphome') {
                     backupType = name.split('_')[0];
                 }
 
@@ -336,7 +336,7 @@ if (typeof module !== "undefined" && module.parent) {
             },
             exit: function (exitCode) {
                 writeIntoFile(logName, `[EXIT] ${exitCode}`);
-                if (exitCode == 0 || exitCode == 'mysql restore done' || exitCode == 'sqlite restore done' || exitCode == 'redis restore done' || exitCode == 'historyDB restore done' || exitCode == 'zigbee database restore done' || exitCode == 'node-red restore done' || exitCode == 'yahka database restore done' || exitCode == 'jarvis database restore done' || exitCode == 'influxDB restore done' || exitCode == 'postgresql restore done' || exitCode == 'Grafana restore done' || exitCode == 'javascript restore done') {
+                if (exitCode == 0 || exitCode == 'mysql restore done' || exitCode == 'sqlite restore done' || exitCode == 'redis restore done' || exitCode == 'historyDB restore done' || exitCode == 'zigbee database restore done' || exitCode == 'ESPHome data restore done' || exitCode == 'node-red restore done' || exitCode == 'yahka database restore done' || exitCode == 'jarvis database restore done' || exitCode == 'influxDB restore done' || exitCode == 'postgresql restore done' || exitCode == 'Grafana restore done' || exitCode == 'javascript restore done') {
                     logWebIF += `[EXIT] ${exitCode} **** Restore completed successfully!! ****\n`;
                     statusColor = '#7fff00';
                     restoreStatus = 'Restore completed successfully!! Starting iobroker... Please wait!';