Merge pull request #1118 from jacobpgallagher/bug_fixes

Bug fixes
LibrePhotos · Jan 6, 2024 · f92992c · f92992c
2 parents 7f64a6c + c67c4dc
commit f92992c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 10 deletions.
diff --git a/api/directory_watcher.py b/api/directory_watcher.py
@@ -392,6 +392,10 @@ def scan_photos(user, full_scan, job_id, scan_directory="", scan_files=[]):
         util.logger.exception("An error occurred: ")
         lrj.failed = True
 
+    lrj.finished_at = datetime.datetime.now().replace(tzinfo=pytz.utc)
+    lrj.finished = True
+    lrj.save()
+
     added_photo_count = Photo.objects.count() - photo_count_before
     util.logger.info("Added {} photos".format(added_photo_count))
 

diff --git a/api/views/views.py b/api/views/views.py
@@ -8,7 +8,7 @@
 from constance import config as site_config
 from django.conf import settings
 from django.db.models import Q, Sum
-from django.http import HttpResponse, HttpResponseForbidden, StreamingHttpResponse
+from django.http import HttpResponse, HttpResponseForbidden, StreamingHttpResponse, FileResponse
 from django.utils.decorators import method_decorator
 from django.utils.encoding import iri_to_uri
 from django.views.decorators.csrf import ensure_csrf_cookie
@@ -183,7 +183,7 @@ class StorageStatsView(APIView):
     def get(self, request, format=None):
         import shutil
 
-        total_storage, used_storage, free_storage = shutil.disk_usage("/")
+        total_storage, used_storage, free_storage = shutil.disk_usage(settings.DATA_ROOT)
         return Response(
             {
                 "total_storage": total_storage,
@@ -552,8 +552,11 @@ def get(self, request, path, fname, format=None):
                     "/nextcloud_media/", "/nextcloud_original/"
                 )
                 internal_path = "/nextcloud_original" + photo.main_file.path[21:]
+            elif photo.main_file.path.startswith(settings.PHOTOS):
+                internal_path = "/original" + photo.main_file.path[len(settings.PHOTOS):]
             else:
-                internal_path = "/original" + photo.main_file.path[5:]
+                # If, for some reason, the file is in a weird place, handle that.
+                internal_path = None
 
             internal_path = quote(internal_path)
 
@@ -579,21 +582,30 @@ def get(self, request, path, fname, format=None):
             # or the photo is shared with the user
             image_hash = fname.split(".")[0].split("_")[0]  # janky alert
             user = User.objects.filter(id=token["user_id"]).only("id").first()
-            if photo.owner == user or user in photo.shared_to.all():
+
+            if internal_path is not None:
                 response = HttpResponse()
                 mime = magic.Magic(mime=True)
                 filename = mime.from_file(photo.main_file.path)
                 response["Content-Type"] = filename
                 response["X-Accel-Redirect"] = internal_path
+            else:
+                try:
+                    response = FileResponse(open(photo.main_file.path, 'rb'))
+                except FileNotFoundError:
+                    return HttpResponse(status=404)
+                except PermissionError:
+                    return HttpResponse(status=403)
+                except IOError:
+                    return HttpResponse(status=500)
+                except:
+                    raise
+
+            if photo.owner == user or user in photo.shared_to.all():
                 return response
             else:
                 for album in photo.albumuser_set.only("shared_to"):
                     if user in album.shared_to.all():
-                        response = HttpResponse()
-                        mime = magic.Magic(mime=True)
-                        filename = mime.from_file(photo.main_file.path)
-                        response["Content-Type"] = filename
-                        response["X-Accel-Redirect"] = internal_path
                         return response
             return HttpResponse(status=404)
 

diff --git a/librephotos/settings/production.py b/librephotos/settings/production.py
@@ -229,7 +229,7 @@
         "USER": os.environ.get("DB_USER", "docker"),
         "PASSWORD": os.environ.get("DB_PASS", "AaAa1234"),
         "HOST": os.environ.get("DB_HOST", "db"),
-        "PORT": "5432",
+        "PORT": os.environ.get("DB_PORT", "5432"),
     },
 }