From cb735e7880ee8cf86ade562b81bf9b02c7cd2d98 Mon Sep 17 00:00:00 2001
From: jedi <git@m.j3d1.de>
Date: Tue, 12 Dec 2023 22:20:38 +0100
Subject: [PATCH] stash

---
 core/files/media_v2.py          | 21 +++++++++++----------
 web/src/components/Lightbox.vue |  2 +-
 web/src/views/Items.vue         |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/core/files/media_v2.py b/core/files/media_v2.py
index 39bca8a..2e8661d 100644
--- a/core/files/media_v2.py
+++ b/core/files/media_v2.py
@@ -12,10 +12,10 @@ from files.models import File
 
 @swagger_auto_schema(method='GET', auto_schema=None)
 @api_view(['GET'])
-def media_urls(request, hash_path):
+def media_urls(request, hash):
     try:
-        file = File.objects.get(file=hash_path)
-
+        file = File.objects.get(hash=hash)
+        hash_path = file.file
         return HttpResponse(status=status.HTTP_200_OK,
                             content_type=file.mime_type,
                             headers={
@@ -29,16 +29,17 @@ def media_urls(request, hash_path):
 
 @swagger_auto_schema(method='GET', auto_schema=None)
 @api_view(['GET'])
-def thumbnail_urls(request, size, hash_path):
+def thumbnail_urls(request, size, hash):
     if size not in [32, 64, 256]:
         return Response(status=status.HTTP_404_NOT_FOUND)
     try:
-        file = File.objects.get(file=hash_path)
+        file = File.objects.get(hash=hash)
+        hash_path = file.file
         if not os.path.exists(MEDIA_ROOT + f'/thumbnails/{size}/{hash_path}'):
             from PIL import Image
-            iamge = Image.open(file.file)
-            iamge.thumbnail((size, size))
-            iamge.save(MEDIA_ROOT + f'/media/thumbnails/{size}/{hash_path}', quality=90)
+            image = Image.open(file.file)
+            image.thumbnail((size, size))
+            image.save(MEDIA_ROOT + f'/media/thumbnails/{size}/{hash_path}', quality=90)
 
         return HttpResponse(status=status.HTTP_200_OK,
                             content_type=file.mime_type,
@@ -52,6 +53,6 @@ def thumbnail_urls(request, size, hash_path):
 
 
 urlpatterns = [
-    path('<int:size>/<path:hash_path>/', thumbnail_urls),
-    path('<path:hash_path>/', media_urls),
+    path('<int:size>/<path:hash>/', thumbnail_urls),
+    path('<path:hash>/', media_urls),
 ]
diff --git a/web/src/components/Lightbox.vue b/web/src/components/Lightbox.vue
index 97c0c46..b1933bb 100644
--- a/web/src/components/Lightbox.vue
+++ b/web/src/components/Lightbox.vue
@@ -3,7 +3,7 @@
         <template #body>
             <img
                 class="img-fluid rounded mx-auto d-block mb-3 w-100"
-                :src="`${baseUrl}/1/images/${file}`"
+                :src="`/media/2/${file}/`"
                 alt="Image not available."
                 id="lightbox-image"
             >
diff --git a/web/src/views/Items.vue b/web/src/views/Items.vue
index 6aec95e..bb3f7f6 100644
--- a/web/src/views/Items.vue
+++ b/web/src/views/Items.vue
@@ -45,7 +45,7 @@
             @itemActivated="openLightboxModalWith($event)"
         >
             <img
-                :src="`/api/1/thumbs/${item.file}`"
+                :src="`/media/2/200/${item.file}/`"
                 class="card-img-top img-fluid"
             >
             <div class="card-body">