diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/routes/api.js b/nextcloud_backup/rootfs/opt/nextcloud_backup/routes/api.js index 3a66c26..21c803c 100644 --- a/nextcloud_backup/rootfs/opt/nextcloud_backup/routes/api.js +++ b/nextcloud_backup/rootfs/opt/nextcloud_backup/routes/api.js @@ -80,14 +80,17 @@ router.get('/nextcloud-settings', function(req, res, next) { router.post('/manual-backup', function(req, res, next) { let id = req.query.id; let name = req.query.name; - // hassioApiTools.downloadSnapshot(id) - // .then(() => { - webdav.uploadFile('8afb4728', '/Hassio Backup/Manual/' + '8afb4728' + '.tar'); + hassioApiTools.downloadSnapshot(id) + .then(() => { + webdav.uploadFile(id, '/Hassio Backup/Manual/' + name + '.tar'); res.send(200); - // }) - // .catch(() => { - // res.send(500); - // }) + }) + .catch(() => { + res.send(500); + }) + +}); + }); diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/webdavTools.js b/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/webdavTools.js index 3c9a182..85e8e12 100644 --- a/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/webdavTools.js +++ b/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/webdavTools.js @@ -1,5 +1,6 @@ const { createClient } = require("webdav"); const fs = require("fs"); +const moment = require('moment'); const statusTools = require('./status'); const endpoint = "/remote.php/webdav" @@ -148,6 +149,8 @@ class WebdavTools { status.status = "idle"; status.message = null; status.error_code = null; + status.last_backup = moment().format("lll") + statusTools.setStatus(status); resolve(); }).catch((err) => { diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/views/index.ejs b/nextcloud_backup/rootfs/opt/nextcloud_backup/views/index.ejs index 13dc5de..fda0c1d 100644 --- a/nextcloud_backup/rootfs/opt/nextcloud_backup/views/index.ejs +++ b/nextcloud_backup/rootfs/opt/nextcloud_backup/views/index.ejs @@ -112,7 +112,7 @@