diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/package.json b/nextcloud_backup/rootfs/opt/nextcloud_backup/package.json
index f92989a..20a648e 100644
--- a/nextcloud_backup/rootfs/opt/nextcloud_backup/package.json
+++ b/nextcloud_backup/rootfs/opt/nextcloud_backup/package.json
@@ -19,7 +19,7 @@
"got": "12.0.4",
"http-errors": "~2.0.0",
"jquery": "^3.6.0",
- "moment": "^2.29.3",
+ "luxon": "^2.3.2",
"morgan": "~1.10.0",
"webdav": "^4.8.0",
"winston": "^3.6.0"
diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/routes/api.js b/nextcloud_backup/rootfs/opt/nextcloud_backup/routes/api.js
index d08ea77..0223323 100644
--- a/nextcloud_backup/rootfs/opt/nextcloud_backup/routes/api.js
+++ b/nextcloud_backup/rootfs/opt/nextcloud_backup/routes/api.js
@@ -1,5 +1,4 @@
import express from 'express';
-import moment from "moment";
import * as statusTools from "../tools/status.js"
import webdav from "../tools/webdavTools.js"
import * as settingsTools from "../tools/settingsTools.js"
@@ -8,6 +7,7 @@ import * as hassioApiTools from "../tools/hassioApiTools.js"
import { humanFileSize } from "../tools/toolbox.js";
import cronTools from "../tools/cronTools.js"
import logger from "../config/winston.js"
+import {DateTime} from "luxon";
var router = express.Router();
@@ -21,14 +21,10 @@ router.get("/formated-local-snap", function (req, res, next) {
hassioApiTools.getSnapshots()
.then((snaps) => {
snaps.sort((a, b) => {
- if (moment(a.date).isBefore(moment(b.date))) {
- return 1;
- } else {
- return -1;
- }
+ return a.date < b.date ? 1 : -1
});
- res.render("localSnaps", { snaps: snaps, moment: moment });
+ res.render("localSnaps", { snaps: snaps, DateTime: DateTime });
})
.catch((err) => {
logger.error(err);
@@ -47,17 +43,17 @@ router.get("/formated-backup-manual", function (req, res, next) {
.getFolderContent(webdav.getConf().back_dir + pathTools.manual)
.then((contents) => {
contents.sort((a, b) => {
- if (moment(a.lastmod).isBefore(moment(b.lastmod))) return 1;
- else return -1;
+ return a.date < b.date ? 1 : -1
});
//TODO Remove this when bug is fixed, etag contain '"' at start and end ?
for (let backup of contents) {
backup.etag = backup.etag.replace(/"/g, '');
}
- res.render("backupSnaps", { backups: contents, moment: moment, humanFileSize: humanFileSize });
+ res.render("backupSnaps", { backups: contents, DateTime: DateTime, humanFileSize: humanFileSize });
})
- .catch(() => {
- res.send("");
+ .catch((err) => {
+ res.status(500)
+ res.send(err);
});
});
@@ -71,17 +67,17 @@ router.get("/formated-backup-auto", function (req, res, next) {
.getFolderContent(url)
.then((contents) => {
contents.sort((a, b) => {
- if (moment(a.lastmod).isBefore(moment(b.lastmod))) return 1;
- else return -1;
+ return a.date < b.date ? 1 : -1
});
//TODO Remove this when bug is fixed, etag contain '"' at start and end ?
for (let backup of contents) {
backup.etag = backup.etag.replace(/"/g, '');
}
- res.render("backupSnaps", { backups: contents, moment: moment, humanFileSize: humanFileSize });
+ res.render("backupSnaps", { backups: contents, DateTime: DateTime, humanFileSize: humanFileSize });
})
- .catch(() => {
- res.send("");
+ .catch((err) => {
+ res.status(500)
+ res.send(err);
});
});
diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/cronTools.js b/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/cronTools.js
index d7d92f0..638e628 100644
--- a/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/cronTools.js
+++ b/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/cronTools.js
@@ -68,7 +68,7 @@ class CronContainer {
updateNextDate() {
let date;
if (this.cronJob == null) date = null;
- else date = this.cronJob.nextDate().format("MMM D, YYYY HH:mm");
+ else date = this.cronJob.nextDate().setLocale("en").toFormat("dd MMM yyyy, HH:mm");
let status = statusTools.getStatus();
status.next_backup = date;
statusTools.setStatus(status);
diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/hassioApiTools.js b/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/hassioApiTools.js
index 81cc002..21d01ba 100644
--- a/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/hassioApiTools.js
+++ b/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/hassioApiTools.js
@@ -1,5 +1,5 @@
import fs from "fs"
-import moment from "moment";
+
import stream from "stream"
import { promisify } from "util";
import got from "got";
@@ -8,6 +8,7 @@ import * as statusTools from "../tools/status.js"
import * as settingsTools from "../tools/settingsTools.js"
import logger from "../config/winston.js"
+import {DateTime} from "luxon";
const pipeline = promisify(stream.pipeline);
@@ -300,9 +301,7 @@ function clean() {
return;
}
snaps.sort((a, b) => {
- if (moment(a.date).isBefore(moment(b.date))) return 1;
- else
- return -1;
+ return a.date < b.date ? 1 : -1
});
let toDel = snaps.slice(limit);
for (let i of toDel) {
diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/settingsTools.js b/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/settingsTools.js
index 502dd63..0216544 100644
--- a/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/settingsTools.js
+++ b/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/settingsTools.js
@@ -1,8 +1,8 @@
import fs from "fs"
-import moment from "moment";
import { CronJob } from "cron";
import logger from "../config/winston.js"
+import {DateTime} from "luxon";
const settingsPath = "/data/backup_conf.json";
@@ -170,10 +170,10 @@ function getFormatedName(is_manual, ha_version) {
template = template.replace("{type_low}", is_manual ? "manual" : "auto");
template = template.replace("{type}", is_manual ? "Manual" : "Auto");
template = template.replace("{ha_version}", ha_version);
- let mmt = moment();
- template = template.replace("{hour_12}", mmt.format("hhmmA"));
- template = template.replace("{hour}", mmt.format("HHmm"));
- template = template.replace("{date}", mmt.format("YYYY-MM-DD"));
+ const now = DateTime.now().setLocale('en');
+ template = template.replace("{hour_12}", now.toFormat("hhmma"));
+ template = template.replace("{hour}", now.toFormat("HHmm"));
+ template = template.replace("{date}", now.toFormat("yyyy-MM-dd"));
return template;
}
diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/webdavTools.js b/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/webdavTools.js
index 5b9b46e..353bd7e 100644
--- a/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/webdavTools.js
+++ b/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/webdavTools.js
@@ -1,6 +1,5 @@
import { createClient } from "webdav";
import fs from "fs"
-import moment from "moment";
import https from "https"
import path from "path";
import got from "got";
@@ -12,6 +11,7 @@ import * as settingsTools from "../tools/settingsTools.js"
import * as pathTools from "../tools/pathTools.js"
import * as hassioApiTools from "../tools/hassioApiTools.js"
import logger from "../config/winston.js"
+import {DateTime} from "luxon";
const endpoint = "/remote.php/webdav";
const configPath = "/data/webdav_conf.json";
@@ -258,7 +258,7 @@ class WebdavTools {
status.progress = -1;
status.message = null;
status.error_code = null;
- status.last_backup = moment().format("MMM D, YYYY HH:mm");
+ status.last_backup = DateTime.now().toFormat("dd MMM yyyy, HH:mm")
statusTools.setStatus(status);
cleanTempFolder();
let autoCleanCloud = settingsTools.getSettings().auto_clean_backup;
@@ -316,7 +316,7 @@ class WebdavTools {
logger.info("Downloading backup...");
if (!fs.existsSync("./temp/"))
fs.mkdirSync("./temp/");
- let tmpFile = `./temp/restore_${moment().format("MMM-DD-YYYY_HH_mm")}.tar`;
+ let tmpFile = `./temp/restore_${DateTime.now().toFormat("MMM-dd-yyyy_HH_mm")}.tar`;
let stream = fs.createWriteStream(tmpFile);
let conf = this.getConf();
let options = {
@@ -383,10 +383,7 @@ class WebdavTools {
return;
}
contents.sort((a, b) => {
- if (moment(a.lastmod).isBefore(moment(b.lastmod)))
- return 1;
- else
- return -1;
+ return a.date < b.date ? 1 : -1
});
let toDel = contents.slice(limit);
diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/views/backupSnaps.ejs b/nextcloud_backup/rootfs/opt/nextcloud_backup/views/backupSnaps.ejs
index 441e733..127631e 100644
--- a/nextcloud_backup/rootfs/opt/nextcloud_backup/views/backupSnaps.ejs
+++ b/nextcloud_backup/rootfs/opt/nextcloud_backup/views/backupSnaps.ejs
@@ -8,7 +8,7 @@
data-bs-target="#modal-<%= backups[index].etag %>">
<%= backups[index].basename %>
- <%= moment(backups[index].lastmod).format('MMM D, YYYY HH:mm') %>
+ <%= DateTime.fromRFC2822(backups[index].lastmod).toFormat("MMM dd, yyyy HH:mm") %>
@@ -34,7 +34,7 @@
+ value="<%= DateTime.fromRFC2822(backups[index].lastmod).toFormat("MMM dd, yyyy HH:mm") %>"/>