photo-objects 0.3.1__py3-none-any.whl → 0.4.0__py3-none-any.whl

photo_objects/django/__init__.py

@@ -1,10 +0,0 @@
-from enum import Enum
-
-
-class Size(Enum):
-    TINY = "xs"
-    SMALL = "sm"
-    MEDIUM = "md"
-    LARGE = "lg"
-    HUGE = "xl"
-    ORIGINAL = "og"

photo_objects/django/api/auth.py

@@ -1,6 +1,6 @@
 from django.http import HttpRequest
 
-from photo_objects.django import Size
+from photo_objects.django.conf import PhotoSize
 from photo_objects.django.models import Album, Photo
 
 from photo_objects.django.api.utils import (
@@ -35,7 +35,7 @@ def check_photo_access(
         photo_key: str,
         size_key: str):
     try:
-        size = Size(size_key)
+        size = PhotoSize(size_key)
     except ValueError:
         raise InvalidSize(size_key)
 
@@ -47,7 +47,7 @@ def check_photo_access(
     if not request.user.is_authenticated:
         if photo.album.visibility == Album.Visibility.PRIVATE:
             raise AlbumNotFound(album_key)
-        if size == Size.ORIGINAL:
+        if size == PhotoSize.ORIGINAL:
             raise Unauthorized()
 
     return photo

photo_objects/django/api/utils.py

@@ -7,8 +7,9 @@ from django.shortcuts import render
 from django.urls import reverse_lazy
 
 from photo_objects.error import PhotoObjectsError
+from photo_objects.utils import pretty_list
 from photo_objects.django.views.utils import BackLink
-from photo_objects.django import Size
+from photo_objects.django.conf import PhotoSize
 
 
 APPLICATION_JSON = "application/json"
@@ -17,11 +18,6 @@ MULTIPART_FORMDATA = "multipart/form-data"
 APPLICATION_PROBLEM = "application/problem+json"
 
 
-def _pretty_list(in_: list, conjunction: str):
-    return f' {conjunction} '.join(
-        i for i in (', '.join(in_[:-1]), in_[-1],) if i)
-
-
 class JsonProblem(PhotoObjectsError):
     def __init__(self, title, status, payload=None, headers=None, errors=None):
         super().__init__(title)
@@ -63,7 +59,7 @@ class JsonProblem(PhotoObjectsError):
 
 class MethodNotAllowed(JsonProblem):
     def __init__(self, expected: list[str], actual: str):
-        expected_human = _pretty_list(expected, "or")
+        expected_human = pretty_list(expected, "or")
 
         super().__init__(
             f"Expected {expected_human} method, got {actual}.",
@@ -74,7 +70,7 @@ class MethodNotAllowed(JsonProblem):
 
 class UnsupportedMediaType(JsonProblem):
     def __init__(self, expected: list[str], actual: str):
-        expected_human = _pretty_list(expected, "or")
+        expected_human = pretty_list(expected, "or")
 
         super().__init__(
             f"Expected {expected_human} content-type, got {actual}.",
@@ -93,7 +89,7 @@ class Unauthorized(JsonProblem):
 
 class InvalidSize(JsonProblem):
     def __init__(self, actual: str):
-        expected = _pretty_list([i.value for i in Size], "or")
+        expected = pretty_list([i.value for i in PhotoSize], "or")
 
         super().__init__(
             f"Expected {expected} size, got {actual or 'none'}.",
@@ -138,7 +134,7 @@ def check_permissions(request: HttpRequest, *permissions: str):
         raise Unauthorized()
     if not request.user.has_perms(permissions):
         raise JsonProblem(
-            f"Expected {_pretty_list(permissions, 'and')} permissions",
+            f"Expected {pretty_list(permissions, 'and')} permissions",
             403,
             headers=dict(Allow="GET, POST")
         )

photo_objects/django/apps.py

@@ -2,6 +2,8 @@ from django.apps import AppConfig
 from django.core.checks import Error, register
 from django.conf import settings
 
+from photo_objects.django.conf import validate_photo_sizes
+
 
 class PhotoObjects(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
@@ -17,7 +19,7 @@ def photo_objects_check(app_configs, **kwargs):
     errors = []
 
     try:
-        conf = settings.PHOTO_OBJECTS_OBJSTO
+        objsto_conf = settings.PHOTO_OBJECTS_OBJSTO
     except AttributeError:
         errors.append(
             Error(
@@ -29,7 +31,7 @@ def photo_objects_check(app_configs, **kwargs):
         return errors
 
     for key in ('URL', 'ACCESS_KEY', 'SECRET_KEY',):
-        if not conf.get(key):
+        if not objsto_conf.get(key):
             errors.append(
                 Error(
                     f'The PHOTO_OBJECTS_OBJSTO setting must define {key} '
@@ -38,4 +40,14 @@ def photo_objects_check(app_configs, **kwargs):
                     obj='photo_objects',
                 ))
 
+    try:
+        sizes_conf = settings.PHOTO_OBJECTS_PHOTO_SIZES
+        errors.extend(
+            validate_photo_sizes(
+                sizes_conf,
+                'The PHOTO_OBJECTS_PHOTO_SIZES'))
+    except AttributeError:
+        # Use default values if sizes are not configured
+        pass
+
     return errors

photo_objects/django/conf.py

@@ -0,0 +1,105 @@
+from dataclasses import dataclass
+from enum import Enum
+
+from django.conf import settings
+
+from photo_objects.utils import pretty_list
+
+
+def objsto_settings() -> dict:
+    return settings.PHOTO_OBJECTS_OBJSTO
+
+
+class PhotoSize(Enum):
+    TINY = "xs"
+    SMALL = "sm"
+    MEDIUM = "md"
+    LARGE = "lg"
+    ORIGINAL = "og"
+
+
+CONFIGURABLE_PHOTO_SIZES = [
+    PhotoSize.SMALL.value,
+    PhotoSize.MEDIUM.value,
+    PhotoSize.LARGE.value
+]
+
+
+@dataclass()
+class PhotoSizeDimensions:
+    max_width: int = None
+    max_height: int = None
+    max_aspect_ratio: float = None
+
+
+DEFAULT_SM = dict(
+    max_width=512,
+    max_height=512,
+    max_aspect_ratio=1.5
+)
+DEFAULT_MD = dict(
+    max_width=2048,
+    max_height=2048
+)
+DEFAULT_LG = dict(
+    max_width=4096,
+    max_height=4096
+)
+
+
+@dataclass
+class PhotoSizes:
+    sm: PhotoSizeDimensions = None
+    md: PhotoSizeDimensions = None
+    lg: PhotoSizeDimensions = None
+
+
+def validate_photo_sizes(data: dict, prefix=None) -> list[str]:
+    prefix = prefix or "Photo size"
+    errors = []
+
+    for key, value in data.items():
+        if key not in CONFIGURABLE_PHOTO_SIZES:
+            expected = pretty_list(CONFIGURABLE_PHOTO_SIZES, 'or')
+            errors.append(
+                f"{prefix} key '{key}' is invalid, expected one of {expected}")
+
+        if not isinstance(value, dict):
+            errors.append(f"{prefix} '{key}' must be a dict.")
+
+        if 'max_width' not in value and 'max_height' not in value:
+            errors.append(
+                f"{prefix} '{key}' must define at least one dimension.")
+
+        if (
+            'max_aspect_ratio' in value and
+            value['max_aspect_ratio'] is not None and
+            not isinstance(value['max_aspect_ratio'], (float, int))
+        ):
+            errors.append(
+                f"{prefix} '{key}' max_aspect_ratio must be a number.")
+
+    return errors
+
+
+def parse_photo_sizes(data: dict) -> PhotoSizes:
+    errors = validate_photo_sizes(data)
+
+    if errors:
+        raise ValueError(
+            f"Invalid photo sizes configuration: {' '.join(errors)}")
+
+    return PhotoSizes(
+        sm=PhotoSizeDimensions(**data.get('sm', DEFAULT_SM)),
+        md=PhotoSizeDimensions(**data.get('md', DEFAULT_MD)),
+        lg=PhotoSizeDimensions(**data.get('lg', DEFAULT_LG)),
+    )
+
+
+def photo_sizes() -> PhotoSizes:
+    try:
+        data = settings.PHOTO_OBJECTS_PHOTO_SIZES
+    except AttributeError:
+        data = {}
+
+    return parse_photo_sizes(data)

photo_objects/django/management/commands/clean-scaled-photos.py

@@ -0,0 +1,63 @@
+from django.core.management.base import BaseCommand
+
+from photo_objects.utils import pretty_list
+from photo_objects.django.conf import photo_sizes, CONFIGURABLE_PHOTO_SIZES
+from photo_objects.django.objsto import (
+    delete_scaled_photos,
+    get_photo_sizes,
+    put_photo_sizes,
+)
+
+
+class Command(BaseCommand):
+    help = "Remove scaled photos when scaling settings have changed."
+
+    def handle(self, *args, **options):
+        current = photo_sizes()
+        previous = get_photo_sizes()
+
+        if current == previous:
+            self.stdout.write(
+                self.style.SUCCESS(
+                    "No changes in photo sizes configuration."
+                )
+            )
+            return
+
+        if previous is None:
+            self.stdout.write(
+                self.style.WARNING(
+                    "No previous photo sizes configuration found. "
+                    "Removing all scaled photos:"
+                )
+            )
+            to_delete = CONFIGURABLE_PHOTO_SIZES
+        else:
+            to_delete = []
+            for size in CONFIGURABLE_PHOTO_SIZES:
+                if getattr(previous, size) != getattr(current, size):
+                    to_delete.append(size)
+
+            changed = pretty_list(to_delete, 'and')
+            self.stdout.write(
+                self.style.NOTICE(
+                    "Found changes in photo sizes configuration for "
+                    f"{changed} sizes. Deleting scaled photos:"
+                )
+            )
+
+        try:
+            total = 0
+            for key in delete_scaled_photos(to_delete):
+                self.stdout.write(f"  {key}")
+                total += 1
+            self.stdout.write(f"Total deleted photos: {total}")
+        except Exception as e:
+            self.stdout.write(
+                self.style.ERROR(
+                    f"Error occurred while deleting scaled photos: {e}"
+                )
+            )
+            exit(1)
+
+        put_photo_sizes(current)

photo_objects/django/objsto.py

@@ -1,10 +1,17 @@
+from dataclasses import asdict
+from io import BytesIO
 import json
 import mimetypes
 import urllib3
 
-from django.conf import settings
+from minio import Minio, S3Error
 
-from minio import Minio
+from photo_objects.django.conf import (
+    PhotoSize,
+    PhotoSizes,
+    objsto_settings,
+    parse_photo_sizes,
+)
 
 
 MEGABYTE = 1 << 20
@@ -26,8 +33,7 @@ def _anonymous_readonly_policy(bucket: str):
 
 
 def _objsto_access() -> tuple[Minio, str]:
-    conf = settings.PHOTO_OBJECTS_OBJSTO
-
+    conf = objsto_settings()
     http = urllib3.PoolManager(
         retries=urllib3.util.Retry(connect=1),
         timeout=urllib3.util.Timeout(connect=2.5, read=20),
@@ -51,7 +57,7 @@ def _objsto_access() -> tuple[Minio, str]:
 
 
 def photo_path(album_key, photo_key, size_key):
-    return f"{album_key}/{photo_key}/{size_key}"
+    return f"{size_key}/{album_key}/{photo_key}"
 
 
 def put_photo(album_key, photo_key, size_key, photo_file):
@@ -79,14 +85,31 @@ def get_photo(album_key, photo_key, size_key):
 def delete_photo(album_key, photo_key):
     client, bucket = _objsto_access()
 
-    for i in client.list_objects(
-            bucket,
-            prefix=photo_path(
-                album_key,
-                photo_key,
-                ""),
-            recursive=True):
-        client.remove_object(bucket, i.object_name)
+    for i in PhotoSize:
+        client.remove_object(bucket, photo_path(album_key, photo_key, i.value))
+
+
+def delete_scaled_photos(sizes):
+    client, bucket = _objsto_access()
+
+    for size in sizes:
+        while True:
+            objects = client.list_objects(
+                bucket,
+                prefix=f"{size}/",
+                recursive=True)
+
+            if not objects:
+                break
+
+            empty = True
+            for i in objects:
+                empty = False
+                client.remove_object(bucket, i.object_name)
+                yield i.object_name
+
+            if empty:
+                break
 
 
 def get_error_code(e: Exception) -> str:
@@ -101,3 +124,29 @@ def with_error_code(msg: str, e: Exception) -> str:
     if code:
         return f'{msg} ({code})'
     return msg
+
+
+def put_photo_sizes(sizes: PhotoSizes):
+    data = json.dumps(asdict(sizes))
+    stream = BytesIO(data.encode('utf-8'))
+
+    client, bucket = _objsto_access()
+    client.put_object(
+        bucket,
+        "photo_sizes.json",
+        stream,
+        length=-1,
+        part_size=10 * MEGABYTE,
+        content_type="application/json",
+    )
+
+
+def get_photo_sizes() -> PhotoSizes:
+    client, bucket = _objsto_access()
+    try:
+        data = client.get_object(bucket, "photo_sizes.json")
+        return parse_photo_sizes(json.loads(data.read()))
+    except S3Error as e:
+        if e.code == "NoSuchKey":
+            return None
+        raise

photo_objects/django/tests/test_album.py

@@ -94,7 +94,7 @@ class AlbumViewTests(TestCase):
         User = get_user_model()
         User.objects.create_user(username='no_permission', password='test')
 
-        has_permission = User.objects.create_user(
+        User.objects.create_user(
             username='superuser',
             password='test',
             is_staff=True,

photo_objects/django/tests/test_auth.py

@@ -6,7 +6,7 @@ from .utils import TestCase, create_dummy_photo
 
 
 def _path_fn(album, photo):
-    return lambda size: f"{album}/{photo}/{size}"
+    return lambda size: f"{size}/{album}/{photo}"
 
 
 class AuthViewTests(TestCase):

photo_objects/django/tests/test_commands.py

@@ -0,0 +1,112 @@
+from io import StringIO
+
+from django.contrib.auth import get_user_model
+from django.core.management import call_command
+from minio import S3Error
+
+from photo_objects.django import objsto
+from photo_objects.django.conf import CONFIGURABLE_PHOTO_SIZES
+from photo_objects.django.models import Album
+
+from .utils import TestCase, open_test_photo
+
+
+class PhotoViewTests(TestCase):
+    def setUp(self):
+        User = get_user_model()
+        User.objects.create_user(
+            username='superuser',
+            password='test',
+            is_staff=True,
+            is_superuser=True)
+
+        Album.objects.create(
+            key="test-photo-sizes",
+            visibility=Album.Visibility.PUBLIC)
+
+    def _scale_image(self, album_key, photo_key):
+        for size in CONFIGURABLE_PHOTO_SIZES:
+            response = self.client.get(
+                f"/api/albums/{album_key}/photos/{photo_key}/img?size={size}")
+            self.assertStatus(response, 200)
+
+    def assertPhotoFound(self, album_key, photo_key, sizes):
+        if not isinstance(sizes, list):
+            sizes = [sizes]
+
+        for size in sizes:
+            try:
+                objsto.get_photo(album_key, photo_key, size)
+            except S3Error as e:
+                if e.code == "NoSuchKey":
+                    raise AssertionError(
+                        f"Photo not found: {size}/{album_key}/{photo_key}")
+                else:
+                    raise e
+
+    def assertPhotoNotFound(self, album_key, photo_key, sizes):
+        if not isinstance(sizes, list):
+            sizes = [sizes]
+
+        for size in sizes:
+            with self.assertRaises(
+                S3Error,
+                msg=f"Photo found: {size}/{album_key}/{photo_key}"
+            ) as e:
+                objsto.get_photo(album_key, photo_key, size)
+
+            self.assertEqual(
+                e.exception.code,
+                "NoSuchKey",
+                f"Photo not found: {size}/{album_key}/{photo_key}")
+
+    def test_clean_scaled_photos(self):
+        login_success = self.client.login(
+            username='superuser', password='test')
+        self.assertTrue(login_success)
+
+        filename = "tower.jpg"
+        file = open_test_photo(filename)
+        response = self.client.post(
+            "/api/albums/test-photo-sizes/photos",
+            {filename: file})
+        self.assertStatus(response, 201)
+
+        self._scale_image("test-photo-sizes", "tower.jpg")
+        self.assertPhotoFound("test-photo-sizes",
+                              "tower.jpg", ["sm", "md", "lg", "og"])
+
+        out = StringIO()
+        call_command('clean-scaled-photos', stdout=out)
+        output = out.getvalue()
+        self.assertIn("No previous photo sizes configuration found", output)
+        self.assertIn("Total deleted photos: 3", output)
+        self.assertPhotoNotFound(
+            "test-photo-sizes",
+            "tower.jpg",
+            CONFIGURABLE_PHOTO_SIZES)
+        self.assertPhotoFound("test-photo-sizes", "tower.jpg", "og")
+
+        self._scale_image("test-photo-sizes", "tower.jpg")
+        self.assertPhotoFound("test-photo-sizes",
+                              "tower.jpg", ["sm", "md", "lg", "og"])
+
+        with self.settings(PHOTO_OBJECTS_PHOTO_SIZES=dict(
+            sm=dict(max_width=256, max_height=256),
+        )):
+            out = StringIO()
+            call_command('clean-scaled-photos', stdout=out)
+            output = out.getvalue()
+            self.assertIn(
+                "Found changes in photo sizes configuration for sm sizes.",
+                output)
+            self.assertIn("Total deleted photos: 1", output)
+            self.assertPhotoNotFound("test-photo-sizes", "tower.jpg", "sm")
+            self.assertPhotoFound("test-photo-sizes",
+                                  "tower.jpg", ["md", "lg", "og"])
+
+        response = self.client.delete(
+            "/api/albums/test-photo-sizes/photos/tower.jpg")
+        self.assertStatus(response, 204)
+        self.assertPhotoNotFound(
+            "test-photo-sizes", "tower.jpg", ["sm", "md", "lg", "og"])

photo_objects/django/tests/test_img.py

@@ -0,0 +1,29 @@
+from io import BytesIO
+
+from PIL import Image
+
+from photo_objects.django.conf import DEFAULT_SM
+from photo_objects.img import scale_photo
+
+from .utils import TestCase
+
+
+class ImgTests(TestCase):
+    def test_scale_photo(self):
+        testdata = [
+            ((1000, 200), (300, 200)),
+            ((600, 2000), (341, 512)),
+            ((1000, 1000), (512, 512)),
+        ]
+
+        for input, expected in testdata:
+            with self.subTest(w=input[0], h=input[1]):
+                original = BytesIO()
+                image = Image.new("RGB", input, color="red")
+                image.save(original, format="JPEG")
+                original.seek(0)
+
+                scaled = scale_photo(original, "output.jpg", **DEFAULT_SM)
+                actual = Image.open(scaled).size
+
+                self.assertEqual(actual, expected)

photo_objects/django/tests/test_photo.py

@@ -201,7 +201,7 @@ class PhotoViewTests(TestCase):
             "/api/albums/test-photo-a/photos/tower.jpg/img?size=sm")
         self.assertStatus(small_response, 200)
         _, height = Image.open(BytesIO(small_response.content)).size
-        self.assertEqual(height, 256)
+        self.assertEqual(height, 512)
 
         # Does not scale image up from the original size
         large_response = self.client.get(

photo_objects/django/views/api/auth.py

@@ -15,7 +15,7 @@ def has_permission(request: HttpRequest):
     '''
     path = request.GET.get('path')
     try:
-        album_key, photo_key, raw_size = path.lstrip('/').split('/')
+        raw_size, album_key, photo_key = path.lstrip('/').split('/')
     except (AttributeError, ValueError):
         return HttpResponse(status=403)
 

photo_objects/django/views/api/photo.py

@@ -1,3 +1,4 @@
+from dataclasses import asdict
 import mimetypes
 
 from django.http import HttpRequest, HttpResponse, JsonResponse
@@ -5,7 +6,7 @@ from minio.error import S3Error
 from urllib3.exceptions import HTTPError
 
 from photo_objects import logger
-from photo_objects.django import Size
+from photo_objects.django.conf import PhotoSize, photo_sizes
 from photo_objects.django import api
 from photo_objects.django.api.utils import (
     JsonProblem,
@@ -78,7 +79,7 @@ def get_img(request: HttpRequest, album_key: str, photo_key: str):
     except S3Error:
         try:
             original_photo = objsto.get_photo(
-                album_key, photo_key, Size.ORIGINAL.value)
+                album_key, photo_key, PhotoSize.ORIGINAL.value)
         except (S3Error, HTTPError) as e:
             msg = objsto.with_error_code(
                 f"Could not fetch photo from object storage", e)
@@ -90,11 +91,10 @@ def get_img(request: HttpRequest, album_key: str, photo_key: str):
                 404 if code == "NoSuchKey" else 500,
             ).json_response
 
-        # TODO: make configurable
-        sizes = dict(sm=(None, 256), md=(1024, 1024),
-                     lg=(2048, 2048), xl=(4096, 4096))
+        sizes = photo_sizes()
         # TODO: handle error
-        scaled_photo = scale_photo(original_photo, photo_key, *sizes[size])
+        scaled_photo = scale_photo(
+            original_photo, photo_key, **asdict(getattr(sizes, size)))
 
         # TODO: handle error
         scaled_photo.seek(0)

photo_objects/img.py

@@ -97,10 +97,52 @@ def photo_details(photo_file):
     )
 
 
-def scale_photo(photo_file, filename, max_width=None, max_height=None):
+def _calculate_box(
+    width,
+    height,
+    max_aspect_ratio
+) -> tuple[float, float, float, float]:
+    if max_aspect_ratio is None:
+        return None
+
+    min_aspect_ratio = 1.0 / max_aspect_ratio
+
+    aspect_ratio = width / height
+
+    if aspect_ratio > max_aspect_ratio:
+        new_width = height * max_aspect_ratio
+        crop_amount = width - new_width
+        left = round(crop_amount / 2)
+        right = round(width - crop_amount / 2)
+        return (left, 0, right, height)
+
+    if aspect_ratio < min_aspect_ratio:
+        new_height = width / min_aspect_ratio
+        crop_amount = height - new_height
+        top = round(crop_amount / 2)
+        bottom = round(height - crop_amount / 2)
+        return (0, top, width, bottom)
+
+    return None
+
+
+def scale_photo(
+        photo_file,
+        filename,
+        max_width=None,
+        max_height=None,
+        max_aspect_ratio=None):
     image = Image.open(photo_file)
     width, height = image.size
 
+    # Crop image if aspect ratio is:
+    # - greater than max_aspect_ratio, or
+    # - less than 1/max_aspect_ratio
+    box = _calculate_box(width, height, max_aspect_ratio)
+    if box:
+        image = image.crop(box)
+        width, height = image.size
+
     if max_width and max_height:
         ratio = min(
             max_width / width,

photo_objects/utils.py

@@ -0,0 +1,3 @@
+def pretty_list(in_: list, conjunction: str):
+    return f' {conjunction} '.join(
+        i for i in (', '.join(in_[:-1]), in_[-1],) if i)

{photo_objects-0.3.1.dist-info → photo_objects-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: photo-objects
-Version: 0.3.1
+Version: 0.4.0
 Summary: Application for storing photos in S3 compatible object-storage.
 Author: Toni Kangas
 License: MIT License

{photo_objects-0.3.1.dist-info → photo_objects-0.4.0.dist-info}/RECORD

@@ -1,23 +1,26 @@
 photo_objects/__init__.py,sha256=I1508w_ntomEqTFQgC74SurhxVXfCiDWZLRsny2f59g,60
 photo_objects/config.py,sha256=e9uSuxytkEUR_s0z_WLy5yNWN6fSCdDLq8aw2k5250w,743
 photo_objects/error.py,sha256=7afLYjxM0EaYioxVw_XUqHTvfSMSuQPUwwle0OVlaDY,45
-photo_objects/img.py,sha256=HzM3rCE494TCgaxUN9TwzwudJAFVu9TPj_ebEOyUXpk,3435
-photo_objects/django/__init__.py,sha256=be66-iYaaJljPXmRhnYKtZe9AA71Aa-S-s0cgx3NwyQ,146
+photo_objects/img.py,sha256=YzR5WnImupOUzSUukXrmviOygFR-z-7aOziEiJ_3zbs,4517
+photo_objects/utils.py,sha256=sYliXid-bv2EgNA97woRaOnWU75yZFq7fuqzWaseiDg,139
+photo_objects/django/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 photo_objects/django/admin.py,sha256=sRnKTODk-8s6TAfwvsa2YAd7ECIfVmoOTR6PDASsvGg,122
-photo_objects/django/apps.py,sha256=Z5-cqA0h-axZfj51kbz50YI-B9ubQsX_EjF4fW3n3FM,1072
+photo_objects/django/apps.py,sha256=Apqu6o6fpoxda18NQgKupvQRvTAZxVviIK_-dUR3rck,1444
+photo_objects/django/conf.py,sha256=s5lUbSLpjRWKlE2eYqAZmz60q4Oe10-e7JbIERPa6qI,2463
 photo_objects/django/context_processors.py,sha256=DLhLZHAvGlrpxYegaLiKEx9X7rpyZUFiAnAVF9jjkFA,165
 photo_objects/django/forms.py,sha256=VoDlyZAwiTLyNxW3rRk5bzjfPJvNuKV-wpuLGCe5TCY,6505
 photo_objects/django/models.py,sha256=tRHBqswASWMnyz8rwiKsmHDqEvQX54ly9k8tvU7qNOM,4597
-photo_objects/django/objsto.py,sha256=GZuoPZ1I5qX4rwEYZlOfZZiV4NQ19iknQBT6755421Y,2417
+photo_objects/django/objsto.py,sha256=5z4F8pft01WKLBipyE3Ro9Ac9AvWbuV_rG9Iiour90E,3588
 photo_objects/django/signals.py,sha256=NEh_pfvsSt2f7MuHIJE0uLHUkqjKH4ipAFS7tmvm9LI,2400
 photo_objects/django/urls.py,sha256=ZBzTTYSLkeyuGM_NdSDzz_Yt4xs6hwIFhz04j59Q1r8,2023
 photo_objects/django/api/__init__.py,sha256=BnEHlm3mwyBy-1xhk-NFasgZa4fjCDjtfkBUoH0puPY,62
 photo_objects/django/api/album.py,sha256=c5qDvy6ebIZCzggxcYgSgLBR0cco79V47nJf2OHuBj8,2486
-photo_objects/django/api/auth.py,sha256=LfMm02_TKwrP5XFie-KzBnW3FNFWQAafBlu0UE19Gd4,1370
+photo_objects/django/api/auth.py,sha256=Iduv5grfcgvKiQ2wEFOQYgntiug02LGwL_LwC9-qcss,1390
 photo_objects/django/api/photo.py,sha256=NGCg_Qd4X9NAd7t6lqByK9JGsoTq8HKkyEr-HwMCimI,3838
-photo_objects/django/api/utils.py,sha256=DgAsbvLLZxck_D6AXLsvUXJ3OguLufZ8sadmsToenJ4,5245
+photo_objects/django/api/utils.py,sha256=MB15scKVrK7BMR1df0tc-_dQGI5WDE7iyxnRWl1znPw,5158
 photo_objects/django/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 photo_objects/django/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+photo_objects/django/management/commands/clean-scaled-photos.py,sha256=9zZ7SwX7gluFDh5QYSTg5FGKdq6tndEtBuop4lxmwd4,1977
 photo_objects/django/management/commands/create-initial-admin-account.py,sha256=M4qv1d_qFSGy_lDcKbyKOmfGsQt8i16Zoit9cJ6PwAU,1099
 photo_objects/django/management/commands/create-site-albums.py,sha256=mz99RfmczM0x7zuVRabReq4uBZXN-2Ow7VoNWARvBig,959
 photo_objects/django/migrations/0001_initial.py,sha256=BLW-EZ38sBgDhOYyprc-h_vuPpRxA11qxt4ZuYNO1Wo,2424
@@ -28,17 +31,19 @@ photo_objects/django/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 photo_objects/django/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 photo_objects/django/templatetags/photo_objects_extras.py,sha256=D-xmbDPpvZYSdYyeCExnmLXW7BikOkrQhZab7j0Sjns,1311
 photo_objects/django/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-photo_objects/django/tests/test_album.py,sha256=qeRx_M8EvY9n_as1x8-EWtp9Ob1kOPGnUfZuUnMfDO4,13979
-photo_objects/django/tests/test_auth.py,sha256=su00EypNzGQcvxqhmOtFevZriK31pY7yD1HxpQFcUT4,3928
-photo_objects/django/tests/test_photo.py,sha256=SpQsVynzJLP2F9qYrvZMzCBSiHvsRDpOZ8-W_07K_q8,13386
+photo_objects/django/tests/test_album.py,sha256=XPrL2FGoLPNEl3fXvxqAimtOOpkD4pcdyYl-qEra5d4,13962
+photo_objects/django/tests/test_auth.py,sha256=qZoR6h80EXLcbhVFZgrEkibQGiTBZakUYfTQvCfd5gU,3928
+photo_objects/django/tests/test_commands.py,sha256=MzoVS8Lbi5MI3TgXmKSs8UG3V2_dXq_MKjx9EcrQyYw,4062
+photo_objects/django/tests/test_img.py,sha256=wMQv8I-g8K7-aOVwiRTU4_fQLVQr0MdLrPwzMckIOXY,833
+photo_objects/django/tests/test_photo.py,sha256=2tfSqBV6DtbxQm4Y0BXSSUQMGrY8vsYHhWgxSNp_p_8,13386
 photo_objects/django/tests/test_utils.py,sha256=DkhzDtZqu5OXg-IKzqHz2GY0sFS8RbwYC3w81RuPxS4,1259
 photo_objects/django/tests/utils.py,sha256=lcs1yL-oqLGFkV-NZNf_lOOuiZZZaSQNi7iznHm7BHY,2492
 photo_objects/django/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 photo_objects/django/views/utils.py,sha256=369CUBWwm6LGh7wX1QVqIPE_K_6nb7ePEgHWvV2sKOw,245
 photo_objects/django/views/api/__init__.py,sha256=SxK-b7MgMtD9VRMz46rDV5qtm6AvkRcg3Moa1AWl5pY,108
 photo_objects/django/views/api/album.py,sha256=EZMOkxYzLSWr9wwXnd4yAO64JtXZq2k3FYohiNMFbGQ,1602
-photo_objects/django/views/api/auth.py,sha256=N53csbthH0DEMFjY3fqhtLmtdL7xqzkatktywjqZ8h0,819
-photo_objects/django/views/api/photo.py,sha256=52UMP1r6TN_xfu8fHE25yOUiTa6W1F2XbgEichM8tTE,3526
+photo_objects/django/views/api/auth.py,sha256=EN_ExegzmLN-bhSzu3L9-6UE9qodPd7_ZRLilzrvc8Y,819
+photo_objects/django/views/api/photo.py,sha256=ctfZM80W-rc-t7GIUEI02jRllwe-94FPYThoGQ41EqI,3503
 photo_objects/django/views/api/utils.py,sha256=uQzKdSKHRAux5OZzqgWQr0gsK_FeweQP0cg_67OWA_Y,264
 photo_objects/django/views/ui/__init__.py,sha256=N3ro5KggdV-JnfyHwoStX73b3SbVbpcsMuQNlxntVJs,92
 photo_objects/django/views/ui/album.py,sha256=gOVwkpNZFytTrEU0N6OfJu4U4l85AIbL6b0L6x0eA4E,5232
@@ -46,8 +51,8 @@ photo_objects/django/views/ui/configuration.py,sha256=pzNRHq3FSrVCTx2R31_FW3A3aJ
 photo_objects/django/views/ui/photo.py,sha256=ioECWNMZGLgnEAZBpvYjEVDYZMAyvCwXgl6y3L8jKsE,6249
 photo_objects/django/views/ui/users.py,sha256=nlJyW7rhmr-ZR4LeSHMRPVmJzpiyHCEB2ry6uH2ihOc,713
 photo_objects/django/views/ui/utils.py,sha256=YV_YcUbX-zUkdFnBlezPChR6aPDhZJ9loSOHBSzF6Cc,273
-photo_objects-0.3.1.dist-info/licenses/LICENSE,sha256=V3w6hTjXfP65F4r_mejveHcV5igHrblxao3-2RlfVlA,1068
-photo_objects-0.3.1.dist-info/METADATA,sha256=rh4SAReBNJ2n0OytlvQnpTBnJ2lgiWvC7OMHjSqyO0k,3671
-photo_objects-0.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-photo_objects-0.3.1.dist-info/top_level.txt,sha256=SZeL8mhf-WMGdhRtTGFvZc3aIRBboQls9O0cFDMGdQ0,14
-photo_objects-0.3.1.dist-info/RECORD,,
+photo_objects-0.4.0.dist-info/licenses/LICENSE,sha256=V3w6hTjXfP65F4r_mejveHcV5igHrblxao3-2RlfVlA,1068
+photo_objects-0.4.0.dist-info/METADATA,sha256=bHZ6ikBTFlHIWtZ-fRZzuNT0swXf7OVjVOo4JdfyX8I,3671
+photo_objects-0.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+photo_objects-0.4.0.dist-info/top_level.txt,sha256=SZeL8mhf-WMGdhRtTGFvZc3aIRBboQls9O0cFDMGdQ0,14
+photo_objects-0.4.0.dist-info/RECORD,,