nextcloud_backup/backend/src/routes/action.ts

@@ -2,10 +2,6 @@ import express from "express";
 import { doBackupWorkflow } from "../services/orchestrator.js";
 import { WorkflowType } from "../types/services/orchecstrator.js";
 import logger from "../config/winston.js";
-import { clean as webdavClean } from "../services/webdavService.js";
-import { getBackupConfig } from "../services/backupConfigService.js";
-import { getWebdavConfig } from "../services/webdavConfigService.js";
-import { clean } from "../services/homeAssistantService.js";
 
 const actionRouter = express.Router();
 
@@ -20,20 +16,4 @@ actionRouter.post("/backup", (req, res) => {
   res.sendStatus(202);
 });
 
-actionRouter.post("/clean", (req, res) => {
-  const backupConfig = getBackupConfig();
-  const webdavConfig = getWebdavConfig();
-  webdavClean(backupConfig, webdavConfig)
-    .then(() => {
-      return clean(backupConfig);
-    })
-    .then(() => {
-      logger.info("All good !");
-    })
-    .catch(() => {
-      logger.error("Something wrong !");
-    });
-  res.sendStatus(202);
-});
-
 export default actionRouter;

nextcloud_backup/backend/src/services/homeAssistantService.ts

@@ -13,15 +13,13 @@ import { promisify } from "util";
 import logger from "../config/winston.js";
 import messageManager from "../tools/messageManager.js";
 import * as statusTools from "../tools/status.js";
-import {
-  BackupType,
-  type BackupConfig,
-} from "../types/services/backupConfig.js";
+import { BackupType } from "../types/services/backupConfig.js";
 import type { NewBackupPayload } from "../types/services/ha_os_payload.js";
 import type {
   AddonData,
   BackupData,
   BackupDetailModel,
+  BackupModel,
   CoreInfoBody,
   SupervisorResponse,
 } from "../types/services/ha_os_response.js";
@@ -163,7 +161,7 @@ function downloadSnapshot(id: string): Promise<string> {
 }
 
 function delSnap(id: string) {
-  logger.debug(`Deleting Home Assistant backup ${id}`);
+  logger.info(`Deleting Home Assistant backup ${id}`);
   const option = {
     headers: { authorization: `Bearer ${token}` },
   };
@@ -264,66 +262,36 @@ function createNewBackup(
   );
 }
 
-function clean(backupConfig: BackupConfig) {
-  if (!backupConfig.autoClean.homeAssistant.enabled) {
-    logger.debug("Clean disabled for Home Assistant");
-    return Promise.resolve();
+function clean(backups: BackupModel[], numberToKeep: number) {
+  const promises = [];
+  if (backups.length < numberToKeep) {
+    return;
   }
-  logger.info("Clean for Home Assistant");
-  const status = statusTools.getStatus();
-  status.status = States.CLEAN_HA;
-  status.progress = -1;
-  statusTools.setStatus(status);
-
-  const numberToKeep = backupConfig.autoClean.homeAssistant.nbrToKeep || 5;
-  return getBackups()
-    .then((response) => {
-      const backups = response.body.data.backups;
-      if (backups.length > numberToKeep) {
-        backups.sort((a, b) => {
-          return Date.parse(b.date) - Date.parse(a.date);
-        });
-        const toDel = backups.slice(numberToKeep);
-        logger.debug(`Number of backup to clean: ${toDel.length}`);
-        const promises = toDel.map((value) => delSnap(value.slug));
-        logger.info("Home Assistant clean done.");
-        return Promise.allSettled(promises);
-      } else {
-        logger.debug("Nothing to clean");
+  backups.sort((a, b) => {
+    return Date.parse(b.date) - Date.parse(a.date);
+  });
+  const toDel = backups.slice(numberToKeep);
+  for (const i of toDel) {
+    promises.push(delSnap(i.slug));
+  }
+  logger.info("Local clean done.");
+  return Promise.allSettled(promises).then((values) => {
+    let errors = false;
+    for (const val of values) {
+      if (val.status == "rejected") {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        messageManager.error("Fail to delete backup", val.reason);
+        logger.error("Fail to delete backup");
+        logger.error(val.reason);
+        errors = true;
       }
-    })
-    .then(
-      (values) => {
-        const status = statusTools.getStatus();
-        status.status = States.IDLE;
-        status.progress = undefined;
-        statusTools.setStatus(status);
-
-        let errors = false;
-        for (const val of values || []) {
-          if (val.status == "rejected") {
-            messageManager.error("Fail to delete backup", val.reason as string);
-            logger.error("Fail to delete backup");
-            logger.error(val.reason);
-            errors = true;
-          }
-        }
-        if (errors) {
-          messageManager.error("Fail to clean backups in Home Assistant");
-          logger.error("Fail to clean backups in Home Assistant");
-          return Promise.reject(new Error());
-        }
-        return Promise.resolve();
-      },
-      (reason: RequestError) => {
-        logger.error("Fail to clean Home Assistant backup", reason.message);
-        messageManager.error(
-          "Fail to clean Home Assistant backup",
-          reason.message
-        );
-        return Promise.reject(reason);
-      }
-    );
+    }
+    if (errors) {
+      messageManager.error("Fail to clean backups in Home Assistant");
+      logger.error("Fail to clean backups in Home Assistant");
+      return Promise.reject(new Error());
+    }
+  });
 }
 
 function uploadSnapshot(path: string) {

nextcloud_backup/backend/src/services/orchestrator.ts

@@ -92,12 +92,6 @@ export function doBackupWorkflow(type: WorkflowType) {
     .then(() => {
       return homeAssistantService.startAddons(addonsToStartStop);
     })
-    .then(() => {
-      return homeAssistantService.clean(backupConfig);
-    })
-    .then(() => {
-      return webDavService.clean(backupConfig, webdavConfig);
-    })
     .then(() => {
       logger.info("Backup workflow finished successfully !");
       messageManager.info(

nextcloud_backup/backend/src/services/webdavService.ts

@@ -23,7 +23,6 @@ import { templateToRegexp } from "./backupConfigService.js";
 import { getChunkEndpoint, getEndpoint } from "./webdavConfigService.js";
 import { pipeline } from "stream/promises";
 import { humanFileSize } from "../tools/toolbox.js";
-import type { BackupConfig } from "../types/services/backupConfig.js";
 
 const CHUNK_SIZE = 5 * 1024 * 1024; // 5MiB Same as desktop client
 const CHUNK_NUMBER_SIZE = 5; // To add landing "0"
@@ -202,7 +201,6 @@ function extractBackupInfo(backups: WebdavBackup[], template: string) {
 }
 
 export function deleteBackup(path: string, config: WebdavConfig) {
-  logger.debug(`Deleting Cloud backup ${path}`);
   const endpoint = getEndpoint(config);
   return got
     .delete(config.url + endpoint + path, {
@@ -591,7 +589,6 @@ export function downloadFile(
     },
     (reason: RequestError) => {
       if (fs.existsSync(tmp_file)) fs.unlinkSync(tmp_file);
-      logger.error("Fail to download Cloud backup", reason.message);
       messageManager.error("Fail to download Cloud backup", reason.message);
       const status = statusTools.getStatus();
       status.status = States.IDLE;
@@ -602,59 +599,39 @@ export function downloadFile(
   );
 }
 
-export function clean(backupConfig: BackupConfig, webdavConfig: WebdavConfig) {
-  if (!backupConfig.autoClean.webdav.enabled) {
-    logger.debug("Clean disabled for Cloud");
-    return Promise.resolve();
-  }
-  logger.info("Clean for cloud");
-  const status = statusTools.getStatus();
-  status.status = States.CLEAN_CLOUD;
-  status.progress = -1;
-  statusTools.setStatus(status);
-  const limit = backupConfig.autoClean.homeAssistant.nbrToKeep || 5;
-  return getBackups(pathTools.auto, webdavConfig, backupConfig.nameTemplate)
-    .then((backups) => {
-      if (backups.length > limit) {
-        const toDel = backups.splice(limit);
-        logger.debug(`Number of backup to clean: ${toDel.length}`);
-        const promises = toDel.map((value) =>
-          deleteBackup(value.path, webdavConfig)
-        );
-        return Promise.allSettled(promises);
-      } else {
-        logger.debug("Nothing to clean");
-      }
-    })
-    .then(
-      (values) => {
-        const status = statusTools.getStatus();
-        status.status = States.IDLE;
-        status.progress = undefined;
-        statusTools.setStatus(status);
+//   clean() {
+//     let limit = settingsTools.getSettings().auto_clean_backup_keep;
+//     if (limit == null) limit = 5;
+//     return new Promise((resolve, reject) => {
+//       this.getFolderContent(this.getConf()?.back_dir + pathTools.auto)
+//         .then(async (contents: any) => {
+//           if (contents.length < limit) {
+//             resolve(undefined);
+//             return;
+//           }
+//           contents.sort((a: any, b: any) => {
+//             return a.date < b.date ? 1 : -1;
+//           });
 
-        let errors = false;
-        for (const val of values || []) {
-          if (val.status == "rejected") {
-            messageManager.error("Fail to delete backup", val.reason);
-            logger.error("Fail to delete backup");
-            logger.error(val.reason);
-            errors = true;
-          }
-        }
+//           const toDel = contents.slice(limit);
+//           for (const i in toDel) {
+//             await this.client?.deleteFile(toDel[i].filename);
+//           }
+//           logger.info("Cloud clean done.");
+//           resolve(undefined);
+//         })
+//         .catch((error) => {
+//           const status = statusTools.getStatus();
+//           status.status = "error";
+//           status.error_code = 6;
+//           status.message = "Fail to clean Nexcloud (" + error + ") !";
+//           statusTools.setStatus(status);
+//           logger.error(status.message);
+//           reject(status.message);
+//         });
+//     });
+//   }
+// }
 
-        if (errors) {
-          messageManager.error("Fail to clean backups in Cloud");
-          logger.error("Fail to clean backups in Cloud");
-          return Promise.reject(new Error());
-        }
-
-        return Promise.resolve();
-      },
-      (reason: RequestError) => {
-        logger.error("Fail to clean cloud backup", reason.message);
-        messageManager.error("Fail to clean cloud backup", reason.message);
-        return Promise.reject(reason);
-      }
-    );
-}
+// const INSTANCE = new WebdavTools();
+// export default INSTANCE;

nextcloud_backup/backend/src/types/status.ts

@@ -9,8 +9,6 @@ export enum States {
   BKUP_UPLOAD_CLOUD = "BKUP_UPLOAD_CLOUD",
   STOP_ADDON = "STOP_ADDON",
   START_ADDON = "START_ADDON",
-  CLEAN_CLOUD = "CLEAN_CLOUD",
-  CLEAN_HA = "CLEAN_HA",
 }
 
 export interface Status {

nextcloud_backup/frontend/package.json

@@ -9,7 +9,7 @@
     "type-check": "vue-tsc --noEmit"
   },
   "dependencies": {
-    "@mdi/font": "7.4.47",
+    "@mdi/font": "7.0.96",
     "core-js": "^3.34.0",
     "ky": "^1.2.0",
     "luxon": "^3.4.4",

nextcloud_backup/frontend/pnpm-lock.yaml

@@ -6,8 +6,8 @@ settings:
 
 dependencies:
   '@mdi/font':
-    specifier: 7.4.47
-    version: 7.4.47
+    specifier: 7.0.96
+    version: 7.0.96
   core-js:
     specifier: ^3.34.0
     version: 3.36.0
@@ -391,8 +391,8 @@ packages:
   /@jridgewell/sourcemap-codec@1.4.15:
     resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==}
 
-  /@mdi/font@7.4.47:
-    resolution: {integrity: sha512-43MtGpd585SNzHZPcYowu/84Vz2a2g31TvPMTm9uTiCSWzaheQySUcSyUH/46fPnuPQWof2yd0pGBtzee/IQWw==}
+  /@mdi/font@7.0.96:
+    resolution: {integrity: sha512-rzlxTfR64hqY8yiBzDjmANfcd8rv+T5C0Yedv/TWk2QyAQYdc66e0kaN1ipmnYU3RukHRTRcBARHzzm+tIhL7w==}
     dev: false
 
   /@nodelib/fs.scandir@2.1.5:

nextcloud_backup/frontend/src/components/statusBar/ActionComponent.vue

@@ -3,34 +3,13 @@
     <v-card-title class="text-center">Action</v-card-title>
     <v-divider class="border-opacity-25"></v-divider>
     <v-card-text>
-      <v-row>
-        <v-col class="d-flex justify-center">
-          <v-btn
-            block
-            color="success"
-            @click="launchBackup"
-            prepend-icon="mdi-cloud-plus"
-          >
-            Backup Now
-          </v-btn>
-        </v-col>
-        <v-col class="d-flex justify-center">
-          <v-btn
-            block
-            color="orange-darken-3"
-            @click="launchClean"
-            prepend-icon="mdi-broom"
-          >
-            Clean
-          </v-btn>
-        </v-col>
-      </v-row>
+      <v-btn color="success" @click="launchBackup">Backup Now</v-btn>
     </v-card-text>
   </v-card>
 </template>
 
 <script setup lang="ts">
-import { backupNow, clean } from "@/services/actionService";
+import { backupNow } from "@/services/actionService";
 import { useAlertStore } from "@/store/alert";
 
 const alertStore = useAlertStore();
@@ -44,14 +23,4 @@ function launchBackup() {
       alertStore.add("error", "Fail to start backup workflow !");
     });
 }
-
-function launchClean() {
-  clean()
-    .then(() => {
-      alertStore.add("success", "Backup workflow started !");
-    })
-    .catch(() => {
-      alertStore.add("error", "Fail to start backup workflow !");
-    });
-}
 </script>

nextcloud_backup/frontend/src/components/statusBar/BackupStatus.vue

@@ -50,10 +50,10 @@
           </div>
         </v-col>
       </v-row>
-      <v-row v-if="status?.status != States.IDLE">
+      <v-row>
         <v-divider class="border-opacity-25 mx-n1"></v-divider>
       </v-row>
-      <v-row v-if="status?.status != States.IDLE">
+      <v-row>
         <v-col>
           <v-progress-linear
             height="25"

nextcloud_backup/frontend/src/services/actionService.ts

@@ -3,7 +3,3 @@ import kyClient from "./kyClient";
 export function backupNow() {
   return kyClient.post("action/backup");
 }
-
-export function clean() {
-  return kyClient.post("action/clean");
-}