From 4dec2579f5a73e402555e11cb6b90b407001d27a Mon Sep 17 00:00:00 2001 From: Sebastien Clement Date: Fri, 10 Jan 2020 19:52:42 +0100 Subject: [PATCH] :hammer: Clean at the end of upload --- .../opt/nextcloud_backup/tools/webdavTools.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/webdavTools.js b/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/webdavTools.js index 37883a4..23dedd2 100644 --- a/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/webdavTools.js +++ b/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/webdavTools.js @@ -8,6 +8,7 @@ const configPath = "./webdav_conf.json" const path = require('path'); const settingsTools = require('./settingsTools'); const pathTools = require('./pathTools'); +const hassioApiTools = require('./hassioApiTools'); const request = require('request'); @@ -202,7 +203,17 @@ class WebdavTools { statusTools.setStatus(status); cleanTempFolder(); + let autoCleanCloud = settingsTools.getSettings().auto_clean_backup; + if (autoCleanCloud != null && autoCleanCloud == "true") { + this.clean().catch(); + } + let autoCleanlocal = settingsTools.getSettings().auto_clean_local; + if (autoCleanlocal != null && autoCleanlocal == "true") { + hassioApiTools.clean(); + } resolve(); + + } }) }); @@ -221,7 +232,7 @@ class WebdavTools { clean() { let limit = settingsTools.getSettings().auto_clean_local_keep; - if(limit == null) + if (limit == null) limit = 5; return new Promise((resolve, reject) => { this.getFolderContent(pathTools.auto).then(async (contents) => { @@ -246,7 +257,7 @@ class WebdavTools { }).catch((error) => { status.status = "error"; status.error_code = 6; - status.message = "Fail to clean Nexcloud ("+ error + ") !" + status.message = "Fail to clean Nexcloud (" + error + ") !" statusTools.setStatus(status); console.error(status.message); reject(status.message);