-
-
+
-
diff --git a/fredagscafeen/settings/base.py b/fredagscafeen/settings/base.py
index 955ac69..e2c772d 100644
--- a/fredagscafeen/settings/base.py
+++ b/fredagscafeen/settings/base.py
@@ -181,6 +181,10 @@
"events",
"printer",
"rosetta",
+ "sorl.thumbnail",
+ "jfu",
+ "gallery",
+ "versatileimagefield",
)
MIDDLEWARE = (
@@ -317,3 +321,14 @@
X_FRAME_OPTIONS = "SAMEORIGIN"
DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
+
+VERSATILEIMAGEFIELD_RENDITION_KEY_SETS = {
+ "gallery": [
+ ("gallery_253", "crop__253x253"),
+ ("image_400", "thumbnail__400x400"),
+ ("image_720", "thumbnail__720x720"),
+ ("image_940", "thumbnail__940x940"),
+ ("image_1140", "thumbnail__1140x1140"),
+ ("image_2280", "thumbnail__2280x2280"),
+ ],
+}
diff --git a/gallery/__init__.py b/gallery/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/gallery/admin.py b/gallery/admin.py
new file mode 100644
index 0000000..c79b877
--- /dev/null
+++ b/gallery/admin.py
@@ -0,0 +1,87 @@
+from django import forms
+from django.contrib import admin
+from django.db import models
+from django.urls import reverse
+from django.utils.html import format_html
+from django.utils.translation import gettext_lazy as _
+
+from gallery.models import Album, BaseMedia
+
+
+class InlineBaseMediaAdmin(admin.TabularInline):
+ model = BaseMedia
+ extra = 0
+ fields = (
+ "admin_thumbnail",
+ "date",
+ "caption",
+ "visibility",
+ "slug",
+ "forcedOrder",
+ )
+ readonly_fields = (
+ "admin_thumbnail",
+ "slug",
+ )
+
+ def has_add_permission(self, request, obj=None):
+ return False
+
+
+class AlbumAdminForm(forms.ModelForm):
+ class Meta:
+ model = Album
+ fields = [
+ "title",
+ "publish_date",
+ "year",
+ "thumbnail",
+ "eventalbum",
+ "description",
+ "slug",
+ ]
+
+
+class AlbumAdmin(admin.ModelAdmin):
+ # List display of multiple albums
+ list_display = ("title", "year", "publish_date", "get_visibility_link")
+ ordering = [
+ "-year",
+ "eventalbum",
+ "-oldFolder",
+ "-publish_date",
+ ] # Reverse of models.Album.ordering
+ list_filter = ("year", "eventalbum")
+
+ # Form display of single album
+ inlines = [InlineBaseMediaAdmin]
+ form = AlbumAdminForm
+ prepopulated_fields = {
+ "slug": ("title",),
+ }
+ formfield_overrides = {
+ models.SlugField: {"widget": forms.TextInput(attrs={"readOnly": "True"})}
+ }
+
+ add_form_template = "admin/gallery/add_form.html"
+
+ def get_inline_instances(self, request, obj=None):
+ if obj is None:
+ # When creating Album, don't display the BaseMedia inlines
+ return []
+ return super(AlbumAdmin, self).get_inline_instances(request, obj)
+
+ def get_visibility_link(self, album):
+ file = album.basemedia.first()
+ if file:
+ kwargs = dict(year=album.year, album_slug=album.slug, image_slug=file.slug)
+ html_string = '' + _("Udvælg billeder") + ""
+ return format_html(html_string, reverse("image", kwargs=kwargs))
+
+ get_visibility_link.short_description = _("Udvælg billeder")
+
+ def save_related(self, request, form, formsets, change):
+ super().save_related(request, form, formsets, change)
+
+
+admin.site.register(Album, AlbumAdmin)
diff --git a/gallery/forms.py b/gallery/forms.py
new file mode 100644
index 0000000..61509cf
--- /dev/null
+++ b/gallery/forms.py
@@ -0,0 +1,48 @@
+import re
+
+from django import forms
+
+from gallery.models import BaseMedia
+
+
+class EditVisibilityForm(forms.Form):
+ class Missing(Exception):
+ pass
+
+ def __init__(self, file_visibility, **kwargs):
+ super(EditVisibilityForm, self).__init__(**kwargs)
+ self.basemedias = []
+ self.album_pks = set()
+ for file in file_visibility:
+ if isinstance(file, BaseMedia):
+ pk = file.pk
+ visibility = file.visibility
+ album = file.album_id
+ elif isinstance(file, tuple):
+ pk, visibility, album = file
+ else:
+ raise TypeError(type(file))
+ k = "i%s" % pk
+ self.album_pks.add(album)
+ self.fields[k] = forms.ChoiceField(
+ choices=BaseMedia.VISIBILITY,
+ initial=visibility,
+ widget=forms.RadioSelect,
+ )
+ self.basemedias.append((pk, k))
+
+ @classmethod
+ def from_POST(cls, post_data):
+ pattern = r"^i(\d+)$"
+ pks = []
+ for k, v in post_data.items():
+ mo = re.match(pattern, k)
+ if mo:
+ pks.append(int(mo.group(1)))
+ files = BaseMedia.objects.filter(pk__in=pks)
+ files = list(files.values_list("pk", "visibility", "album_id"))
+ found_pks = [f[0] for f in files]
+ missing = set(pks) - set(found_pks)
+ if missing:
+ raise cls.Missing("Not found: %r" % (sorted(missing),))
+ return cls(files, data=post_data)
diff --git a/gallery/management/__init__.py b/gallery/management/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/gallery/management/commands/__init__.py b/gallery/management/commands/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/gallery/management/commands/delete_marked_images.py b/gallery/management/commands/delete_marked_images.py
new file mode 100644
index 0000000..78e8d11
--- /dev/null
+++ b/gallery/management/commands/delete_marked_images.py
@@ -0,0 +1,19 @@
+import logging
+
+from django.core.management.base import BaseCommand
+
+from gallery.models import BaseMedia
+
+logger = logging.getLogger(__name__)
+
+
+class Command(BaseCommand):
+ help = 'Slet billeder som er markeret "Slet"'
+
+ def handle(self, *args, **options):
+ qs = BaseMedia.objects.filter(visibility=BaseMedia.DELETE)
+ n = qs.count()
+ if n:
+ ids = sorted(qs.values_list("id", flat=True))
+ logger.info("Deleting %s BaseMedia objects with IDs %s", n, ids)
+ BaseMedia.objects.filter(id__in=ids).delete()
diff --git a/gallery/migrations/0001_initial.py b/gallery/migrations/0001_initial.py
new file mode 100644
index 0000000..8c897ab
--- /dev/null
+++ b/gallery/migrations/0001_initial.py
@@ -0,0 +1,199 @@
+# Generated by Django 3.2.4 on 2024-11-04 11:17
+
+import datetime
+
+import django.core.validators
+import django.db.models.deletion
+import versatileimagefield.fields
+from django.db import migrations, models
+
+import gallery.utils
+
+
+class Migration(migrations.Migration):
+
+ initial = True
+
+ dependencies = []
+
+ operations = [
+ migrations.CreateModel(
+ name="Album",
+ fields=[
+ (
+ "id",
+ models.AutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ ("title", models.CharField(max_length=200, verbose_name="Titel")),
+ (
+ "publish_date",
+ models.DateField(
+ blank=True,
+ default=datetime.date.today,
+ null=True,
+ verbose_name="Udgivelsesdato",
+ ),
+ ),
+ (
+ "eventalbum",
+ models.BooleanField(default=True, verbose_name="Arrangement"),
+ ),
+ (
+ "gfyear",
+ models.PositiveSmallIntegerField(
+ default=gallery.utils.get_year, verbose_name="Årgang"
+ ),
+ ),
+ ("slug", models.SlugField(verbose_name="Kort titel")),
+ (
+ "description",
+ models.TextField(blank=True, verbose_name="Beskrivelse"),
+ ),
+ ("oldFolder", models.CharField(blank=True, max_length=200)),
+ ],
+ options={
+ "ordering": ["gfyear", "-eventalbum", "oldFolder", "publish_date"],
+ "unique_together": {("gfyear", "slug")},
+ },
+ ),
+ migrations.CreateModel(
+ name="BaseMedia",
+ fields=[
+ (
+ "id",
+ models.AutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ (
+ "type",
+ models.CharField(
+ choices=[
+ ("I", "Image"),
+ ("V", "Video"),
+ ("A", "Audio"),
+ ("O", "Other"),
+ ],
+ default="O",
+ max_length=1,
+ ),
+ ),
+ (
+ "date",
+ models.DateTimeField(blank=True, null=True, verbose_name="Dato"),
+ ),
+ (
+ "visibility",
+ models.CharField(
+ choices=[
+ ("public", "Synligt"),
+ ("discarded", "Frasorteret"),
+ ("sensitive", "Skjult"),
+ ("delete", "Slet"),
+ ("new", "Ubesluttet"),
+ ],
+ default="new",
+ max_length=10,
+ verbose_name="Synlighed",
+ ),
+ ),
+ (
+ "caption",
+ models.CharField(
+ blank=True, max_length=200, verbose_name="Overskrift"
+ ),
+ ),
+ (
+ "slug",
+ models.SlugField(blank=True, null=True, verbose_name="Kort titel"),
+ ),
+ (
+ "forcedOrder",
+ models.SmallIntegerField(
+ default=0,
+ validators=[
+ django.core.validators.MinValueValidator(-10000),
+ django.core.validators.MaxValueValidator(10000),
+ ],
+ verbose_name="Rækkefølge",
+ ),
+ ),
+ (
+ "isCoverFile",
+ models.NullBooleanField(verbose_name="Vis på forsiden"),
+ ),
+ (
+ "album",
+ models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE,
+ related_name="basemedia",
+ to="gallery.album",
+ ),
+ ),
+ ],
+ options={
+ "ordering": ["forcedOrder", "date", "slug"],
+ "select_on_save": True,
+ "unique_together": {("album", "slug")},
+ },
+ ),
+ migrations.CreateModel(
+ name="GenericFile",
+ fields=[
+ (
+ "basemedia_ptr",
+ models.OneToOneField(
+ auto_created=True,
+ on_delete=django.db.models.deletion.CASCADE,
+ parent_link=True,
+ primary_key=True,
+ serialize=False,
+ to="gallery.basemedia",
+ ),
+ ),
+ (
+ "originalFile",
+ models.FileField(blank=True, upload_to=gallery.utils.file_name),
+ ),
+ ("file", models.FileField(upload_to=gallery.utils.file_name)),
+ ],
+ options={
+ "select_on_save": True,
+ },
+ bases=("gallery.basemedia",),
+ ),
+ migrations.CreateModel(
+ name="Image",
+ fields=[
+ (
+ "basemedia_ptr",
+ models.OneToOneField(
+ auto_created=True,
+ on_delete=django.db.models.deletion.CASCADE,
+ parent_link=True,
+ primary_key=True,
+ serialize=False,
+ to="gallery.basemedia",
+ ),
+ ),
+ (
+ "file",
+ versatileimagefield.fields.VersatileImageField(
+ upload_to=gallery.utils.file_name
+ ),
+ ),
+ ],
+ options={
+ "select_on_save": True,
+ },
+ bases=("gallery.basemedia",),
+ ),
+ ]
diff --git a/gallery/migrations/0002_auto_20241104_1219.py b/gallery/migrations/0002_auto_20241104_1219.py
new file mode 100644
index 0000000..4bb35cc
--- /dev/null
+++ b/gallery/migrations/0002_auto_20241104_1219.py
@@ -0,0 +1,26 @@
+# Generated by Django 3.2.4 on 2024-11-04 11:19
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("gallery", "0001_initial"),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name="album",
+ options={"ordering": ["year", "-eventalbum", "oldFolder", "publish_date"]},
+ ),
+ migrations.RenameField(
+ model_name="album",
+ old_name="gfyear",
+ new_name="year",
+ ),
+ migrations.AlterUniqueTogether(
+ name="album",
+ unique_together={("year", "slug")},
+ ),
+ ]
diff --git a/gallery/migrations/0003_album_thumbnail.py b/gallery/migrations/0003_album_thumbnail.py
new file mode 100644
index 0000000..4519afe
--- /dev/null
+++ b/gallery/migrations/0003_album_thumbnail.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.4 on 2024-11-04 14:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("gallery", "0002_auto_20241104_1219"),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name="album",
+ name="thumbnail",
+ field=models.ImageField(blank=True, null=True, upload_to="galleries"),
+ ),
+ ]
diff --git a/gallery/migrations/0004_auto_20241104_1529.py b/gallery/migrations/0004_auto_20241104_1529.py
new file mode 100644
index 0000000..40016de
--- /dev/null
+++ b/gallery/migrations/0004_auto_20241104_1529.py
@@ -0,0 +1,24 @@
+# Generated by Django 3.2.4 on 2024-11-04 14:29
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("gallery", "0003_album_thumbnail"),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name="basemedia",
+ name="isCoverFile",
+ ),
+ migrations.AlterField(
+ model_name="album",
+ name="thumbnail",
+ field=models.ImageField(
+ blank=True, null=True, upload_to="galleries", verbose_name="Thumbnail"
+ ),
+ ),
+ ]
diff --git a/gallery/migrations/__init__.py b/gallery/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/gallery/models.py b/gallery/models.py
new file mode 100644
index 0000000..858c569
--- /dev/null
+++ b/gallery/models.py
@@ -0,0 +1,227 @@
+import logging
+import os
+from datetime import date
+
+from django.core.exceptions import ValidationError
+from django.core.validators import MaxValueValidator, MinValueValidator
+from django.db import models
+from django.dispatch import receiver
+from django.urls import reverse
+from django.utils.html import format_html
+from django.utils.translation import gettext_lazy as _
+from model_utils.managers import InheritanceManager
+from six import python_2_unicode_compatible
+from sorl.thumbnail import get_thumbnail
+from versatileimagefield.fields import VersatileImageField
+from versatileimagefield.image_warmer import VersatileImageFieldWarmer
+
+from fredagscafeen.settings.base import MEDIA_ROOT
+from gallery.utils import file_name, get_exif_date, get_year, slugify
+
+FORCEDORDERMAX = 10000
+
+logger = logging.getLogger(__name__)
+
+
+@python_2_unicode_compatible
+class Album(models.Model):
+ class Meta:
+ ordering = ["year", "-eventalbum", "oldFolder", "publish_date"]
+ unique_together = (("year", "slug"),)
+
+ title = models.CharField(max_length=200, verbose_name=_("Titel"))
+ publish_date = models.DateField(
+ blank=True, null=True, default=date.today, verbose_name=_("Udgivelsesdato")
+ )
+ thumbnail = models.ImageField(
+ upload_to="galleries", blank=True, null=True, verbose_name=_("Thumbnail")
+ )
+ eventalbum = models.BooleanField(default=True, verbose_name=_("Arrangement"))
+ year = models.PositiveSmallIntegerField(default=get_year, verbose_name=_("Årgang"))
+ slug = models.SlugField(verbose_name=_("Kort titel"))
+ description = models.TextField(blank=True, verbose_name=_("Beskrivelse"))
+
+ oldFolder = models.CharField(max_length=200, blank=True)
+
+ def __str__(self):
+ return "%s: %s" % (self.year, self.title)
+
+ def clean(self):
+ for m in self.basemedia.all():
+ m.save()
+
+ f = self.basemedia.filter(visibility=BaseMedia.PUBLIC).first()
+ if f:
+ f.save()
+
+ def get_absolute_url(self):
+ return reverse("album", kwargs={"year": self.year, "album_slug": self.slug})
+
+
+@python_2_unicode_compatible
+class BaseMedia(models.Model):
+ class Meta:
+ ordering = ["forcedOrder", "date", "slug"]
+ unique_together = (("album", "slug"),)
+
+ # Use the pre-1.6 save(). This is a workaround for
+ # https://github.com/TK-IT/web/issues/72 This can be removed when the
+ # upstream bug https://code.djangoproject.com/ticket/21670 is closed
+ select_on_save = True
+
+ IMAGE = "I"
+ VIDEO = "V"
+ AUDIO = "A"
+ OTHER = "O"
+ TYPE_CHOICES = (
+ (IMAGE, _("Image")),
+ (VIDEO, _("Video")),
+ (AUDIO, _("Audio")),
+ (OTHER, _("Other")),
+ )
+
+ PUBLIC = "public"
+ DISCARDED = "discarded"
+ SENSITIVE = "sensitive"
+ DELETE = "delete"
+ NEW = "new"
+ VISIBILITY = (
+ (PUBLIC, _("Synligt")),
+ (DISCARDED, _("Frasorteret")),
+ (SENSITIVE, _("Skjult")),
+ (DELETE, _("Slet")),
+ (NEW, _("Ubesluttet")),
+ )
+
+ type = models.CharField(max_length=1, choices=TYPE_CHOICES, default=OTHER)
+
+ objects = InheritanceManager()
+ album = models.ForeignKey(Album, on_delete=models.CASCADE, related_name="basemedia")
+
+ date = models.DateTimeField(null=True, blank=True, verbose_name=_("Dato"))
+ visibility = models.CharField(
+ max_length=10, choices=VISIBILITY, verbose_name=_("Synlighed"), default=NEW
+ )
+ caption = models.CharField(max_length=200, blank=True, verbose_name=_("Overskrift"))
+
+ slug = models.SlugField(null=True, blank=True, verbose_name=_("Kort titel"))
+
+ forcedOrder = models.SmallIntegerField(
+ default=0,
+ validators=[
+ MinValueValidator(-FORCEDORDERMAX),
+ MaxValueValidator(FORCEDORDERMAX),
+ ],
+ verbose_name="Rækkefølge",
+ )
+
+ def admin_thumbnail(self):
+ if self.type == BaseMedia.IMAGE:
+ return self.image.admin_thumbnail()
+
+ admin_thumbnail.short_description = _("Thumbnail")
+
+ @property
+ def notPublic(self):
+ return self.visibility != self.PUBLIC
+
+ def __str__(self):
+ return "%s" % (self.slug)
+
+ def get_absolute_url(self):
+ return reverse(
+ "image",
+ kwargs={
+ "year": self.album.year,
+ "album_slug": self.album.slug,
+ "image_slug": self.slug,
+ },
+ )
+
+
+class Image(BaseMedia):
+ class Meta:
+ # Use the pre-1.6 save(). This is a workaround for
+ # https://github.com/TK-IT/web/issues/72 This can be removed when the
+ # upstream bug https://code.djangoproject.com/ticket/21670 is closed
+ select_on_save = True
+
+ objects = models.Manager()
+ file = VersatileImageField(upload_to=file_name)
+
+ def admin_thumbnail(self):
+ return format_html('
', get_thumbnail(self.file, "150x150").url) + + admin_thumbnail.short_description = _("Thumbnail") + + def clean(self): + self.type = BaseMedia.IMAGE + + if self.date == None: + self.date = get_exif_date(self.file) + + if self.slug == None: + if self.date == None: + self.slug = slugify( + os.path.splitext(os.path.basename(self.file.name))[0] + ) + else: + self.slug = self.date.strftime("%Y%m%d%H%M%S_%f")[ + : len("YYYYmmddHHMMSS_ff") + ] + + def save(self, *args, **kwargs): + """ + This saves the Image, tries to prewarm VersatileImageField and deletes + itself again if it fails. Ideally this would be done in clean(), but + VersatileImageField cannot prewarm before it is saved and does not have + a clean that checks if the warming is bound to succeed. + + """ + super().save(*args, **kwargs) + image_warmer = VersatileImageFieldWarmer( + instance_or_queryset=self, rendition_key_set="gallery", image_attr="file" + ) + + num_created, failed_to_create = image_warmer.warm() + if failed_to_create: + + self.delete() # Hey! Look at me! + + logger.warning( + "Prewarming during save() of %s failed. Deleting again." % self + ) + raise ValidationError("Corrupt image. Deleting") + + +class GenericFile(BaseMedia): + class Meta: + # Use the pre-1.6 save(). This is a workaround for + # https://github.com/TK-IT/web/issues/72 This can be removed when the + # upstream bug https://code.djangoproject.com/ticket/21670 is closed + select_on_save = True + + objects = models.Manager() + originalFile = models.FileField(upload_to=file_name, blank=True) + file = models.FileField(upload_to=file_name) + + def clean(self): + if self.slug == None: + if self.date == None: + sep = os.path.splitext(os.path.basename(self.file.name)) + self.slug = slugify(sep[0]) + sep[1] + self.forcedOrder = FORCEDORDERMAX + else: + self.slug = self.date.strftime("%Y%m%d%H%M%S_%f")[ + : len("YYYYmmddHHMMSS_ff") + ] + + +@receiver(models.signals.post_delete, sender=Image) +def deleteImageThumbnails(sender, instance, **kwargs): + """ + Delete all thumbnails generated by the VersatileImageField. + """ + logger.debug("deleteImageThumbnails: called with instance: %s." % (instance)) + instance.file.delete_sized_images() + logger.debug("deleteImageThumbnails: deleting images") diff --git a/gallery/templates/admin/gallery/add_form.html b/gallery/templates/admin/gallery/add_form.html new file mode 100644 index 0000000..5225fe5 --- /dev/null +++ b/gallery/templates/admin/gallery/add_form.html @@ -0,0 +1,5 @@ +{% extends "admin/change_form.html" %} +{% load i18n %} +{% block form_top %} +
{% translate "Du kan tilføje billeder efter du har trykket på 'Gem og forsæt med at redigere'." %}
+{% endblock %} diff --git a/gallery/templates/admin/gallery/change_form.html b/gallery/templates/admin/gallery/change_form.html new file mode 100644 index 0000000..118f34c --- /dev/null +++ b/gallery/templates/admin/gallery/change_form.html @@ -0,0 +1,12 @@ +{% extends "admin/change_form.html" %} +{% load jfutags %} +{% load i18n %} +{% block content %} +{{ block.super }} +
+{% if object_id %} +{% jfu 'admin/gallery/upload_form.html' %} +{% else %} +{% translate "Du kan tilføje billeder efter du har trykket på 'Gem og forsæt med at redigere'." %}
+{% endif %} +{% endblock %} diff --git a/gallery/templates/admin/gallery/upload_form.html b/gallery/templates/admin/gallery/upload_form.html new file mode 100644 index 0000000..ba11357 --- /dev/null +++ b/gallery/templates/admin/gallery/upload_form.html @@ -0,0 +1,55 @@ +{% extends 'jfu/upload_form.html' %} +{% load i18n %} +{% block CSS_BOOTSTRAP %} + +{% endblock %} +{% block CSS_EXTRA %} + +{% endblock %} + +{% block UPLOAD_FORM_BUTTON_BAR_CONTROL %} + +{% endblock %} + +{% block JS_INIT %} + + $('#fileupload').fileupload({ + + formData: [ + { name: "csrfmiddlewaretoken", value: "{{ csrf_token }}" }, + { name: "object_id", value: "{{ object_id }}" }, + ], + + {% block JS_OPTS %} + autoUpload: true, + {% endblock %} + + }); +{% endblock JS_INIT %} + + +{% comment %} + Remove all blueimp gallery related stuf. +{% endcomment %} + +{% block CSS_BLUEIMP_GALLERY %} +{% endblock %} + +{% block MODAL_GALLERY %} +{% endblock %} + +{% block JS_BLUEIMP_GALLERY %} +{% endblock %} diff --git a/gallery/templates/album.html b/gallery/templates/album.html new file mode 100644 index 0000000..94509a4 --- /dev/null +++ b/gallery/templates/album.html @@ -0,0 +1,89 @@ +{% extends 'base.html' %} +{% load i18n %} + +{% load bootstrap5 bootstrap_icons %} + +{% block title %}{{ album.year }} / {{ album.title }}{% endblock title %} + +{% block canonical_url %}{% url 'album' year=album.year album_slug=album.slug %}{% endblock canonical_url %} + +{% block content %} + +{% if edit_visibility_link %} +{% translate "Udvælg billeder" %}
++{{ visible_count }} +{% blocktranslate count visible_count=visible_count %} +synlig +{% plural %} +synlige +{% endblocktranslate %} +{% translate "og" %} +{{ hidden_count }} +{% blocktranslate count hidden_count=hidden_count %} +skjult +{% plural %} +skjulte +{% endblocktranslate %} +{% translate "hvoraf" %} +{{ new_count }} +{% blocktranslate count new_count=new_count %} +er ny +{% plural %} +er nye +{% endblocktranslate %}. +
+ +{% endif %} ++++ +++++ {{ files|length }} + {% blocktranslate count c=files|length %} + billede + {% plural %} + billeder + {% endblocktranslate %} + {% if album.publish_date %} {% translate "fra d." %} {{ album.publish_date }}{% endif %} +
++ {% for file in files %} + + {% empty %} ++ +{% endblock content%} diff --git a/gallery/templates/gallery.html b/gallery/templates/gallery.html new file mode 100644 index 0000000..0ea83a7 --- /dev/null +++ b/gallery/templates/gallery.html @@ -0,0 +1,82 @@ +{% extends 'base.html' %} +{% load i18n %} +{% load static %} + +{% load bootstrap5 bootstrap_icons %} + +{% block title %}{{ show_year }}{% endblock title %} + +{% block canonical_url %}{% url 'year' year=show_year %}{% endblock canonical_url %} + +{% block content %} +++ {% endfor %} +{% translate "Albummet" %} '{{ album.title }}' {% translate "har ingen billeder endnu." %}
+++{% endblock content%} diff --git a/gallery/templates/image.html b/gallery/templates/image.html new file mode 100644 index 0000000..2e853cb --- /dev/null +++ b/gallery/templates/image.html @@ -0,0 +1,129 @@ +{% extends 'base.html' %} +{% load static %} +{% load i18n %} + +{% load bootstrap5 bootstrap_icons %} + +{% block title %}{{ album.title }}{% endblock title %} +{% block navbar_class %}navbar-static-top{% endblock navbar_class %} + +{% block extrahead %} + + + {% if edit_visibility %} + + + {% endif %} +{% endblock %} + +{% block canonical_url %}{% url 'image' year=album.year album_slug=album.slug image_slug=start_file.slug %}{% endblock canonical_url %} + +{% block opengraph %} + + + +{% endblock opengraph %} + +{% block content %} +{% if edit_visibility %} +{% endif %} + ++ {% for year in years %} ++++ {% empty %} ++++ + {{ year }} + + {% if user.is_staff %} + + {% translate "Edit" %} + + {% endif %} +
++ {% if year == show_year %} ++++ {% endif %} ++++ {% for album, firstFile in albumSets %} + {% ifchanged album.eventalbum %}{% if not album.eventalbum %} ++++
+{% translate "Årets gang" %}:
++ {% endif %}{% endifchanged %} + + {% endfor %} ++++ {% endfor %} ++ {% translate "Ingen albums med billeder fundet." %} +
+++{% endblock content %} diff --git a/gallery/tests.py b/gallery/tests.py new file mode 100644 index 0000000..dddcb3e --- /dev/null +++ b/gallery/tests.py @@ -0,0 +1,100 @@ +import tempfile + +from django.core.exceptions import ValidationError +from django.core.files.base import ContentFile +from django.test import TestCase, override_settings +from django.urls import reverse +from PIL import Image as PILImage + +from gallery import views +from gallery.models import Album, Image + + +class SimpleAlbumTest(TestCase): + def test_empty_album(self): + self.assertFalse(Album.objects.exists()) + instance = Album.objects.create(title="Album Title", slug="album-title") + instance.full_clean() + self.assertTrue(Album.objects.exists()) + + +@override_settings(MEDIA_ROOT=tempfile.gettempdir()) +class SimpleMediaTest(TestCase): + def setUp(self): + album = Album.objects.create(title="Album Title", slug="album-title") + album.full_clean() + + def generate_image(self, suffix): + album = Album.objects.all()[0] + + temp_file = tempfile.NamedTemporaryFile(suffix=suffix) + PILImage.new("RGB", (100, 100)).save(temp_file) + + Image(file=temp_file.name, album=album).save() + + try: + Image.objects.all()[0].file.crop["200x200"] + except ValidationError: + self.fail( + "VersatileImageField Raised ValidationError on a good %s image" % suffix + ) + self.assertEqual(len(Image.objects.all()), 1) + self.assertIsInstance(album.basemedia.select_subclasses()[0], Image) + + def test_simple_jpg_album(self): + self.generate_image(".jpg") + + def test_simple_png_album(self): + self.generate_image(".png") + + def test_simple_gif_album(self): + self.generate_image(".gif") + + +@override_settings(MEDIA_ROOT=tempfile.gettempdir()) +class CorruptedMediaTest(TestCase): + def setUp(self): + album = Album.objects.create( + title="Corrupt Album Title", slug="corrupt-album-title" + ) + album.full_clean() + + def test_truncated_jpg_album(self): + album = Album.objects.all()[0] + + temp_file = tempfile.NamedTemporaryFile(suffix=".jpg") + PILImage.new("RGB", (100, 100)).save(temp_file, "jpeg") + temp_file.truncate(800) + + instance = Image(file=temp_file.name, album=album) + instance.full_clean() + with self.assertLogs(level="ERROR"): + with self.assertRaises(ValidationError): + instance.save() + + self.assertEqual(len(Image.objects.all()), 0) + + +class GalleryViewTest(TestCase): + def setUp(self): + super().setUp() + self.album = Album.objects.create(year=2018, title="Test", slug="test") + # Create two images + self.create_image("image1") + self.create_image("image2") + + def create_image(self, slug): + with tempfile.NamedTemporaryFile(suffix=".png") as im: + PILImage.new("RGB", (100, 100)).save(im) + im.seek(0) + contents = ContentFile(im.read(), "im.png") + image = Image( + file=contents, album=self.album, slug=slug, visibility=Image.PUBLIC + ) + image.full_clean() + image.save() + return image + + def test_album_count(self): + response = self.client.get(reverse("gallery_index")) + self.assertEqual(1, len(list(response.context["albumSets"]))) diff --git a/gallery/urls.py b/gallery/urls.py new file mode 100644 index 0000000..f3f6fcf --- /dev/null +++ b/gallery/urls.py @@ -0,0 +1,24 @@ +from django.conf.urls import url +from django.urls import path, re_path + +import gallery.views as views + +urlpatterns = [ + # Gallery overview + path("", views.gallery, name="gallery_index"), + re_path(r"^(?P+ {% for file, next_file, prev_file in file_orders %} ++{{ file.caption }}
+ {% endfor %} +\d+)$", views.gallery, name="year"), + # Album overview + re_path(r"^(?P \d+)/(?P [^/]+)$", views.album, name="album"), + # Single images + re_path( + r"^(?P \d+)/(?P [^/]+)/(?P [^/]+)$", + views.image, + name="image", + ), + # Bulk-update BaseMedia.visibility + re_path(r"^set_visibility/$", views.set_visibility, name="set_image_visibility"), + # JFU upload + re_path(r"^upload/", views.upload, name="jfu_upload"), + # RSS feed + re_path(r"^album\.rss$", views.AlbumFeed(), name="album_rss"), +] diff --git a/gallery/utils.py b/gallery/utils.py new file mode 100644 index 0000000..33fba01 --- /dev/null +++ b/gallery/utils.py @@ -0,0 +1,97 @@ +import logging +import os +from datetime import datetime + +from constance import config +from django.utils.text import slugify as dslugify +from django.utils.timezone import get_current_timezone +from PIL import Image as PilImage +from PIL.ExifTags import TAGS +from unidecode import unidecode + +logger = logging.getLogger(__name__) + + +def slugify(string): + return dslugify(unidecode(string)) + + +def file_name(instance, path): + filename = os.path.basename(path) + sepFilename = os.path.splitext(filename) + newFilename = slugify(sepFilename[0]) + sepFilename[1] + year = str(instance.album.year) + album_slug = instance.album.slug + + return "/".join([year, album_slug, newFilename]) + + +def get_year(): + year = datetime.now().year + return year + + +def get_exif_date(filename): + logger.debug("get_exif_date: called with filename: %s" % filename) + try: + image = PilImage.open(filename) + info = image._getexif() + if info is not None: + exif = {} + for tag, value in info.items(): + decoded = TAGS.get(tag, tag) + exif[decoded] = value + + for t in ["Original", "Digitized", ""]: + """ + Check the exif fields DateTimeOriginal, DateTimeDigitized and + DateTime in that order. Return when the first is found. + """ + if "DateTime" + t in exif: + s = exif["DateTime" + t] + if type(s) is tuple: + s = str(s[0]) + logger.debug( + "get_exif_date: found EXIF field DateTime%s. Parsed it as %s", + t, + s, + ) + + if "SubsecTime" + t in exif: + ms = exif["SubsecTime" + t] + if type(ms) is tuple: + ms = str(ms[0]) + logger.debug( + "get_exif_date: found EXIF field SubsecTime. Parsed it as %s", + ms, + ) + else: + ms = "0" + + s += "." + ms + + if any(str(n) in s for n in range(1, 10)): + dt = datetime.strptime(s, "%Y:%m:%d %H:%M:%S.%f") + dt = dt.replace(tzinfo=get_current_timezone()) + + return dt + + logger.debug( + "get_exif_date: the DateTime%s field only contained zeros. Trying next field", + t, + ) + + except AttributeError as e: + logger.info( + "get_exif_date: could not get exif data. This file is properly not a jpg or tif. Returning None" + ) + return None + + except Exception as e: + logger.warning( + "get_exif_date: An exception occurred in this slightly volatile function.", + exc_info=True, + ) + + logger.info("get_exif_date: could not get exif date. Returning None") + return None diff --git a/gallery/views.py b/gallery/views.py new file mode 100644 index 0000000..be2231e --- /dev/null +++ b/gallery/views.py @@ -0,0 +1,267 @@ +import os +from datetime import datetime + +from django.contrib.auth.decorators import permission_required +from django.contrib.syndication.views import Feed +from django.core.exceptions import ValidationError +from django.db.models import Count +from django.http import ( + Http404, + HttpResponse, + HttpResponseBadRequest, + HttpResponseRedirect, +) +from django.shortcuts import get_object_or_404, redirect, render +from django.urls import reverse +from django.utils.translation import gettext_lazy as _ +from django.views.decorators.http import require_POST +from jfu.http import JFUResponse, UploadResponse, upload_receive + +from gallery.forms import EditVisibilityForm +from gallery.models import Album, BaseMedia, GenericFile, Image + +GALLERY_PERMISSION = "gallery.change_image" + + +def get_basemedia_count_by_album(): + """ + Return C such that:: + + C[v][i] == BaseMedia.objects.filter(visibility=v, album_id=i).count() + """ + + qs = BaseMedia.objects.all() + qs = qs.order_by().values("album_id", "visibility") + qs = qs.annotate(count=Count("id")) + by_visibility = {} + for record in qs: + by_album = by_visibility.setdefault(record["visibility"], {}) + by_album[record["album_id"]] = record["count"] + return by_visibility + + +def gallery(request, **kwargs): + count_by_visibility = get_basemedia_count_by_album() + public_count = count_by_visibility.get(BaseMedia.PUBLIC, {}) + new_count = count_by_visibility.get(BaseMedia.NEW, {}) + edit_visibility = request.user.has_perm(GALLERY_PERMISSION) + + try: + requested_year = int(kwargs["year"]) + except (KeyError, ValueError): + requested_year = None + + albums = list(Album.objects.all()) + for album in albums: + album.count = public_count.get(album.id, 0) + album.new_count = new_count.get(album.id, 0) if edit_visibility else 0 + + # Hide albums with no images + albums = [a for a in albums if a.count + a.new_count > 0] + years = set(a.year for a in albums) + years = sorted(years, reverse=True) + + if requested_year is None: + if years: + show_year = max(years) + else: + show_year = datetime.now().year + else: + show_year = requested_year + + # Hide albums not in show_year + albums = [a for a in albums if a.year == show_year] + + firstImages = BaseMedia.objects.filter(album__in=albums) + firstImages = firstImages.select_subclasses() + firstImages = {fi.album_id: fi for fi in firstImages} + albumSets = [(a, firstImages.get(a.id)) for a in albums] + + context = { + "years": years, + "show_year": show_year, + "albumSets": albumSets, + } + + return render(request, "gallery.html", context) + + +def album(request, year, album_slug): + album = get_object_or_404(Album, year=year, slug=album_slug) + files = album.basemedia.filter(visibility=BaseMedia.PUBLIC).select_subclasses() + context = {"album": album, "files": files} + + edit_visibility = request.user.has_perm(GALLERY_PERMISSION) + new_file = album.basemedia.filter(visibility=BaseMedia.NEW).first() + if edit_visibility and new_file: + if request.POST.get("set_all_new_visible"): + qs = album.basemedia.filter(visibility=BaseMedia.NEW) + qs.update(visibility=BaseMedia.PUBLIC) + + return redirect("album", year=year, album_slug=album_slug) + + kwargs = dict(year=album.year, album_slug=album.slug, image_slug=new_file.slug) + context["edit_visibility_link"] = reverse("image", kwargs=kwargs) + "?v=1" + + qs = album.basemedia.all().order_by() + qs_visibility = qs.values_list("visibility") + visibility_counts = dict(qs_visibility.annotate(count=Count("pk"))) + c_public = visibility_counts.pop(BaseMedia.PUBLIC, 0) + c_discarded = visibility_counts.pop(BaseMedia.DISCARDED, 0) + c_sensitive = visibility_counts.pop(BaseMedia.SENSITIVE, 0) + c_delete = visibility_counts.pop(BaseMedia.DELETE, 0) + c_new = visibility_counts.pop(BaseMedia.NEW, 0) + if visibility_counts: + raise ValueError(visibility_counts) + context["visible_count"] = c_public + context["hidden_count"] = c_discarded + c_sensitive + c_delete + c_new + context["new_count"] = c_new + return render(request, "album.html", context) + + +def image(request, year, album_slug, image_slug, **kwargs): + album = get_object_or_404(Album, year=year, slug=album_slug) + + edit_visibility = bool(request.GET.get("v")) and request.user.has_perm( + GALLERY_PERMISSION + ) + + qs = album.basemedia.all() + if not edit_visibility: + qs = qs.filter(visibility=BaseMedia.PUBLIC) + qs = qs.select_subclasses() + # list() will force evaluation of the QuerySet. It is now iterable. + files = list(qs) + start_file = ( + album.basemedia.filter(album=album, slug=image_slug).select_subclasses().first() + ) + if edit_visibility: + form = EditVisibilityForm(files) + for file, (pk, key) in zip(files, form.basemedias): + file.visibility_field = form[key] + + if not start_file: + raise Http404(_("Billedet kan ikke findes")) + + if start_file.notPublic and not edit_visibility: + raise Http404(_("Billedet kan ikke findes")) + + prev_files = files[1:] + files[:1] + next_files = files[-1:] + files[:-1] + file_orders = zip(files, prev_files, next_files) + file_count = len(files) + + context = { + "album": album, + "file_orders": file_orders, + "start_file": start_file, + "file_count": file_count, + "edit_visibility": edit_visibility, + } + return render(request, "image.html", context) + + +@require_POST +@permission_required("gallery.add_image", raise_exception=True) +def upload(request): + file = upload_receive(request) + album = Album.objects.get(id=int(request.POST["object_id"])) + ext = os.path.splitext(file.name)[1].lower() + + if ext in (".png", ".gif", ".jpg", ".jpeg"): + instance = Image(file=file, album=album) + elif ext in (".mp3"): + instance = GenericFile(file=file, album=album) + instance.type = BaseMedia.AUDIO + elif ext in (".mp4"): + instance = GenericFile(file=file, album=album) + instance.type = BaseMedia.VIDEO + else: + instance = GenericFile(file=file, album=album) + instance.type = BaseMedia.OTHER + + try: + instance.full_clean() + instance.save() + except ValidationError as exn: + try: + error = " ".join( + "%s: %s" % (k, v) for k, vs in exn.message_dict.items() for v in vs + ) + except AttributeError: + error = " ".join(exn.messages) + + jfu_msg = { + "name": file.name, + "size": file.size, + "error": error, + } + return UploadResponse(request, jfu_msg) + + jfu_msg = { + "name": os.path.basename(instance.file.path), + "size": file.size, + "url": instance.file.url, + } + return UploadResponse(request, jfu_msg) + + +@require_POST +@permission_required("gallery.delete_image", raise_exception=True) +def upload_delete(request, pk): + success = True + try: + instance = Image.objects.get(pk=pk) + instance.image.delete(save=False) + instance.delete() + except Image.DoesNotExist: + success = False + + return JFUResponse(request, success) + + +@require_POST +@permission_required(GALLERY_PERMISSION, raise_exception=True) +def set_visibility(request): + try: + form = EditVisibilityForm.from_POST(request.POST) + except EditVisibilityForm.Missing as exn: + return HttpResponseBadRequest(str(exn)) + if not form.is_valid(): + return HttpResponseBadRequest(str(form.errors)) + for pk, key in form.basemedias: + initial = form.fields[key].initial + value = form.cleaned_data[key] + if initial != value: + BaseMedia.objects.filter(pk=pk).update(visibility=value) + + albums = list(Album.objects.filter(pk__in=form.album_pks)) + + # Redirect to album + if albums: + album = albums[0] + kwargs = dict(year=album.year, album_slug=album.slug) + return HttpResponseRedirect(reverse("album", kwargs=kwargs)) + else: + return HttpResponse(_("Synlighed på givne billeder er blevet opdateret")) + + +class AlbumFeed(Feed): + title = _("Fredagscaféens billedalbummer") + + def link(self): + return reverse("gallery_index") + + description = _("Feed med nye billedalbummer fra Fredagscaféens begivenheder.") + + def items(self): + nonempties = Album.objects.filter( + basemedia__visibility=BaseMedia.PUBLIC + ).distinct() + return nonempties.order_by("-publish_date") + + def item_title(self, item): + return item.title + + def item_description(self, item): + return item.description diff --git a/locale/da/LC_MESSAGES/django.mo b/locale/da/LC_MESSAGES/django.mo index 0223d0d..dd0aabb 100644 Binary files a/locale/da/LC_MESSAGES/django.mo and b/locale/da/LC_MESSAGES/django.mo differ diff --git a/locale/da/LC_MESSAGES/django.po b/locale/da/LC_MESSAGES/django.po index 8a60c7f..9d85c9d 100644 --- a/locale/da/LC_MESSAGES/django.po +++ b/locale/da/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-03 16:17+0100\n" -"PO-Revision-Date: 2024-10-17 23:46+0200\n" +"POT-Creation-Date: 2024-11-04 15:03+0100\n" +"PO-Revision-Date: 2024-11-04 20:16+0050\n" "Last-Translator: - {% translate "Bestyrelsen" %}
- {% translate "Events" %}
+- {% translate "Gallery" %}
- {% translate "Sortiment" %}
- {% translate "Om baren" %}
- diff --git a/web/urls.py b/web/urls.py index efe6c11..bacd69c 100644 --- a/web/urls.py +++ b/web/urls.py @@ -1,3 +1,4 @@ +from django.conf.urls import include from django.urls import path from django.views.generic.base import RedirectView @@ -53,4 +54,5 @@ path("udlejningProjector/", UdlejningerProjector.as_view()), path("udlejningSpeakers/", UdlejningerSpeakers.as_view()), path("guides/", Guides.as_view(), name="guides"), + path("gallery/", include("gallery.urls")), ]
-
{% for boardmember in period.boardmember_set.all %}
+ {% endif %}
+