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

photo_objects/config.py

@@ -29,3 +29,9 @@ def get_secret_key() -> str:
     write_to_home_directory("secret_key", key)
 
     return key
+
+
+def add_port_to_host(url: str, port: str | None) -> str:
+    if port:
+        return f"{url}:{port}"
+    return url

photo_objects/django/api/album.py

@@ -16,7 +16,7 @@ from .utils import (
 )
 
 
-def get_site_album(site: Site) -> Album:
+def get_site_album(site: Site) -> tuple[Album, bool]:
     album_key = f'_site_{site.id}'
     return Album.objects.get_or_create(
         key=album_key,
@@ -89,4 +89,4 @@ def delete_album(request: HttpRequest, album_key: str):
             f"Album with {album_key} key can not be deleted because it "
             "contains photos.",
             409,
-        )
+        ) from None

photo_objects/django/api/auth.py

@@ -16,7 +16,7 @@ def check_album_access(request: HttpRequest, album_key: str):
     try:
         album = Album.objects.get(key=album_key)
     except Album.DoesNotExist:
-        raise AlbumNotFound(album_key)
+        raise AlbumNotFound(album_key) from None
 
     if not request.user.is_authenticated:
         if album.visibility == Album.Visibility.PRIVATE:
@@ -37,12 +37,12 @@ def check_photo_access(
     try:
         size = PhotoSize(size_key)
     except ValueError:
-        raise InvalidSize(size_key)
+        raise InvalidSize(size_key) from None
 
     try:
         photo = Photo.objects.get(key=join_key(album_key, photo_key))
     except Photo.DoesNotExist:
-        raise PhotoNotFound(album_key, photo_key)
+        raise PhotoNotFound(album_key, photo_key) from None
 
     if not request.user.is_authenticated:
         if photo.album.visibility == Album.Visibility.PRIVATE:

photo_objects/django/api/photo.py

@@ -36,7 +36,7 @@ def _upload_photo(album_key: str, photo_file: UploadedFile):
         raise JsonProblem(
             "Could not open photo file.",
             400,
-        )
+        ) from None
 
     f = CreatePhotoForm(dict(
         key=f"{album_key}/{slugify(photo_file.name)}",
@@ -59,7 +59,7 @@ def _upload_photo(album_key: str, photo_file: UploadedFile):
         msg = objsto.with_error_code(
             "Could not save photo to object storage", e)
         logger.error(f"{msg}: {str(e)}")
-        raise JsonProblem(f"{msg}.", 500)
+        raise JsonProblem(f"{msg}.", 500) from e
 
     return photo
 
@@ -125,11 +125,11 @@ def delete_photo(request: HttpRequest, album_key: str, photo_key: str):
         msg = objsto.with_error_code(
             "Could not delete photo from object storage", e)
         logger.error(f"{msg}: {str(e)}")
-        raise JsonProblem("{msg}.", 500)
+        raise JsonProblem(f"{msg}.", 500) from e
 
     try:
         photo.delete()
     except Exception as e:
         msg = "Could not delete photo from database"
         logger.error(f"{msg}: {str(e)}")
-        raise JsonProblem(f"{msg}.", 500)
+        raise JsonProblem(f"{msg}.", 500) from e

photo_objects/django/api/utils.py

@@ -50,7 +50,7 @@ class JsonProblem(PhotoObjectsError):
         return render(request, "photo_objects/problem.html", {
             "title": "Error",
             "back": BackLink(
-                f'Back to albums',
+                'Back to albums',
                 reverse_lazy('photo_objects:list_albums')),
             "problem_title": self.title,
             "status": self.status
@@ -153,7 +153,7 @@ def parse_json_body(request: HttpRequest):
         raise JsonProblem(
             "Could not parse JSON data from request body.",
             400,
-        )
+        ) from None
 
 
 def parse_input_data(request: HttpRequest):

photo_objects/django/forms.py

@@ -23,9 +23,9 @@ KEY_POSTFIX_CHARS = 'bcdfghjklmnpqrstvwxz2456789'
 KEY_POSTFIX_LEN = 5
 
 
-def slugify(input: str, lower=False, replace_leading_underscores=False) -> str:
+def slugify(title: str, lower=False, replace_leading_underscores=False) -> str:
     key = unicodedata.normalize(
-        'NFKD', input).encode(
+        'NFKD', title).encode(
         'ascii', 'ignore').decode('ascii')
     if lower:
         key = key.lower()

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

@@ -1,3 +1,4 @@
+# pylint: disable=invalid-name
 from django.core.management.base import BaseCommand
 
 from photo_objects.utils import pretty_list

photo_objects/django/management/commands/create-initial-admin-account.py

@@ -1,6 +1,8 @@
+# pylint: disable=invalid-name
+from secrets import token_urlsafe
+
 from django.core.management.base import BaseCommand
 from django.contrib.auth import get_user_model
-from secrets import token_urlsafe
 
 from photo_objects.config import write_to_home_directory
 
@@ -9,13 +11,13 @@ class Command(BaseCommand):
     help = "Create initial admin user account."
 
     def handle(self, *args, **options):
-        User = get_user_model()
-        superuser_count = User.objects.filter(is_superuser=True).count()
+        user = get_user_model()
+        superuser_count = user.objects.filter(is_superuser=True).count()
 
         if superuser_count == 0:
             username = 'admin'
             password = token_urlsafe(32)
-            User.objects.create_superuser(username, password=password)
+            user.objects.create_superuser(username, password=password)
 
             write_to_home_directory("initial_admin_password", password)
 

photo_objects/django/management/commands/create-site-albums.py

@@ -1,8 +1,8 @@
+# pylint: disable=invalid-name
 from django.core.management.base import BaseCommand
 from django.contrib.sites.models import Site
 
 from photo_objects.django.api.album import get_site_album
-from photo_objects.django.models import Album
 
 
 class Command(BaseCommand):

photo_objects/django/signals.py

@@ -1,5 +1,3 @@
-import re
-
 from django.contrib.sites.models import Site
 from django.db.models.signals import post_save, post_delete
 from django.dispatch import receiver

photo_objects/django/templatetags/photo_objects_extras.py

@@ -2,6 +2,7 @@ from datetime import datetime
 from django import template
 
 from photo_objects.django.api.album import get_site_album
+from photo_objects.django.views.utils import meta_description
 
 
 register = template.Library()
@@ -47,12 +48,12 @@ def meta_og(context):
     try:
         request = context.get("request")
         site = request.site
-        album = get_site_album(site.id)
+        album, _ = get_site_album(site)
 
         return {
             'request': request,
             "title": album.title or site.name,
-            "description": album.description,
+            "description": meta_description(request, album.description),
             "photo": album.cover_photo,
         }
     except Exception:

photo_objects/django/tests/test_album.py

@@ -22,9 +22,9 @@ PHOTOS_DIRECTORY = "photos"
 class ViewVisibilityTests(TestCase):
     @classmethod
     def setUpTestData(cls):
-        User = get_user_model()
-        User.objects.create_user(username='test-visibility', password='test')
-        User.objects.create_user(
+        user = get_user_model()
+        user.objects.create_user(username='test-visibility', password='test')
+        user.objects.create_user(
             username='test-staff-visibility',
             password='test',
             is_staff=True)
@@ -91,16 +91,16 @@ class ViewVisibilityTests(TestCase):
 
 class AlbumViewTests(TestCase):
     def setUp(self):
-        User = get_user_model()
-        User.objects.create_user(username='no_permission', password='test')
+        user = get_user_model()
+        user.objects.create_user(username='no_permission', password='test')
 
-        User.objects.create_user(
+        user.objects.create_user(
             username='superuser',
             password='test',
             is_staff=True,
             is_superuser=True)
 
-        has_permission = User.objects.create_user(
+        has_permission = user.objects.create_user(
             username='has_permission', password='test')
         permissions = [
             'add_album',

photo_objects/django/tests/test_auth.py

@@ -12,8 +12,8 @@ def _path_fn(album, photo):
 class AuthViewTests(TestCase):
     @classmethod
     def setUpTestData(cls):
-        User = get_user_model()
-        User.objects.create_user(username='test-auth', password='test')
+        user = get_user_model()
+        user.objects.create_user(username='test-auth', password='test')
 
         public_album = Album.objects.create(
             key="test-auth-public", visibility=Album.Visibility.PUBLIC)

photo_objects/django/tests/test_commands.py

@@ -2,9 +2,7 @@ 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
 
@@ -13,8 +11,8 @@ from .utils import TestCase, open_test_photo
 
 class PhotoViewTests(TestCase):
     def setUp(self):
-        User = get_user_model()
-        User.objects.create_user(
+        user = get_user_model()
+        user.objects.create_user(
             username='superuser',
             password='test',
             is_staff=True,
@@ -30,36 +28,6 @@ class PhotoViewTests(TestCase):
                 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')
@@ -73,23 +41,23 @@ class PhotoViewTests(TestCase):
         self.assertStatus(response, 201)
 
         self._scale_image("test-photo-sizes", "tower.jpg")
-        self.assertPhotoFound("test-photo-sizes",
-                              "tower.jpg", ["sm", "md", "lg", "og"])
+        self.assertPhotoInObjsto(
+            "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(
+        self.assertPhotoNotInObjsto(
             "test-photo-sizes",
             "tower.jpg",
             CONFIGURABLE_PHOTO_SIZES)
-        self.assertPhotoFound("test-photo-sizes", "tower.jpg", "og")
+        self.assertPhotoInObjsto("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"])
+        self.assertPhotoInObjsto(
+            "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),
@@ -101,12 +69,12 @@ class PhotoViewTests(TestCase):
                 "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"])
+            self.assertPhotoNotInObjsto("test-photo-sizes", "tower.jpg", "sm")
+            self.assertPhotoInObjsto(
+                "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(
+        self.assertPhotoNotInObjsto(
             "test-photo-sizes", "tower.jpg", ["sm", "md", "lg", "og"])

photo_objects/django/tests/test_img.py

@@ -16,10 +16,10 @@ class ImgTests(TestCase):
             ((1000, 1000), (512, 512)),
         ]
 
-        for input, expected in testdata:
-            with self.subTest(w=input[0], h=input[1]):
+        for size, expected in testdata:
+            with self.subTest(w=size[0], h=size[1]):
                 original = BytesIO()
-                image = Image.new("RGB", input, color="red")
+                image = Image.new("RGB", size, color="red")
                 image.save(original, format="JPEG")
                 original.seek(0)
 

photo_objects/django/tests/test_photo.py

@@ -18,10 +18,10 @@ from .utils import TestCase, open_test_photo, parse_timestamps
 
 class PhotoViewTests(TestCase):
     def setUp(self):
-        User = get_user_model()
-        User.objects.create_user(username='no_permission', password='test')
+        user = get_user_model()
+        user.objects.create_user(username='no_permission', password='test')
 
-        has_permission = User.objects.create_user(
+        has_permission = user.objects.create_user(
             username='has_permission', password='test')
         permissions = [
             'add_photo',

photo_objects/django/tests/test_utils.py

@@ -1,9 +1,11 @@
 from unittest import TestCase
+from unittest.mock import MagicMock
 
 from minio import S3Error
 
 from photo_objects.django import objsto
 from photo_objects.django.forms import slugify
+from photo_objects.django.views.utils import meta_description
 
 
 class TestUtils(TestCase):
@@ -16,9 +18,9 @@ class TestUtils(TestCase):
             ("album__photo_-key", "album-photo-key"),
         ]
 
-        for input, expected in checks:
-            with self.subTest(input=input, expected=expected):
-                self.assertEqual(slugify(input), expected)
+        for title, expected in checks:
+            with self.subTest(input=title, expected=expected):
+                self.assertEqual(slugify(title), expected)
 
     def test_slugify_lower(self):
         self.assertEqual(slugify("QwErTy!", True), "qwerty-")
@@ -41,3 +43,22 @@ class TestUtils(TestCase):
             objsto.with_error_code("Failed", e),
             "Failed (Test)",
         )
+
+    def test_meta_description(self):
+        md_multi_p = (
+            "Description with **bold** and *italics*...\n\n"
+            "...and multiple paragraphs")
+        testdata = [
+            ("Plain text description",
+             "Plain text description"),
+            (md_multi_p,
+             "Description with bold and italics..."),
+            (None,
+             "A simple self-hosted photo server."),
+        ]
+
+        for description, expected in testdata:
+            with self.subTest(expected=expected):
+                self.assertEqual(
+                    meta_description(MagicMock(), description),
+                    expected)

photo_objects/django/tests/utils.py

@@ -5,7 +5,9 @@ from django.conf import settings
 from django.test import TestCase as DjangoTestCase, override_settings
 from django.utils import timezone
 from django.utils.dateparse import parse_datetime
+from minio import S3Error
 
+from photo_objects.django import objsto
 from photo_objects.django.models import Album, Photo
 from photo_objects.django.objsto import _objsto_access
 
@@ -38,8 +40,9 @@ def _objsto_test_settings():
 
 @override_settings(PHOTO_OBJECTS_OBJSTO=_objsto_test_settings())
 class TestCase(DjangoTestCase):
+    # pylint: disable=invalid-name
     @classmethod
-    def tearDownClass(_):
+    def tearDownClass(cls):
         client, bucket = _objsto_access()
 
         for i in client.list_objects(bucket, recursive=True):
@@ -47,6 +50,37 @@ class TestCase(DjangoTestCase):
 
         client.remove_bucket(bucket)
 
+    def assertPhotoInObjsto(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}"
+                    ) from None
+                else:
+                    raise e
+
+    def assertPhotoNotInObjsto(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 assertTimestampLess(self, a, b, **kwargs):
         '''Assert a is less than b. Automatically parses strings to datetime
         objects.

photo_objects/django/urls.py

@@ -1,9 +1,8 @@
 from django.contrib.auth import views as auth_views
 from django.http import HttpResponseRedirect
-from django.urls import path, reverse_lazy
+from django.urls import path
 
 from .views import api, ui
-from .views.utils import BackLink
 
 app_name = "photo_objects"
 urlpatterns = [

photo_objects/django/views/api/photo.py

@@ -82,7 +82,7 @@ def get_img(request: HttpRequest, album_key: str, photo_key: str):
                 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)
+                "Could not fetch photo from object storage", e)
             logger.error(f"{msg}: {str(e)}")
 
             code = objsto.get_error_code(e)

photo_objects/django/views/ui/album.py

@@ -1,5 +1,3 @@
-import re
-
 from django.http import HttpRequest, HttpResponseRedirect
 from django.shortcuts import render
 from django.urls import reverse
@@ -10,7 +8,11 @@ from photo_objects.django.api.album import parse_site_id
 from photo_objects.django.api.utils import FormValidationFailed
 from photo_objects.django.forms import CreateAlbumForm, ModifyAlbumForm
 from photo_objects.django.models import Album
-from photo_objects.django.views.utils import BackLink, render_markdown
+from photo_objects.django.views.utils import (
+    BackLink,
+    meta_description,
+    render_markdown,
+)
 
 from .utils import json_problem_as_html
 
@@ -58,6 +60,7 @@ def get_info(request: HttpRequest, album_key: str):
             "album description to configure the site description. The album "
             "title is automatically updated when the related sites name is "
             "changed and vice versa.")
+    return None
 
 
 @json_problem_as_html
@@ -75,7 +78,7 @@ def show_album(request: HttpRequest, album_key: str):
         "album": album,
         "photos": photos,
         "title": album.title or album.key,
-        "description": album.description,
+        "description": meta_description(request, album),
         "back": back,
         "details": details,
         "photo": album.cover_photo,
@@ -147,7 +150,7 @@ def delete_album(request: HttpRequest, album_key: str):
                 'This album is managed by the system and can not be deleted.')}
 
     return render(request, 'photo_objects/delete.html', {
-        "title": f"Delete album",
+        "title": "Delete album",
         "back": back,
         "photo": album.cover_photo,
         "resource": target,

photo_objects/django/views/ui/configuration.py

@@ -44,7 +44,7 @@ def uses_https(request: HttpRequest) -> Validation:
             detail += _(
                 ' If you are running the API server behind a reverse proxy or '
                 'a load-balancer, ensure that HTTPS termination is configured '
-                f'correctly.')
+                'correctly.')
 
     return Validation(
         check=_("Site is served over HTTPS"),

photo_objects/django/views/ui/photo.py

@@ -6,7 +6,11 @@ from photo_objects.django import api
 from photo_objects.django.api.utils import AlbumNotFound, FormValidationFailed
 from photo_objects.django.forms import ModifyPhotoForm, UploadPhotosForm
 from photo_objects.django.models import Photo
-from photo_objects.django.views.utils import BackLink, render_markdown
+from photo_objects.django.views.utils import (
+    BackLink,
+    meta_description,
+    render_markdown,
+)
 
 from .utils import json_problem_as_html
 
@@ -40,8 +44,8 @@ def upload_photos(request: HttpRequest, album_key: str):
     })
 
 
-def _lower(input: str):
-    return input.lower() if input else ''
+def _lower(value: str):
+    return value.lower() if value else ''
 
 
 def _camera(photo: Photo):
@@ -128,7 +132,7 @@ def show_photo(request: HttpRequest, album_key: str, photo_key: str):
         "previous_filename": previous_filename,
         "next_filename": next_filename,
         "title": photo.title or photo.filename,
-        "description": photo.description,
+        "description": meta_description(request, photo),
         "back": back,
         "details": details,
     })

photo_objects/django/views/ui/users.py

@@ -16,7 +16,7 @@ def login(request: HttpRequest):
             "photo": album.cover_photo,
             "action": "Login",
             "back": BackLink(
-                f'Back to albums',
+                'Back to albums',
                 reverse_lazy('photo_objects:list_albums')),
             "class": "login"
         },

photo_objects/django/views/utils.py

@@ -1,6 +1,12 @@
+from xml.etree import ElementTree as ET
+
+from django.http import HttpRequest
+from django.utils.dateformat import format as format_date
 from django.utils.safestring import mark_safe
 from markdown import markdown
 
+from photo_objects.django.models import Album, Photo
+
 
 class BackLink:
     def __init__(self, text, url):
@@ -10,3 +16,45 @@ class BackLink:
 
 def render_markdown(value):
     return mark_safe(markdown(value))
+
+
+def _first_paragraph_textcontent(raw) -> str | None:
+    html = render_markdown(raw)
+    root = ET.fromstring(f"<root>{html}</root>")
+
+    first = root.find("p")
+    if first is None:
+        return None
+
+    return ''.join(first.itertext())
+
+
+def _default_album_description(request: HttpRequest, album: Album) -> str:
+    count = album.photo_set.count()
+    plural = 's' if count != 1 else ''
+    return f"Album with {count} photo{plural} in {request.site.name}."
+
+
+def _default_photo_description(photo: Photo) -> str:
+    date_str = format_date(photo.timestamp, "F Y")
+    return f"Photo from {date_str} in {photo.album.title} album."
+
+
+def meta_description(
+        request: HttpRequest,
+        resource: Album | Photo | str | None) -> str:
+    text = None
+    if isinstance(resource, Album):
+        text = (
+            _first_paragraph_textcontent(resource.description) or
+            _default_album_description(request, resource))
+
+    if isinstance(resource, Photo):
+        text = (
+            _first_paragraph_textcontent(resource.description) or
+            _default_photo_description(resource))
+
+    if isinstance(resource, str):
+        text = _first_paragraph_textcontent(resource)
+
+    return text or "A simple self-hosted photo server."

photo_objects/img.py

@@ -30,6 +30,7 @@ class ExifReader:
             value = d.get(key)
             if value is not None:
                 return value
+        return None
 
 
 def _read_original_datetime(image: Image) -> datetime:
@@ -63,7 +64,6 @@ def _read_camera_setup_and_settings(image: Image) -> dict:
         )
     except Exception as e:
         raise e
-        return dict()
 
 
 def _image_format(filename):

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: photo-objects
-Version: 0.4.0
+Version: 0.4.1
 Summary: Application for storing photos in S3 compatible object-storage.
 Author: Toni Kangas
 License: MIT License
@@ -74,7 +74,7 @@ autopep8 -aaar --in-place --exclude back/api/settings.py,*/migrations/*.py back
 Run static analysis with:
 
 ```sh
-pylint -E --enable=invalid-name,unused-import,useless-object-inheritance back/api photo_objects
+pylint back/api photo_objects
 ```
 
 ### Integration tests

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

@@ -1,58 +1,58 @@
 photo_objects/__init__.py,sha256=I1508w_ntomEqTFQgC74SurhxVXfCiDWZLRsny2f59g,60
-photo_objects/config.py,sha256=e9uSuxytkEUR_s0z_WLy5yNWN6fSCdDLq8aw2k5250w,743
+photo_objects/config.py,sha256=0-Aeo-z-d_fxx-cjAjxSwPJZUgYaAi7NTodiErlxIXo,861
 photo_objects/error.py,sha256=7afLYjxM0EaYioxVw_XUqHTvfSMSuQPUwwle0OVlaDY,45
-photo_objects/img.py,sha256=YzR5WnImupOUzSUukXrmviOygFR-z-7aOziEiJ_3zbs,4517
+photo_objects/img.py,sha256=8FNxKFBVuSyxO_jA3W3PMag3bZ7sEXYKG78rpgxq71Q,4515
 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=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/forms.py,sha256=XiCNqjVqPDn_aV4nGM1z5NfLKHd6_ipm7y0YRt3sXgY,6505
 photo_objects/django/models.py,sha256=tRHBqswASWMnyz8rwiKsmHDqEvQX54ly9k8tvU7qNOM,4597
 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/signals.py,sha256=u1Is0GuNPh5aS47ocbYXbXhXUtjmkMyiViBW14DuyrE,2389
+photo_objects/django/urls.py,sha256=pCUTxg4xSd3ZD8BZVjULb9QpJQ03Ek6-sKoVnYG3-OY,1975
 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=Iduv5grfcgvKiQ2wEFOQYgntiug02LGwL_LwC9-qcss,1390
-photo_objects/django/api/photo.py,sha256=NGCg_Qd4X9NAd7t6lqByK9JGsoTq8HKkyEr-HwMCimI,3838
-photo_objects/django/api/utils.py,sha256=MB15scKVrK7BMR1df0tc-_dQGI5WDE7iyxnRWl1znPw,5158
+photo_objects/django/api/album.py,sha256=ALMEt3lnH1xFwIaSzSuMBlLEC6-hUiNDDGILRMvzDO4,2509
+photo_objects/django/api/auth.py,sha256=lS0S1tMVH2uN30g4jlixklv3eMnQ2FbQVQvuRXeMGYo,1420
+photo_objects/django/api/photo.py,sha256=Gc4GHmcW0995_alE7Q6mdn7SMt9f1JJ-krv-p-SJi8Y,3870
+photo_objects/django/api/utils.py,sha256=kHOdXp-LEaEhL82LCLanQmVpU3jFi8KNSYOgIAv-IVs,5167
 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/management/commands/clean-scaled-photos.py,sha256=KJY6phgTCxcmbMUsUfCRQjatvCmKyFninM8zT-tB3Kc,2008
+photo_objects/django/management/commands/create-initial-admin-account.py,sha256=SuDSEP7S7OR99NtXvjXHnIyuawNOBgMiuwoHs7aCj6g,1131
+photo_objects/django/management/commands/create-site-albums.py,sha256=qRNg-S2u5ABr7iL9LjQNaBaa7PMSSv39mRBWvh6jp_M,944
 photo_objects/django/migrations/0001_initial.py,sha256=BLW-EZ38sBgDhOYyprc-h_vuPpRxA11qxt4ZuYNO1Wo,2424
 photo_objects/django/migrations/0002_created_at_updated_at.py,sha256=7OT2VvDffAkX9XKBHVY-jvzxeIl2yU0Jr1ByCNGcUfw,1039
 photo_objects/django/migrations/0003_admin_visibility.py,sha256=PdxPOJzr-ViRBlOYUHEEGhe0hLtDysZJdMqvbjKVpEg,529
 photo_objects/django/migrations/0004_camera_setup_and_settings.py,sha256=CS5xyIHgBE2Y7-PSJ52ffRQeCzs8p899px9upomk4O8,1844
 photo_objects/django/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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/templatetags/photo_objects_extras.py,sha256=FIv_Q3Xr6AgLBxx4_6aXks3VAt1tK2N3d9rzpzRtx24,1400
 photo_objects/django/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-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/tests/test_album.py,sha256=UIwaAPpaE_v6OvHG_JWSytybht9RgWZR7BNOyyoNiH0,13962
+photo_objects/django/tests/test_auth.py,sha256=hgr1UMVLvSI1x5zY7wTEXSBKfM5E_sNMIFlx8mVWYPY,3928
+photo_objects/django/tests/test_commands.py,sha256=e3lE1ZhFR39WIq2VSKDNcQHUkSJqSWDYuAcAfu29svs,2955
+photo_objects/django/tests/test_img.py,sha256=HEAWcr5fpTkzePkhoQ4YrWsDO9TvFOr7my_0LqVbaO4,829
+photo_objects/django/tests/test_photo.py,sha256=FzSrtWMQjv_EL-M1zM6rYekw_YGuM87JkMHRcLvB2K8,13386
+photo_objects/django/tests/test_utils.py,sha256=zBLv8lkvcLMCaH4D6GR1KZqUe-rPowhcBkQX19-Kshs,2007
+photo_objects/django/tests/utils.py,sha256=Yre-l6rlJn7tPeqFnzQdcmBBG-2vwuGzVLKX-2uQhDs,3643
 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/utils.py,sha256=oP9B6QtHPaukX97rqIlCHxanduktPGFVSCGkGxf4lzI,1691
 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=EN_ExegzmLN-bhSzu3L9-6UE9qodPd7_ZRLilzrvc8Y,819
-photo_objects/django/views/api/photo.py,sha256=ctfZM80W-rc-t7GIUEI02jRllwe-94FPYThoGQ41EqI,3503
+photo_objects/django/views/api/photo.py,sha256=FQCqcnPwSaEJ9MVggQF09E4WD1wVFmLZnT_pFFpWGvA,3502
 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
-photo_objects/django/views/ui/configuration.py,sha256=pzNRHq3FSrVCTx2R31_FW3A3aJxzEO4pDnXsOVS75uA,5576
-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/album.py,sha256=xXGYGYUY4WicI16Jy64sSi49RGIHtsY8KIzdXW0Yz7I,5286
+photo_objects/django/views/ui/configuration.py,sha256=B6PotwK40CMQywdGqyXbwGYXbJv47n5YQT4_WtCqa1w,5575
+photo_objects/django/views/ui/photo.py,sha256=Zo-HE-CzMSLFEtDTL1ds1HnXi3ORsIym4iWa_ZMCPpc,6299
+photo_objects/django/views/ui/users.py,sha256=9EWxw178kcjPNaDzrzKOpTzO93uJYuhjE0lyBMJPw2o,712
 photo_objects/django/views/ui/utils.py,sha256=YV_YcUbX-zUkdFnBlezPChR6aPDhZJ9loSOHBSzF6Cc,273
-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,,
+photo_objects-0.4.1.dist-info/licenses/LICENSE,sha256=V3w6hTjXfP65F4r_mejveHcV5igHrblxao3-2RlfVlA,1068
+photo_objects-0.4.1.dist-info/METADATA,sha256=8m8l9pdPir6bJmip4Q9kBMXXTakFNMLQaLKRNwvoGao,3605
+photo_objects-0.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+photo_objects-0.4.1.dist-info/top_level.txt,sha256=SZeL8mhf-WMGdhRtTGFvZc3aIRBboQls9O0cFDMGdQ0,14
+photo_objects-0.4.1.dist-info/RECORD,,