From 4cdb25c091aa4f9d1d46f3048347cca99d2fb055 Mon Sep 17 00:00:00 2001 From: SebClem Date: Sat, 12 Sep 2020 16:45:29 +0200 Subject: [PATCH 1/3] :hammer: Split modals in different files --- .../opt/nextcloud_backup/views/index.ejs | 199 +----------------- .../views/modals/backup-settings-modal.ejs | 133 ++++++++++++ .../views/modals/nextcloud-settings-modal.ejs | 65 ++++++ 3 files changed, 205 insertions(+), 192 deletions(-) create mode 100644 nextcloud_backup/rootfs/opt/nextcloud_backup/views/modals/backup-settings-modal.ejs create mode 100644 nextcloud_backup/rootfs/opt/nextcloud_backup/views/modals/nextcloud-settings-modal.ejs diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/views/index.ejs b/nextcloud_backup/rootfs/opt/nextcloud_backup/views/index.ejs index 0baecd2..bb75d6c 100644 --- a/nextcloud_backup/rootfs/opt/nextcloud_backup/views/index.ejs +++ b/nextcloud_backup/rootfs/opt/nextcloud_backup/views/index.ejs @@ -177,198 +177,9 @@ -
-
-
-
-

Nextcloud Settings

-
-
-
-
-
-
-
-
+ <%- include('modals/nextcloud-settings-modal') %> -
-
-
-
-
SSL
-
- -
- -
-
-
-
- - - exemple.com:8080 -
-
-
-
- - -
-
- - - !!! Use App Password !!! See doc for more - information. -
-
- -
- - -
- Cancel - Save - -
-
- -
-
-
-
-

Backup Settings

-
-
-
-
-
-
-
-
- - -
-
-
-
- - -
-
- -
-
- - -
-
- -
-
- - -
-
-

- -

-
- -
-
-
- -
-
-
-
-

Auto Clean Settings

-
-
-
-
- -
-
- -
-
-
Auto Clean Local Snapshots
-
- -
- -
-
-
-
- - -
-
-

- -

-
- -
- -
-
-
Auto Clean Nextcloud Snapshots
-
- -
- -
-
-
-
- - -
-
-

- -

-
- -
- -
- - - - -
- Cancel - Save - -
-
+ <%- include('modals/backup-settings-modal') %>
@@ -631,7 +442,8 @@ let hostname = $('#hostname').val(); let username = $('#username').val(); let password = $('#password').val(); - $.post('./api/nextcloud-settings', { ssl: ssl, host: hostname, username: username, password: password }) + let back_dir = $('#back-dir').val(); + $.post('./api/nextcloud-settings', { ssl: ssl, host: hostname, username: username, password: password, back_dir: back_dir }) .done((data) => { console.log('Saved'); $('#nextcloud_settings_message').parent().addClass("hide"); @@ -676,6 +488,9 @@ $('#password').val(data.password); $('#password + label').removeClass("active"); $('#password + label').addClass("active"); + $('#back-dir').val(data.back_dir); + $('#back-dir + label').removeClass("active"); + $('#back-dir + label').addClass("active"); loadingModal.close(); }); } diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/views/modals/backup-settings-modal.ejs b/nextcloud_backup/rootfs/opt/nextcloud_backup/views/modals/backup-settings-modal.ejs new file mode 100644 index 0000000..844b32c --- /dev/null +++ b/nextcloud_backup/rootfs/opt/nextcloud_backup/views/modals/backup-settings-modal.ejs @@ -0,0 +1,133 @@ +
+
+
+
+

Backup Settings

+
+
+
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+

+ +

+
+ +
+
+
+ +
+
+
+
+

Auto Clean Settings

+
+
+
+
+ +
+
+ +
+
+
Auto Clean Local Snapshots
+
+ +
+ +
+
+
+
+ + +
+
+

+ +

+
+ +
+ +
+
+
Auto Clean Nextcloud Snapshots
+
+ +
+ +
+
+
+
+ + +
+
+

+ +

+
+ +
+ +
+ + + + +
+ Cancel + Save + +
+
\ No newline at end of file diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/views/modals/nextcloud-settings-modal.ejs b/nextcloud_backup/rootfs/opt/nextcloud_backup/views/modals/nextcloud-settings-modal.ejs new file mode 100644 index 0000000..d288160 --- /dev/null +++ b/nextcloud_backup/rootfs/opt/nextcloud_backup/views/modals/nextcloud-settings-modal.ejs @@ -0,0 +1,65 @@ +
+
+
+
+

Nextcloud Settings

+
+
+
+
+
+
+
+
+ +
+
+
+
+
SSL
+
+ +
+ +
+
+
+
+ + + exemple.com:8080 +
+
+
+
+ + +
+
+ + + !!! Use App Password !!! See doc for more + information. +
+
+
+
+ + + Default: /Hassio Backup/ +
+
+ +
+ + +
+ Cancel + Save + +
+
\ No newline at end of file From 25618ccd91692cf8d32c0a98dd6592042a79964a Mon Sep 17 00:00:00 2001 From: SebClem Date: Sat, 12 Sep 2020 16:47:32 +0200 Subject: [PATCH 2/3] :hammer: Add setting to specify backup directory --- .../rootfs/opt/nextcloud_backup/routes/api.js | 15 ++++-- .../opt/nextcloud_backup/tools/cronTools.js | 2 +- .../opt/nextcloud_backup/tools/pathTools.js | 9 ++-- .../opt/nextcloud_backup/tools/webdavTools.js | 50 ++++++++++++++++--- 4 files changed, 59 insertions(+), 17 deletions(-) diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/routes/api.js b/nextcloud_backup/rootfs/opt/nextcloud_backup/routes/api.js index f163947..2fdb47f 100644 --- a/nextcloud_backup/rootfs/opt/nextcloud_backup/routes/api.js +++ b/nextcloud_backup/rootfs/opt/nextcloud_backup/routes/api.js @@ -30,10 +30,14 @@ router.get('/formated-local-snap', function(req, res, next) { hassioApiTools.getSnapshots().then( (snaps) => { snaps.sort((a, b) => { - if (moment(a.date).isBefore(moment(b.date))) + if (moment(a.date).isBefore(moment(b.date))){ return 1; + } else + { return -1; + } + }) res.render('localSnaps', { snaps: snaps, moment: moment }); }, @@ -46,7 +50,7 @@ router.get('/formated-local-snap', function(req, res, next) { }); router.get('/formated-backup-manual', function(req, res, next) { - webdav.getFolderContent(pathTools.manual) + webdav.getFolderContent( webdav.getConf().back_dir + pathTools.manual) .then((contents) => { contents.sort((a, b) => { if (moment(a.lastmod).isBefore(moment(b.lastmod))) @@ -62,7 +66,8 @@ router.get('/formated-backup-manual', function(req, res, next) { }); router.get('/formated-backup-auto', function(req, res, next) { - webdav.getFolderContent(pathTools.auto) + let url = webdav.getConf().back_dir + pathTools.auto + webdav.getFolderContent( url ) .then((contents) => { contents.sort((a, b) => { if (moment(a.lastmod).isBefore(moment(b.lastmod))) @@ -122,7 +127,7 @@ router.post('/manual-backup', function(req, res, next) { hassioApiTools.downloadSnapshot(id) .then(() => { - webdav.uploadFile(id, pathTools.manual + name + '.tar'); + webdav.uploadFile(id, webdav.getConf().back_dir + pathTools.manual + name + '.tar'); res.status(201); res.send(); }) @@ -145,7 +150,7 @@ router.post('/new-backup', function(req, res, next) { hassioApiTools.createNewBackup(name).then((id) => { hassioApiTools.downloadSnapshot(id) .then(() => { - webdav.uploadFile(id, pathTools.manual + name + '.tar'); + webdav.uploadFile(id, webdav.getConf().back_dir + pathTools.manual + name + '.tar'); }).catch(() => { }) diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/cronTools.js b/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/cronTools.js index 04b8854..1f98f5d 100644 --- a/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/cronTools.js +++ b/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/cronTools.js @@ -128,7 +128,7 @@ class CronContainer { hassioApiTools.createNewBackup(name).then((id) => { hassioApiTools.downloadSnapshot(id) .then(() => { - webdav.uploadFile(id, pathTools.auto + name + '.tar'); + webdav.uploadFile(id, webdav.getConf().back_dir + pathTools.auto + name + '.tar'); }).catch(() => { }) diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/pathTools.js b/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/pathTools.js index e4777c6..0cc1c3d 100644 --- a/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/pathTools.js +++ b/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/pathTools.js @@ -1,4 +1,5 @@ -let root = '/Hassio Backup/'; -exports.root = root; -exports.manual = root + 'Manual/'; -exports.auto = root + 'Auto/'; \ No newline at end of file + +let default_root = '/Hassio Backup/'; +exports.default_root = default_root; +exports.manual = 'Manual/'; +exports.auto = 'Auto/'; \ No newline at end of file diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/webdavTools.js b/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/webdavTools.js index e277b87..b7de3d1 100644 --- a/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/webdavTools.js +++ b/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/webdavTools.js @@ -64,12 +64,31 @@ class WebdavTools { }); } + async __createRoot(){ + let root_splited = this.getConf().back_dir.split('/').splice(1) + let path = '/' + for(let elem of root_splited){ + if(elem != ''){ + path = path + elem + '/' + try { + await this.client.createDirectory(path) + logger.debug(`Path ${path} created.`) + } catch (error) { + if(error.response.status == 405) + logger.debug(`Path ${path} already exist.`) + else + logger.error(error) + } + } + + } + } initFolder() { - return new Promise((resolve, reject) => { - this.client.createDirectory(pathTools.root).catch(() => { }).then(() => { - this.client.createDirectory(pathTools.auto).catch(() => { }).then(() => { - this.client.createDirectory(pathTools.manual).catch(() => { }).then(() => { + return new Promise((resolve) => { + this.__createRoot().catch((err) => { logger.error(err)}).then(() => { + this.client.createDirectory(this.getConf().back_dir + pathTools.auto).catch(() => { }).then(() => { + this.client.createDirectory(this.getConf().back_dir + pathTools.manual).catch(() => { }).then(() => { resolve(); }) }) @@ -105,6 +124,24 @@ class WebdavTools { logger.error(status.message); reject("Nextcloud config invalid !"); } + + if(conf.back_dir == null || conf.back_dir == ''){ + logger.info('Backup dir is null, initializing it.'); + conf.back_dir = pathTools.default_root; + this.setConf(conf); + } + else{ + if(!conf.back_dir.startsWith('/')){ + logger.warn('Backup dir not starting with \'/\', fixing this...'); + conf.back_dir=`/${conf.back_dir}`; + this.setConf(conf); + } + if(!conf.back_dir.endsWith('/')){ + logger.warn('Backup dir not ending with \'/\', fixing this...'); + conf.back_dir=`${conf.back_dir}/`; + this.setConf(conf); + } + } } else { status.status = "error"; @@ -147,7 +184,7 @@ class WebdavTools { } _startUpload(id, path) { - return new Promise( async (resolve, reject) => { + return new Promise( (resolve, reject) => { let status = statusTools.getStatus(); status.status = "upload"; status.progress = 0; @@ -156,7 +193,6 @@ class WebdavTools { statusTools.setStatus(status); logger.info('Uploading snap...'); let tmpFile = `./temp/${id}.tar` - let fileSize = fs.statSync(tmpFile).size; let stream = fs.createReadStream(tmpFile); let options = { @@ -237,7 +273,7 @@ class WebdavTools { if (limit == null) limit = 5; return new Promise((resolve, reject) => { - this.getFolderContent(pathTools.auto).then(async (contents) => { + this.getFolderContent(this.getConf().back_dir + pathTools.auto).then(async (contents) => { if (contents.length < limit) { resolve(); return; From e10d3b5278d39a0eb89b68fbe1fa7afb2897989d Mon Sep 17 00:00:00 2001 From: SebClem Date: Sat, 12 Sep 2020 16:47:55 +0200 Subject: [PATCH 3/3] :pencil2: Remove log file --- nextcloud_backup/rootfs/opt/nextcloud_backup/config/winston.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/config/winston.js b/nextcloud_backup/rootfs/opt/nextcloud_backup/config/winston.js index 018c545..424cffc 100644 --- a/nextcloud_backup/rootfs/opt/nextcloud_backup/config/winston.js +++ b/nextcloud_backup/rootfs/opt/nextcloud_backup/config/winston.js @@ -22,7 +22,7 @@ const logger = winston.createLogger({ // - Write all logs error (and below) to `quick-start-error.log`. // new winston.transports.Console({handleExceptions: true}), - new winston.transports.File({filename: '/data/NCB.log', handleExceptions: true}) + // new winston.transports.File({filename: '/data/NCB.log', handleExceptions: true}) ] });