photo-objects 0.3.0__tar.gz → 0.3.1__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (58) hide show
  1. {photo_objects-0.3.0 → photo_objects-0.3.1}/PKG-INFO +1 -1
  2. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/templatetags/photo_objects_extras.py +6 -0
  3. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/views/ui/photo.py +16 -6
  4. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects.egg-info/PKG-INFO +1 -1
  5. {photo_objects-0.3.0 → photo_objects-0.3.1}/pyproject.toml +1 -1
  6. {photo_objects-0.3.0 → photo_objects-0.3.1}/LICENSE +0 -0
  7. {photo_objects-0.3.0 → photo_objects-0.3.1}/README.md +0 -0
  8. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/__init__.py +0 -0
  9. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/config.py +0 -0
  10. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/__init__.py +0 -0
  11. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/admin.py +0 -0
  12. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/api/__init__.py +0 -0
  13. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/api/album.py +0 -0
  14. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/api/auth.py +0 -0
  15. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/api/photo.py +0 -0
  16. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/api/utils.py +0 -0
  17. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/apps.py +0 -0
  18. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/context_processors.py +0 -0
  19. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/forms.py +0 -0
  20. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/management/__init__.py +0 -0
  21. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/management/commands/__init__.py +0 -0
  22. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/management/commands/create-initial-admin-account.py +0 -0
  23. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/management/commands/create-site-albums.py +0 -0
  24. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/migrations/0001_initial.py +0 -0
  25. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/migrations/0002_created_at_updated_at.py +0 -0
  26. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/migrations/0003_admin_visibility.py +0 -0
  27. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/migrations/0004_camera_setup_and_settings.py +0 -0
  28. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/migrations/__init__.py +0 -0
  29. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/models.py +0 -0
  30. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/objsto.py +0 -0
  31. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/signals.py +0 -0
  32. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/templatetags/__init__.py +0 -0
  33. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/tests/__init__.py +0 -0
  34. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/tests/test_album.py +0 -0
  35. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/tests/test_auth.py +0 -0
  36. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/tests/test_photo.py +0 -0
  37. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/tests/test_utils.py +0 -0
  38. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/tests/utils.py +0 -0
  39. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/urls.py +0 -0
  40. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/views/__init__.py +0 -0
  41. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/views/api/__init__.py +0 -0
  42. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/views/api/album.py +0 -0
  43. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/views/api/auth.py +0 -0
  44. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/views/api/photo.py +0 -0
  45. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/views/api/utils.py +0 -0
  46. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/views/ui/__init__.py +0 -0
  47. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/views/ui/album.py +0 -0
  48. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/views/ui/configuration.py +0 -0
  49. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/views/ui/users.py +0 -0
  50. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/views/ui/utils.py +0 -0
  51. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/django/views/utils.py +0 -0
  52. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/error.py +0 -0
  53. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects/img.py +0 -0
  54. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects.egg-info/SOURCES.txt +0 -0
  55. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects.egg-info/dependency_links.txt +0 -0
  56. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects.egg-info/requires.txt +0 -0
  57. {photo_objects-0.3.0 → photo_objects-0.3.1}/photo_objects.egg-info/top_level.txt +0 -0
  58. {photo_objects-0.3.0 → photo_objects-0.3.1}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: photo-objects
3
- Version: 0.3.0
3
+ Version: 0.3.1
4
4
  Summary: Application for storing photos in S3 compatible object-storage.
5
5
  Author: Toni Kangas
6
6
  License: MIT License
@@ -1,3 +1,4 @@
1
+ from datetime import datetime
1
2
  from django import template
2
3
 
3
4
  from photo_objects.django.api.album import get_site_album
@@ -25,6 +26,11 @@ def display_name(user):
25
26
  return user.username
26
27
 
27
28
 
29
+ @register.filter
30
+ def is_datetime(value):
31
+ return isinstance(value, datetime)
32
+
33
+
28
34
  @register.filter
29
35
  def is_list(value):
30
36
  return isinstance(value, list)
@@ -40,13 +40,23 @@ def upload_photos(request: HttpRequest, album_key: str):
40
40
  })
41
41
 
42
42
 
43
+ def _lower(input: str):
44
+ return input.lower() if input else ''
45
+
46
+
43
47
  def _camera(photo: Photo):
44
- if photo.camera_make or photo.camera_model:
45
- return " ".join(i for i in [
46
- photo.camera_make,
47
- photo.camera_model,
48
- ] if i)
49
- return None
48
+ if not photo.camera_make and not photo.camera_model:
49
+ return None
50
+
51
+ # If camera model includes camera make, return model value to avoid
52
+ # stuttering.
53
+ if _lower(photo.camera_make) in _lower(photo.camera_model):
54
+ return photo.camera_model
55
+
56
+ return " ".join(i for i in [
57
+ photo.camera_make,
58
+ photo.camera_model,
59
+ ] if i)
50
60
 
51
61
 
52
62
  def _lens(photo: Photo):
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: photo-objects
3
- Version: 0.3.0
3
+ Version: 0.3.1
4
4
  Summary: Application for storing photos in S3 compatible object-storage.
5
5
  Author: Toni Kangas
6
6
  License: MIT License
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "photo-objects"
7
- version = "0.3.0"
7
+ version = "0.3.1"
8
8
  dependencies = [
9
9
  "markdown~=3.7",
10
10
  "minio~=7.2",
File without changes
File without changes
File without changes