Compare commits

...

3 Commits

Author SHA1 Message Date
renovate[bot]
a3d0105afd
⬆️ Update dependency app-root-path to v3.1.0 2022-11-14 16:01:20 +00:00
93e821794e
Revert "⬆️ Update dependency bootstrap to v5.2.0 (#168)"
This reverts commit f444243e5c.
2022-11-14 16:59:27 +01:00
cfe6778745
:hambulance: Fix backup order that have break auto clean 2022-11-14 16:51:39 +01:00
5 changed files with 19 additions and 18 deletions

View File

@ -8,8 +8,8 @@
}, },
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-free": "6.1.2", "@fortawesome/fontawesome-free": "6.1.2",
"app-root-path": "3.0.0", "app-root-path": "3.1.0",
"bootstrap": "5.2.0", "bootstrap": "5.1.3",
"cookie-parser": "1.4.6", "cookie-parser": "1.4.6",
"cron": "2.1.0", "cron": "2.1.0",
"debug": "4.3.4", "debug": "4.3.4",

View File

@ -21,7 +21,7 @@ router.get("/formated-local-snap", function (req, res, next) {
hassioApiTools.getSnapshots() hassioApiTools.getSnapshots()
.then((snaps) => { .then((snaps) => {
snaps.sort((a, b) => { 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 }); 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) .getFolderContent(webdav.getConf().back_dir + pathTools.manual)
.then((contents) => { .then((contents) => {
contents.sort((a, b) => { 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 ? //TODO Remove this when bug is fixed, etag contain '&quot;' at start and end ?
for (let backup of contents) { for (let backup of contents) {
@ -67,7 +67,7 @@ router.get("/formated-backup-auto", function (req, res, next) {
.getFolderContent(url) .getFolderContent(url)
.then((contents) => { .then((contents) => {
contents.sort((a, b) => { 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 ? //TODO Remove this when bug is fixed, etag contain '&quot;' at start and end ?
for (let backup of contents) { for (let backup of contents) {

View File

@ -295,7 +295,7 @@ function clean() {
return; return;
} }
snaps.sort((a, b) => { 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); let toDel = snaps.slice(limit);
for (let i of toDel) { for (let i of toDel) {

View File

@ -380,12 +380,13 @@ class WebdavTools {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.getFolderContent(this.getConf().back_dir + pathTools.auto) this.getFolderContent(this.getConf().back_dir + pathTools.auto)
.then(async (contents) => { .then(async (contents) => {
if (contents.length < limit) { if (contents.length < limit) {
resolve(); resolve();
return; return;
} }
contents.sort((a, b) => { 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); let toDel = contents.slice(limit);

View File

@ -116,10 +116,10 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"app-root-path@npm:3.0.0": "app-root-path@npm:3.1.0":
version: 3.0.0 version: 3.1.0
resolution: "app-root-path@npm:3.0.0" resolution: "app-root-path@npm:3.1.0"
checksum: ff91a24db2b55070f6b3e22e72ce8fe8ea847e19eb8a3cbb267f9e9ac2a8372db65114dd6798a4ed7897a6f475b90a49330b3e53bf199d47e6abb5c5279aa1d7 checksum: e3db3957aee197143a0f6c75e39fe89b19e7244f28b4f2944f7276a9c526d2a7ab2d115b4b2d70a51a65a9a3ca17506690e5b36f75a068a7e5a13f8c092389ba
languageName: node languageName: node
linkType: hard linkType: hard
@ -197,12 +197,12 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"bootstrap@npm:5.2.0": "bootstrap@npm:5.1.3":
version: 5.2.0 version: 5.1.3
resolution: "bootstrap@npm:5.2.0" resolution: "bootstrap@npm:5.1.3"
peerDependencies: peerDependencies:
"@popperjs/core": ^2.11.5 "@popperjs/core": ^2.10.2
checksum: 9dbfb5d26bbdac3e27a6b46cb7456cd4dd75ae3b48644737809885b8ea9c265d3359c4cdbf25a55bb7e5046f51e441557033ba21eeaf24ef8316bfbb3d420084 checksum: 301b5ed872efba061104cf22ac93568e3837867fb5527ab9326a51510fb752bd4883e1d488225c8be72f86d9d3a55ef5b166aa7fa62c2fdd077c3f05b65752f8
languageName: node languageName: node
linkType: hard linkType: hard
@ -1094,8 +1094,8 @@ __metadata:
resolution: "nexcloud-backup@workspace:." resolution: "nexcloud-backup@workspace:."
dependencies: dependencies:
"@fortawesome/fontawesome-free": 6.1.2 "@fortawesome/fontawesome-free": 6.1.2
app-root-path: 3.0.0 app-root-path: 3.1.0
bootstrap: 5.2.0 bootstrap: 5.1.3
cookie-parser: 1.4.6 cookie-parser: 1.4.6
cron: 2.1.0 cron: 2.1.0
debug: 4.3.4 debug: 4.3.4