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