:hambulance: Fix backup order that have break auto clean

Sebclem · Nov 14, 2022 · cfe6778 · cfe6778
1 parent ded4bc7
commit cfe6778
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/routes/api.js b/nextcloud_backup/rootfs/opt/nextcloud_backup/routes/api.js
@@ -21,7 +21,7 @@ router.get("/formated-local-snap", function (req, res, next) {
     hassioApiTools.getSnapshots()
         .then((snaps) => {
             snaps.sort((a, b) => {
-                return a.date < b.date ? 1 : -1
+                return Date.parse(b.date) - Date.parse(a.date);
             });
 
             res.render("localSnaps", { snaps: snaps, DateTime: DateTime });
@@ -43,7 +43,7 @@ router.get("/formated-backup-manual", function (req, res, next) {
         .getFolderContent(webdav.getConf().back_dir + pathTools.manual)
         .then((contents) => {
             contents.sort((a, b) => {
-                return a.date < b.date ? 1 : -1
+                return Date.parse(b.lastmod) - Date.parse(a.lastmod)
             });
             //TODO Remove this when bug is fixed, etag contain '&quot;' at start and end ?
             for (let backup of contents) {
@@ -67,7 +67,7 @@ router.get("/formated-backup-auto", function (req, res, next) {
         .getFolderContent(url)
         .then((contents) => {
             contents.sort((a, b) => {
-                return a.date < b.date ? 1 : -1
+                return Date.parse(b.lastmod) - Date.parse(a.lastmod)
             });
             //TODO Remove this when bug is fixed, etag contain '&quot;' at start and end ?
             for (let backup of contents) {

diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/hassioApiTools.js b/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/hassioApiTools.js
@@ -295,7 +295,7 @@ function clean() {
                     return;
                 }
                 snaps.sort((a, b) => {
-                    return a.date < b.date ? 1 : -1
+                    return Date.parse(b.date) - Date.parse(a.date);
                 });
                 let toDel = snaps.slice(limit);
                 for (let i of toDel) {

diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/webdavTools.js b/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/webdavTools.js
@@ -380,12 +380,13 @@ class WebdavTools {
         return new Promise((resolve, reject) => {
             this.getFolderContent(this.getConf().back_dir + pathTools.auto)
                 .then(async (contents) => {
+
                     if (contents.length < limit) {
                         resolve();
                         return;
                     }
                     contents.sort((a, b) => {
-                        return a.date < b.date ? 1 : -1
+                        return Date.parse(b.lastmod) - Date.parse(a.lastmod)
                     });
 
                     let toDel = contents.slice(limit);