Add upload form and update Photo model

gallery/models/photo.py

@@ -10,23 +10,21 @@ from gallery.exif import Exif
 from gallery.models import Album
 
 
+def get_upload_path(instance, filename):
+    """Määrittää lopullisen tallennuspolun heti kuvan tallennusvaiheessa."""
+    return os.path.join('albums', str(instance.album.slug), filename)
+
+
 class Photo(models.Model):
-
-    def _get_upload_path(instance, filename):
-        return os.path.join('albums', str(instance.album.slug), filename)
-
-    def _generate_unique_slug(self, datetime_taken=datetime.now()):
-        slug = int(datetime_taken.strftime('%y%m%d%H%M%S'))
-        while Photo.objects.filter(album=self.album, slug=slug).exists():
-            slug += 1
-        return str(slug)
-
     album = models.ForeignKey(Album, on_delete=models.CASCADE, related_name='photos', verbose_name="Album")
     slug = models.CharField(max_length=15, editable=False, verbose_name="Photo Slug")
-    photo = models.ImageField(upload_to=_get_upload_path, height_field='height', width_field='width', verbose_name="Photo")
+    photo = models.ImageField(upload_to=get_upload_path, height_field='height', width_field='width', verbose_name="Photo")
+
+    # Thumbnail-versiot
     photo_sm = ImageSpecField(source='photo', processors=[ResizeToFit(320, 320)], format='JPEG', options={'quality': 70})
     photo_md = ImageSpecField(source='photo', processors=[ResizeToFit(720, 720)], format='JPEG', options={'quality': 80})
     photo_bg = ImageSpecField(source='photo', processors=[ResizeToFit(1920, 1920)], format='JPEG', options={'quality': 90})
+
     width = models.PositiveIntegerField(default=0, editable=False, verbose_name="Photo Width")
     height = models.PositiveIntegerField(default=0, editable=False, verbose_name="Photo Height")
     taken_at = models.DateTimeField(blank=True, null=True, editable=False, verbose_name="Taken at")
@@ -39,6 +37,14 @@ class Photo(models.Model):
     def orientation(self):
         return "Portrait" if self.height > self.width else "Landscape"
 
+    @staticmethod
+    def generate_unique_slug(album, datetime_taken):
+        """Luo yksilöllisen slug-arvon tiedostolle albumin sisällä."""
+        slug = int(datetime_taken.strftime('%y%m%d%H%M%S'))
+        while Photo.objects.filter(album=album, slug=str(slug)).exists():
+            slug += 1
+        return str(slug)
+
     def add_like(self):
         self.likes += 1
         self.save()
@@ -53,12 +59,23 @@ class Photo(models.Model):
     def get_prev(self):
         return self.__class__.objects.filter(taken_at__lt=self.taken_at, album=self.album.id).order_by('-taken_at').first()
 
+    def extract_metadata(self):
+        """Lukee Exif-metadatan ja asettaa tiedot ennen kuvan tallennusta."""
+        if self.photo:
+            try:
+                exif_data = Exif(self.photo.file)  # Suoraan muistista, ei tiedostosta
+                self.taken_at = getattr(exif_data, 'datetimeoriginal', datetime.now)()
+                self.exif = getattr(exif_data, 'data', None)
+            except Exception as e:
+                print(f"Exif-tiedon lukeminen epäonnistui: {e}")
+                self.taken_at = datetime.now()
+
     def save(self, *args, **kwargs):
-        self.exif_data = Exif(self.photo.path)
-        datetime_taken = getattr(self.exif_data, 'datetimeoriginal', datetime.now)()
-        self.slug = self.slug or self._generate_unique_slug(datetime_taken)
-        self.taken_at = self.taken_at or datetime_taken
-        self.exif = getattr(self.exif_data, 'data', None)
+        """Ennen tallennusta luetaan Exif ja asetetaan slug."""
+        if not self.slug:
+            self.extract_metadata()
+            self.slug = self.generate_unique_slug(self.album, self.taken_at or datetime.now())
+
         super().save(*args, **kwargs)
 
     def get_absolute_url(self):