Compare commits

...

3 Commits

Author SHA1 Message Date
renovate[bot]
74d287ebdf
⬆️ Update dependency winston to v3.9.0 2023-05-28 11:57:07 +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 20 additions and 18 deletions

View File

@ -9,7 +9,7 @@
"dependencies": {
"@fortawesome/fontawesome-free": "6.1.2",
"app-root-path": "3.0.0",
"bootstrap": "5.2.0",
"bootstrap": "5.1.3",
"cookie-parser": "1.4.6",
"cron": "2.1.0",
"debug": "4.3.4",
@ -22,7 +22,7 @@
"luxon": "3.0.1",
"morgan": "1.10.0",
"webdav": "4.10.0",
"winston": "3.8.1"
"winston": "3.9.0"
},
"packageManager": "yarn@3.2.2"
}

View File

@ -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) {

View File

@ -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) {

View File

@ -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);

View File

@ -197,12 +197,12 @@ __metadata:
languageName: node
linkType: hard
"bootstrap@npm:5.2.0":
version: 5.2.0
resolution: "bootstrap@npm:5.2.0"
"bootstrap@npm:5.1.3":
version: 5.1.3
resolution: "bootstrap@npm:5.1.3"
peerDependencies:
"@popperjs/core": ^2.11.5
checksum: 9dbfb5d26bbdac3e27a6b46cb7456cd4dd75ae3b48644737809885b8ea9c265d3359c4cdbf25a55bb7e5046f51e441557033ba21eeaf24ef8316bfbb3d420084
"@popperjs/core": ^2.10.2
checksum: 301b5ed872efba061104cf22ac93568e3837867fb5527ab9326a51510fb752bd4883e1d488225c8be72f86d9d3a55ef5b166aa7fa62c2fdd077c3f05b65752f8
languageName: node
linkType: hard
@ -1095,7 +1095,7 @@ __metadata:
dependencies:
"@fortawesome/fontawesome-free": 6.1.2
app-root-path: 3.0.0
bootstrap: 5.2.0
bootstrap: 5.1.3
cookie-parser: 1.4.6
cron: 2.1.0
debug: 4.3.4
@ -1108,7 +1108,7 @@ __metadata:
luxon: 3.0.1
morgan: 1.10.0
webdav: 4.10.0
winston: 3.8.1
winston: 3.9.0
languageName: unknown
linkType: soft
@ -1528,10 +1528,11 @@ __metadata:
languageName: node
linkType: hard
"winston@npm:3.8.1":
version: 3.8.1
resolution: "winston@npm:3.8.1"
"winston@npm:3.9.0":
version: 3.9.0
resolution: "winston@npm:3.9.0"
dependencies:
"@colors/colors": 1.5.0
"@dabh/diagnostics": ^2.0.2
async: ^3.2.3
is-stream: ^2.0.0
@ -1542,7 +1543,7 @@ __metadata:
stack-trace: 0.0.x
triple-beam: ^1.3.0
winston-transport: ^4.5.0
checksum: 14637222a4239f1ee7e629dbbf0c65161abe95eeb7acd275caf210c5d47d93254fdb007291ea75b5e241d4bb6dd3c29d000bd04ae5420a347711ae7cd0b2da88
checksum: 410f82b7a502106e7d93e62cd21d7e9bcfd37884d0d95921b12526d2fe163e654ec9cd39e18f9884fad5cf6506a45d07bd2519c1dc9c88e82f0f12b2ce9fa510
languageName: node
linkType: hard