Merge pull request #77 from simatec/multiplatform

(simatec) Code clean for stable Release
simatec · Dec 24, 2018 · 8af6863 · 8af6863
2 parents 9c195eb + 03d0ec8
commit 8af6863
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -21,6 +21,9 @@ Backitup is a backup solution that allows cyclical backup of an IoBroker install
 
 ## Changelog
 
+### 1.0.0 (24.12.2018)
+* (simatec) Stable Release
+
 ### 0.4.4 (19.12.2018)
 * (simatec) Fix cifs-mount User
 

diff --git a/io-package.json b/io-package.json
@@ -1,8 +1,19 @@
 {
     "common": {
         "name": "backitup",
-        "version": "0.4.4",
+        "version": "1.0.0",
         "news": {
+            "1.0.0": {
+                "en": "Stable Release",
+                "de": "Stabiles Release",
+                "ru": "Стабильный релиз",
+                "pt": "Versão estável",
+                "nl": "Stabiele vrijlating",
+                "fr": "Version stable",
+                "it": "Rilascio stabile",
+                "es": "Liberación estable",
+                "pl": "Wersja stabilna"
+            },
             "0.4.4": {
                 "en": "Fix cifs-mount User",
                 "de": "Fix Cifs-mount Benutzer",

diff --git a/lib/execute.js b/lib/execute.js
@@ -93,15 +93,13 @@ function executeScripts(adapter, config, callback, scripts, code) {
                 case 'mysql':
                     if ((config.name === 'total' || config.name === 'minimal' && config.mysqlEnabled === true) && config[name] && config[name].enabled) {
                         func = scripts[name];
-                        //options = config[name];
                         options = Object.assign({}, config[name]);
                     }
                     break;
 
                 case 'redis':
                     if ((config.name === 'total' || config.name === 'minimal' && config.redisEnabled === true) && config[name] && config[name].enabled) {
                         func = scripts[name];
-                        //options = config[name];
                         options = Object.assign({}, config[name]);
                     }
                     break;
@@ -234,10 +232,6 @@ function executeScripts(adapter, config, callback, scripts, code) {
         }
     }
 
-    // todo
-    // delete all local files if required from config.context.fileNames
-    // or delete all files from past backups
-
     adapter && adapter.setState('output.line', '[EXIT] ' + (code || 0));
     callback && callback();
 }

diff --git a/lib/list/cifs.js b/lib/list/cifs.js
@@ -10,7 +10,6 @@ const backupDir = path.join(tools.getIobDir(), 'backups').replace(/\\/g, '/');
 function list(options, types, log, callback) {
     if (options.enabled && options.source === 'NAS / Copy') {
         if (options.mountType === 'CIFS' || options.mountType === 'NFS') {
-            //mount(options, log, () => nasList(options, types, log, callback));
             mount(options, log, error => {
                 error && log.error(error);
                 nasList(options, types, log, callback);
@@ -63,11 +62,6 @@ function nasList(options, types, log, callback) {
                 });
             }
         }
-        /*if (options.mountType === 'CIFS' || options.mountType === 'NFS') {
-            umount(options, log, error => callback && callback(error, files, 'nas / copy'));
-        } else {
-            callback && callback(null, files, 'nas / copy');
-        }*/
         callback && callback(null, files, 'nas / copy');
     } else {
         setImmediate(callback);
@@ -101,7 +95,6 @@ function copyFileCifs(options, fileName, toStoreName, log, callback) {
 function getFile(options, fileName, toStoreName, log, callback) {
     if (options.enabled) {
         if (options.mountType === 'CIFS' || options.mountType === 'NFS') {
-            //mount(options, log, () => copyFileCifs(options, fileName, toStoreName, log, callback));
             callback(null);
         } else {
             copyFileCifs(options, fileName, toStoreName, log, callback);

diff --git a/lib/restore.js b/lib/restore.js
@@ -74,7 +74,6 @@ function startIOB() {
     const cmd = spawn(isWin ? 'startIOB.bat' : 'bash', [isWin ? '' : 'startIOB.sh'], {detached: true, cwd: __dirname, stdio: ['ignore', 'ignore', 'ignore']});
 
     cmd.unref();
-    //setTimeout(() => process.exit(), 1000);
     setTimeout(function() {
 		process.exit();
 	}, 1000);

diff --git a/lib/restore/mysql.js b/lib/restore/mysql.js
@@ -41,13 +41,9 @@ function restore(options, fileName, log, callback) {
     try {
         targz.decompress({
             src: fileName,
-// options.path is not defined.           
-// Dest.wrong           dest: options.path,
             dest: options.backupDir,
             tar: {
                 map: header => {
-
-// Dest.wrong                    header.name = fileNameMysql; // rename "." to mysql_restore_backupiobroker.sql
                     header.name = `mysql_restore_backupiobroker.sql`;
                     return header;
                 }

diff --git a/lib/scripts/30-mysql.js b/lib/scripts/30-mysql.js
@@ -44,8 +44,6 @@ function command(options, log, callback) {
 					clearInterval(timer);
 
 					if (err) {
-						//options.context.errors.mysql = err.toString();
-						//log.error(stderr);
 						if (callback) {
 							callback(err, stderr);
 							callback = null;
@@ -66,7 +64,6 @@ function command(options, log, callback) {
 					}
 				});
                 stream.end();
-                //options.context.done.push('mysql');
                 callback();
             });
 

diff --git a/lib/scripts/60-cifs.js b/lib/scripts/60-cifs.js
@@ -108,7 +108,6 @@ function command(options, log, callback) {
 			});
 		} else if (options.mountType === 'Copy') {
 			callback(`Path "${options.dir}" not found`);
-			// backupDir files will be cleaned in 78-clean.js task
 		} else {
             callback();
         }

diff --git a/lib/scripts/78-clean.js b/lib/scripts/78-clean.js
@@ -62,10 +62,6 @@ function command(options, log, callback) {
         const errors = Object.keys(options.context.errors);
 
         if (!errors.length) {
-            /*if (deleteFiles(fileNames, log, options.context.errors)) {
-                options.context.done.push('clean');
-            }*/
-
             // may be do it configurable
             let dir = options.backupDir.replace(/\\/g, '/');
 

diff --git a/lib/scripts/92-history.js b/lib/scripts/92-history.js
@@ -37,7 +37,6 @@ function command(options, log, callback) {
             }
 
             if (historyArray.length > options.entriesNumber) {
-                // todo: test it!
                 historyArray.splice(options.entriesNumber, historyArray.length - options.entriesNumber);
             }
 

diff --git a/main.js b/main.js
@@ -327,7 +327,6 @@ function initConfig(secret) {
         ftp:  Object.assign({}, ftp,  (adapter.config.ftpOwnDir === true) ? {dir:  adapter.config.ftpMinimalDir} : {}),
         cifs: Object.assign({}, cifs, (adapter.config.cifsOwnDir === true) ? {dir:  adapter.config.cifsMinimalDir}  : {}),
         dropbox: Object.assign({}, dropbox, (adapter.config.dropboxOwnDir === true) ? {dir:  adapter.config.dropboxMinimalDir}  : {}),
-        //mysql,
         mysql: {
             enabled: adapter.config.mySqlEnabled === undefined ? true : adapter.config.mySqlEnabled,
             type: 'creator',
@@ -399,8 +398,6 @@ function initConfig(secret) {
         telegram,
         email,
         pushover,
-
-        //mysql,
         mysql: {
             enabled: adapter.config.mySqlEnabled === undefined ? true : adapter.config.mySqlEnabled,
             type: 'creator',
@@ -479,7 +476,6 @@ function createBashScripts() {
     }
 
     if (isWin) {
-        // todo detect service
         if (!fs.existsSync(__dirname + '/lib/stopIOB.bat')) {
             fs.writeFileSync(__dirname + '/lib/stopIOB.bat', `cd "${path.join(tools.getIobDir())}"\ncall serviceIoBroker.bat stop\ncd "${path.join(__dirname, 'lib')}"\nnode execute.js`);
         }
@@ -493,7 +489,6 @@ function createBashScripts() {
             fs.writeFileSync(__dirname + '/lib/stop_r_IOB.bat', `cd "${path.join(tools.getIobDir())}"\ncall serviceIoBroker.bat stop\ncd "${path.join(__dirname, 'lib')}"\nnode restore.js`);
         }
     } else {
-        // todo detect pm2 or systemd
         if (!fs.existsSync(__dirname + '/lib/stopIOB.sh')) {
             fs.writeFileSync(__dirname + '/lib/stopIOB.sh', `cd "${path.join(tools.getIobDir())}"\nbash iobroker stop\ncd "${path.join(__dirname, 'lib')}"\nnode execute.js`);
             fs.chmodSync(__dirname + '/lib/stopIOB.sh', 508);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iobroker.backitup",
-  "version": "0.4.4",
+  "version": "1.0.0",
   "engines": {
     "node": ">=6.0.0"
   },
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,7 +37,6 @@ function command(options, log, callback) { @@
                 }
                 if (historyArray.length > options.entriesNumber) {
-                    // todo: test it!
                     historyArray.splice(options.entriesNumber, historyArray.length - options.entriesNumber);
                 }
@@ Expand Down @@