mirror of
https://github.com/Sebclem/hassio-nextcloud-backup.git
synced 2024-11-29 04:14:53 +01:00
Compare commits
5 Commits
4bbc3102ef
...
ecc4935c9d
Author | SHA1 | Date | |
---|---|---|---|
|
ecc4935c9d | ||
4c179d3dff | |||
|
7fe3b23ef4 | ||
93e821794e | |||
cfe6778745 |
@ -9,12 +9,12 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@fortawesome/fontawesome-free": "6.1.2",
|
"@fortawesome/fontawesome-free": "6.1.2",
|
||||||
"app-root-path": "3.0.0",
|
"app-root-path": "3.0.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",
|
||||||
"ejs": "3.1.8",
|
"ejs": "3.1.8",
|
||||||
"express": "4.18.1",
|
"express": "4.18.3",
|
||||||
"form-data": "4.0.0",
|
"form-data": "4.0.0",
|
||||||
"got": "12.3.0",
|
"got": "12.3.0",
|
||||||
"http-errors": "2.0.0",
|
"http-errors": "2.0.0",
|
||||||
|
@ -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 '"' at start and end ?
|
//TODO Remove this when bug is fixed, etag contain '"' 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 '"' at start and end ?
|
//TODO Remove this when bug is fixed, etag contain '"' at start and end ?
|
||||||
for (let backup of contents) {
|
for (let backup of contents) {
|
||||||
|
@ -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) {
|
||||||
|
@ -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);
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<label for="hostname" class="form-label">Hostname</label>
|
<label for="hostname" class="form-label">Hostname</label>
|
||||||
<input id="hostname" type="text" class="form-control" aria-describedby="hostname-help">
|
<input id="hostname" type="text" class="form-control" aria-describedby="hostname-help">
|
||||||
<div id="hostname-help" class="form-text">exemple.com:8080</span>
|
<div id="hostname-help" class="form-text">example.com:8080</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -177,32 +177,32 @@ __metadata:
|
|||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"body-parser@npm:1.20.0":
|
"body-parser@npm:1.20.2":
|
||||||
version: 1.20.0
|
version: 1.20.2
|
||||||
resolution: "body-parser@npm:1.20.0"
|
resolution: "body-parser@npm:1.20.2"
|
||||||
dependencies:
|
dependencies:
|
||||||
bytes: 3.1.2
|
bytes: 3.1.2
|
||||||
content-type: ~1.0.4
|
content-type: ~1.0.5
|
||||||
debug: 2.6.9
|
debug: 2.6.9
|
||||||
depd: 2.0.0
|
depd: 2.0.0
|
||||||
destroy: 1.2.0
|
destroy: 1.2.0
|
||||||
http-errors: 2.0.0
|
http-errors: 2.0.0
|
||||||
iconv-lite: 0.4.24
|
iconv-lite: 0.4.24
|
||||||
on-finished: 2.4.1
|
on-finished: 2.4.1
|
||||||
qs: 6.10.3
|
qs: 6.11.0
|
||||||
raw-body: 2.5.1
|
raw-body: 2.5.2
|
||||||
type-is: ~1.6.18
|
type-is: ~1.6.18
|
||||||
unpipe: 1.0.0
|
unpipe: 1.0.0
|
||||||
checksum: 12fffdeac82fe20dddcab7074215d5156e7d02a69ae90cbe9fee1ca3efa2f28ef52097cbea76685ee0a1509c71d85abd0056a08e612c09077cad6277a644cf88
|
checksum: 14d37ec638ab5c93f6099ecaed7f28f890d222c650c69306872e00b9efa081ff6c596cd9afb9930656aae4d6c4e1c17537bea12bb73c87a217cb3cfea8896737
|
||||||
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
|
||||||
|
|
||||||
@ -401,6 +401,13 @@ __metadata:
|
|||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
|
"content-type@npm:~1.0.5":
|
||||||
|
version: 1.0.5
|
||||||
|
resolution: "content-type@npm:1.0.5"
|
||||||
|
checksum: 566271e0a251642254cde0f845f9dd4f9856e52d988f4eb0d0dcffbb7a1f8ec98de7a5215fc628f3bce30fe2fb6fd2bc064b562d721658c59b544e2d34ea2766
|
||||||
|
languageName: node
|
||||||
|
linkType: hard
|
||||||
|
|
||||||
"cookie-parser@npm:1.4.6":
|
"cookie-parser@npm:1.4.6":
|
||||||
version: 1.4.6
|
version: 1.4.6
|
||||||
resolution: "cookie-parser@npm:1.4.6"
|
resolution: "cookie-parser@npm:1.4.6"
|
||||||
@ -561,13 +568,13 @@ __metadata:
|
|||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"express@npm:4.18.1":
|
"express@npm:4.18.3":
|
||||||
version: 4.18.1
|
version: 4.18.3
|
||||||
resolution: "express@npm:4.18.1"
|
resolution: "express@npm:4.18.3"
|
||||||
dependencies:
|
dependencies:
|
||||||
accepts: ~1.3.8
|
accepts: ~1.3.8
|
||||||
array-flatten: 1.1.1
|
array-flatten: 1.1.1
|
||||||
body-parser: 1.20.0
|
body-parser: 1.20.2
|
||||||
content-disposition: 0.5.4
|
content-disposition: 0.5.4
|
||||||
content-type: ~1.0.4
|
content-type: ~1.0.4
|
||||||
cookie: 0.5.0
|
cookie: 0.5.0
|
||||||
@ -586,7 +593,7 @@ __metadata:
|
|||||||
parseurl: ~1.3.3
|
parseurl: ~1.3.3
|
||||||
path-to-regexp: 0.1.7
|
path-to-regexp: 0.1.7
|
||||||
proxy-addr: ~2.0.7
|
proxy-addr: ~2.0.7
|
||||||
qs: 6.10.3
|
qs: 6.11.0
|
||||||
range-parser: ~1.2.1
|
range-parser: ~1.2.1
|
||||||
safe-buffer: 5.2.1
|
safe-buffer: 5.2.1
|
||||||
send: 0.18.0
|
send: 0.18.0
|
||||||
@ -596,7 +603,7 @@ __metadata:
|
|||||||
type-is: ~1.6.18
|
type-is: ~1.6.18
|
||||||
utils-merge: 1.0.1
|
utils-merge: 1.0.1
|
||||||
vary: ~1.1.2
|
vary: ~1.1.2
|
||||||
checksum: c3d44c92e48226ef32ec978becfedb0ecf0ca21316bfd33674b3c5d20459840584f2325726a4f17f33d9c99f769636f728982d1c5433a5b6fe6eb95b8cf0c854
|
checksum: 3d7fc8762a81dee0adf0b604f11627db2af082c5f2234e78a4aa8134f22c51f96c6282063f2f8b87f5dbc70679a3087caccb93b6107e324c6feb3a70960a5864
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
@ -1095,12 +1102,12 @@ __metadata:
|
|||||||
dependencies:
|
dependencies:
|
||||||
"@fortawesome/fontawesome-free": 6.1.2
|
"@fortawesome/fontawesome-free": 6.1.2
|
||||||
app-root-path: 3.0.0
|
app-root-path: 3.0.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
|
||||||
ejs: 3.1.8
|
ejs: 3.1.8
|
||||||
express: 4.18.1
|
express: 4.18.3
|
||||||
form-data: 4.0.0
|
form-data: 4.0.0
|
||||||
got: 12.3.0
|
got: 12.3.0
|
||||||
http-errors: 2.0.0
|
http-errors: 2.0.0
|
||||||
@ -1217,12 +1224,12 @@ __metadata:
|
|||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"qs@npm:6.10.3":
|
"qs@npm:6.11.0":
|
||||||
version: 6.10.3
|
version: 6.11.0
|
||||||
resolution: "qs@npm:6.10.3"
|
resolution: "qs@npm:6.11.0"
|
||||||
dependencies:
|
dependencies:
|
||||||
side-channel: ^1.0.4
|
side-channel: ^1.0.4
|
||||||
checksum: 0fac5e6c7191d0295a96d0e83c851aeb015df7e990e4d3b093897d3ac6c94e555dbd0a599739c84d7fa46d7fee282d94ba76943983935cf33bba6769539b8019
|
checksum: 6e1f29dd5385f7488ec74ac7b6c92f4d09a90408882d0c208414a34dd33badc1a621019d4c799a3df15ab9b1d0292f97c1dd71dc7c045e69f81a8064e5af7297
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
@ -1247,15 +1254,15 @@ __metadata:
|
|||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"raw-body@npm:2.5.1":
|
"raw-body@npm:2.5.2":
|
||||||
version: 2.5.1
|
version: 2.5.2
|
||||||
resolution: "raw-body@npm:2.5.1"
|
resolution: "raw-body@npm:2.5.2"
|
||||||
dependencies:
|
dependencies:
|
||||||
bytes: 3.1.2
|
bytes: 3.1.2
|
||||||
http-errors: 2.0.0
|
http-errors: 2.0.0
|
||||||
iconv-lite: 0.4.24
|
iconv-lite: 0.4.24
|
||||||
unpipe: 1.0.0
|
unpipe: 1.0.0
|
||||||
checksum: 5362adff1575d691bb3f75998803a0ffed8c64eabeaa06e54b4ada25a0cd1b2ae7f4f5ec46565d1bec337e08b5ac90c76eaa0758de6f72a633f025d754dec29e
|
checksum: ba1583c8d8a48e8fbb7a873fdbb2df66ea4ff83775421bfe21ee120140949ab048200668c47d9ae3880012f6e217052690628cf679ddfbd82c9fc9358d574676
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user