From: PhiTux Date: Tue, 28 Jan 2025 17:37:27 +0000 (+0100) Subject: progress in image viewing X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=ff1f9fcceb74af77c5b3333ccc9c0442bd6845e3;p=DailyTxT.git progress in image viewing --- diff --git a/backend/server/routers/logs.py b/backend/server/routers/logs.py index 2c8558f..7027a2b 100644 --- a/backend/server/routers/logs.py +++ b/backend/server/routers/logs.py @@ -1,3 +1,4 @@ +import base64 import datetime import logging import re @@ -314,4 +315,12 @@ async def deleteFile(uuid: str, day: int, month: int, year: int, cookie = Depend raise HTTPException(status_code=500, detail="Failed to write changes of deleted file!") return {"success": True} - raise HTTPException(status_code=500, detail="Failed to delete file - not found in log") \ No newline at end of file + raise HTTPException(status_code=500, detail="Failed to delete file - not found in log") + +@router.get("/downloadFile") +async def downloadFile(uuid: str, cookie = Depends(users.isLoggedIn)): + enc_key = security.get_enc_key(cookie["user_id"], cookie["derived_key"]) + file = fileHandling.readFile(cookie["user_id"], uuid) + if file is None: + raise HTTPException(status_code=500, detail="Failed to read file") + return {"file": base64.b64encode(security.decrypt_file(file, enc_key))} \ No newline at end of file diff --git a/backend/server/utils/fileHandling.py b/backend/server/utils/fileHandling.py index 0ca7a4c..82d506c 100644 --- a/backend/server/utils/fileHandling.py +++ b/backend/server/utils/fileHandling.py @@ -85,6 +85,19 @@ def writeFile(file, user_id, uuid): f.write(file) return True +def readFile(user_id, uuid): + try: + f = open(os.path.join(settings.data_path, str(user_id), 'files', uuid), "r") + except FileNotFoundError: + logger.info(f"{user_id}/files/{uuid} - File not found") + raise HTTPException(status_code=404, detail="File not found") + except Exception as e: + logger.exception(e) + raise HTTPException(status_code=500, detail="Internal Server Error when trying to open file {uuid}") + else: + with f: + return f.read() + def removeFile(user_id, uuid): try: os.remove(os.path.join(settings.data_path, str(user_id), 'files', uuid)) diff --git a/backend/server/utils/security.py b/backend/server/utils/security.py index 349f5d3..aec5102 100644 --- a/backend/server/utils/security.py +++ b/backend/server/utils/security.py @@ -43,4 +43,8 @@ def decrypt_text(text: str, key: str) -> str: def encrypt_file(file: bytes, key: str) -> str: f = Fernet(key) - return f.encrypt(file).decode() \ No newline at end of file + return f.encrypt(file).decode() + +def decrypt_file(file: str, key: str) -> bytes: + f = Fernet(key) + return f.decrypt(file.encode()) \ No newline at end of file diff --git a/frontend/src/routes/write/+page.svelte b/frontend/src/routes/write/+page.svelte index f903fa1..b662567 100644 --- a/frontend/src/routes/write/+page.svelte +++ b/frontend/src/routes/write/+page.svelte @@ -14,7 +14,7 @@ import { faCloudArrowUp, faTrash } from '@fortawesome/free-solid-svg-icons'; import Fa from 'svelte-fa'; import { v4 as uuidv4 } from 'uuid'; - import { slide } from 'svelte/transition'; + import { slide, fade } from 'svelte/transition'; axios.interceptors.request.use((config) => { config.withCredentials = true; @@ -71,6 +71,7 @@ }); let lastSelectedDate = $state($selectedDate); + let images = $state([]); let loading = false; $effect(() => { @@ -78,6 +79,9 @@ loading = true; if ($selectedDate !== lastSelectedDate) { + images = []; + filesOfDay = []; + clearTimeout(timeout); const result = getLog(); if (result) { @@ -174,6 +178,45 @@ } } + const imageExtensions = ['jpeg', 'jpg', 'gif', 'png']; + + function base64ToArrayBuffer(base64) { + var binaryString = atob(base64); + var bytes = new Uint8Array(binaryString.length); + for (var i = 0; i < binaryString.length; i++) { + bytes[i] = binaryString.charCodeAt(i); + } + return bytes.buffer; + } + + $effect(() => { + if (filesOfDay) { + // add all files to images if correct extension + filesOfDay.forEach((file) => { + // if image -> load it! + if ( + imageExtensions.includes(file.filename.split('.').pop().toLowerCase()) && + !images.find((image) => image.uuid_filename === file.uuid_filename) + ) { + images = [...images, file]; + axios + .get(API_URL + '/logs/downloadFile', { params: { uuid: file.uuid_filename } }) + .then((response) => { + images = images.map((image) => { + if (image.uuid_filename === file.uuid_filename) { + image.src = response.data.file; + } + return image; + }); + }) + .catch((error) => { + console.error(error); + }); + } + }); + } + }); + async function saveLog() { if (currentLog === savedLog) { return true; @@ -317,12 +360,12 @@ if (!+bytes) return '0 Bytes'; const k = 1024; - const dm = 2; - const sizes = ['Bytes', 'KB', 'MB', 'GB']; + //const dm = 2; // decimal places + const sizes = ['B', 'KB', 'MB', 'GB']; const i = Math.floor(Math.log(bytes) / Math.log(k)); - return `${parseFloat((bytes / Math.pow(k, i)).toFixed(dm))} ${sizes[i]}`; + return `${parseFloat((bytes / Math.pow(k, i)).toFixed(0))} ${sizes[i]}`; } function downloadFile(uuid) { @@ -349,6 +392,7 @@ }) .then((response) => { filesOfDay = filesOfDay.filter((file) => file.uuid_filename !== uuid); + images = images.filter((image) => image.uuid_filename !== uuid); }) .catch((error) => { console.error(error); @@ -406,6 +450,26 @@
+ {#if images.length > 0} +
+ {#each images as image (image.uuid_filename)} +
+ {#if image.src} + {image.filename} + {:else} + + {/if} +
+ {/each} +
+ {/if} {$selectedDate}
{lastSelectedDate} @@ -556,6 +620,30 @@