mirror of
https://github.com/Sebclem/hassio-nextcloud-backup.git
synced 2024-11-10 11:32:58 +01:00
Compare commits
4 Commits
ace8fe7caa
...
2c03791db5
Author | SHA1 | Date | |
---|---|---|---|
2c03791db5 | |||
049beb53b8 | |||
bd0fbe81c2 | |||
a22962902d |
@ -1,8 +1,7 @@
|
||||
import cookieParser from "cookie-parser";
|
||||
import cors from "cors";
|
||||
import errorHandler from "errorhandler";
|
||||
import express from "express";
|
||||
import createError from "http-errors";
|
||||
|
||||
import morgan from "morgan";
|
||||
import path from "path";
|
||||
import { fileURLToPath } from "url";
|
||||
@ -20,10 +19,11 @@ app.use(
|
||||
);
|
||||
|
||||
app.set("port", process.env.PORT || 3000);
|
||||
|
||||
// app.use(
|
||||
// morgan("dev", { stream: { write: (message) => logger.debug(message) } })
|
||||
// );
|
||||
if (process.env.ACCESS_LOG == "true") {
|
||||
app.use(
|
||||
morgan("dev", { stream: { write: (message) => logger.debug(message) } })
|
||||
);
|
||||
}
|
||||
app.use(express.json());
|
||||
app.use(express.urlencoded({ extended: false }));
|
||||
app.use(cookieParser());
|
||||
@ -36,15 +36,4 @@ app.use("/v2/api/", apiV2Router);
|
||||
----------------------------------------------------------
|
||||
*/
|
||||
|
||||
// error handler
|
||||
if (app.get("env") == "development") {
|
||||
// catch 404 and forward to error handler
|
||||
app.use((req, res, next) => {
|
||||
next(createError(404));
|
||||
});
|
||||
|
||||
// only use in development
|
||||
app.use(errorHandler());
|
||||
}
|
||||
|
||||
export default app;
|
||||
|
@ -1,16 +1,21 @@
|
||||
import errorHandler from "errorhandler";
|
||||
import "./env.js";
|
||||
|
||||
import errorHandler from "errorhandler";
|
||||
import figlet from "figlet";
|
||||
import createError from "http-errors";
|
||||
import kleur from "kleur";
|
||||
import app from "./app.js";
|
||||
import logger from "./config/winston.js";
|
||||
import postInit from "./postInit.js";
|
||||
import figlet from "figlet";
|
||||
import kleur from "kleur";
|
||||
|
||||
/**
|
||||
* Error Handler. Provides full stack
|
||||
*/
|
||||
if (process.env.NODE_ENV === "development") {
|
||||
app.use(errorHandler());
|
||||
app.use((req, res, next) => {
|
||||
next(createError(404));
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
@ -22,7 +27,7 @@ const server = app.listen(app.get("port"), () => {
|
||||
`App is running at ` +
|
||||
kleur.green().bold(`http://localhost:${app.get("port")}`) +
|
||||
" in " +
|
||||
kleur.green().bold(app.get("env") as string) +
|
||||
kleur.green().bold(process.env.NODE_ENV || "production") +
|
||||
" mode"
|
||||
);
|
||||
logger.info(kleur.red().bold("Press CTRL-C to stop"));
|
||||
|
@ -343,7 +343,7 @@ export async function chunkedUpload(
|
||||
const finalDestination = config.url + getEndpoint(config) + webdavPath;
|
||||
const status = statusTools.getStatus();
|
||||
status.status = States.BKUP_UPLOAD_CLOUD;
|
||||
status.progress = 0;
|
||||
status.progress = -1;
|
||||
statusTools.setStatus(status);
|
||||
try {
|
||||
await initChunkedUpload(chunkedUrl, finalDestination, config);
|
||||
@ -365,16 +365,21 @@ export async function chunkedUpload(
|
||||
logger.error((err as Error).message);
|
||||
}
|
||||
fs.unlinkSync(localPath);
|
||||
const status = statusTools.getStatus();
|
||||
status.status = States.IDLE;
|
||||
status.progress = undefined;
|
||||
statusTools.setStatus(status);
|
||||
throw err;
|
||||
}
|
||||
|
||||
let start = 0;
|
||||
let end = fileSize > CHUNK_SIZE ? CHUNK_SIZE : fileSize;
|
||||
let current_size = end;
|
||||
let end = Math.min(CHUNK_SIZE - 1, fileSize - 1);
|
||||
|
||||
let current_size = end + 1;
|
||||
// const uploadedBytes = 0;
|
||||
|
||||
let i = 0;
|
||||
while (start < fileSize) {
|
||||
let i = 1;
|
||||
while (start < fileSize - 1) {
|
||||
const chunk = fs.createReadStream(localPath, { start, end });
|
||||
try {
|
||||
const chunckNumber = i.toString().padStart(CHUNK_NUMBER_SIZE, "0");
|
||||
@ -386,9 +391,9 @@ export async function chunkedUpload(
|
||||
fileSize,
|
||||
config
|
||||
);
|
||||
start = end;
|
||||
end = Math.min(start + CHUNK_SIZE, fileSize - 1);
|
||||
current_size = end - start;
|
||||
start = end + 1;
|
||||
end = Math.min(start + CHUNK_SIZE - 1, fileSize - 1);
|
||||
current_size = end - start + 1;
|
||||
i++;
|
||||
} catch (error) {
|
||||
if (error instanceof Error) {
|
||||
@ -408,6 +413,10 @@ export async function chunkedUpload(
|
||||
logger.error(`Code: ${(error as PlainResponse).statusCode}`);
|
||||
logger.error(`Body: ${(error as PlainResponse).body as string}`);
|
||||
}
|
||||
const status = statusTools.getStatus();
|
||||
status.status = States.IDLE;
|
||||
status.progress = undefined;
|
||||
statusTools.setStatus(status);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
@ -435,6 +444,10 @@ export async function chunkedUpload(
|
||||
logger.error((err as Error).message);
|
||||
}
|
||||
fs.unlinkSync(localPath);
|
||||
const status = statusTools.getStatus();
|
||||
status.status = States.IDLE;
|
||||
status.progress = undefined;
|
||||
statusTools.setStatus(status);
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
@ -452,6 +465,7 @@ export function uploadChunk(
|
||||
logger.debug(`...URI: ${encodeURI(url)}`);
|
||||
logger.debug(`...Final destination: ${encodeURI(finalDestination)}`);
|
||||
logger.debug(`...Chunk size: ${contentLength}`);
|
||||
logger.debug(`...Total size: ${totalLength}`);
|
||||
got.stream
|
||||
.put(url, {
|
||||
headers: {
|
||||
|
@ -1,6 +1,7 @@
|
||||
<template>
|
||||
<v-fade-transition>
|
||||
<div id="alertContainer" v-if="alertVisible">
|
||||
<div id="parent" v-if="alertVisible">
|
||||
<div id="alertContainer">
|
||||
<v-slide-x-transition group tag="div">
|
||||
<v-alert
|
||||
v-for="alert of alertList"
|
||||
@ -31,6 +32,7 @@
|
||||
</v-alert>
|
||||
</v-slide-x-transition>
|
||||
</div>
|
||||
</div>
|
||||
</v-fade-transition>
|
||||
</template>
|
||||
<script lang="ts" setup>
|
||||
@ -45,11 +47,17 @@ const { alertList } = storeToRefs(alertStore);
|
||||
const alertVisible = computed(() => alertList.value.length > 0);
|
||||
</script>
|
||||
<style>
|
||||
#alertContainer {
|
||||
#parent {
|
||||
position: absolute;
|
||||
top: 70px;
|
||||
right: 20px;
|
||||
z-index: 99999;
|
||||
height: 100vh;
|
||||
#alertContainer {
|
||||
position: sticky;
|
||||
top: 80px;
|
||||
right: 20px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@/store/alert
|
||||
|
@ -32,9 +32,9 @@
|
||||
<script setup lang="ts">
|
||||
import { useMenuSize } from "@/composable/menuSize";
|
||||
import { deleteWebdabBackup } from "@/services/webdavService";
|
||||
import { useAlertStore } from "@/store/alert";
|
||||
import type { WebdavBackup } from "@/types/webdav";
|
||||
import { computed, ref } from "vue";
|
||||
import { useDisplay } from "vuetify/dist/vuetify";
|
||||
import { ref } from "vue";
|
||||
|
||||
const dialog = ref(false);
|
||||
const loading = ref(false);
|
||||
@ -42,6 +42,11 @@ const item = ref<WebdavBackup | null>(null);
|
||||
|
||||
const { width, isFullScreen } = useMenuSize();
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: "deleted"): void;
|
||||
}>();
|
||||
|
||||
const alertStore = useAlertStore();
|
||||
function confirm() {
|
||||
loading.value = true;
|
||||
if (item.value) {
|
||||
@ -49,9 +54,12 @@ function confirm() {
|
||||
.then(() => {
|
||||
loading.value = false;
|
||||
dialog.value = false;
|
||||
alertStore.add("success", "Backup deleted from cloud");
|
||||
emit("deleted");
|
||||
})
|
||||
.catch(() => {
|
||||
loading.value = false;
|
||||
alertStore.add("error", "Fail to deleted backup from cloud");
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@ -76,7 +76,10 @@
|
||||
</v-row>
|
||||
</v-card-text>
|
||||
</v-card>
|
||||
<cloud-delete-dialog ref="deleteDialog"></cloud-delete-dialog>
|
||||
<cloud-delete-dialog
|
||||
ref="deleteDialog"
|
||||
@deleted="refreshBackup"
|
||||
></cloud-delete-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
@ -69,4 +69,3 @@ function saved() {
|
||||
alertStore.add("success", "Backup settings saved !");
|
||||
}
|
||||
</script>
|
||||
@/store/dialogStatus@/store/alert
|
||||
|
Loading…
Reference in New Issue
Block a user