nyymix/muistox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add upload form and update Photo model

Browse source
This commit is contained in:
Nyymix 2025-02-24 20:23:07 +02:00
parent c43f3612e3
commit 555c6c0d89
5 changed files with 211 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
gallery/admin.py
View file

@ -1,4 +1,7 @@
from django.contrib import admin
from django.http import JsonResponse
from django.shortcuts import get_object_or_404, render
from django.urls import path, reverse
from django.utils.html import format_html
from imagekit import ImageSpec
from imagekit.admin import AdminThumbnail
@ -15,21 +18,23 @@ class AdminThumbnailSpec(ImageSpec):
def cached_admin_thumb(instance):
cached = ImageCacheFile(AdminThumbnailSpec(instance.photo))
cached.generate()
return cached
if instance.photo:
cached = ImageCacheFile(AdminThumbnailSpec(instance.photo))
cached.generate()
return cached
return None
class RedirAdmin(admin.ModelAdmin):
list_display = ('path', 'album', 'test_url')
search_fields = ('path',)
ordering = ('path',)
list_per_page = 10
list_per_page = 30
list_editable = ('album',)
def formfield_for_foreignkey(self, db_field, request, **kwargs):
if db_field.name == "album":
kwargs["queryset"] = Album.objects.all().order_by('name') # Järjestä albumit aakkosjärjestykseen
kwargs["queryset"] = Album.objects.all().order_by('name')
return super().formfield_for_foreignkey(db_field, request, **kwargs)
def test_url(self, obj):
@ -57,12 +62,50 @@ class LocationAdmin(admin.ModelAdmin):
class AlbumAdmin(admin.ModelAdmin):
prepopulated_fields = {'slug': ('name',)}
list_display = ('name', 'location', 'album_date', 'is_public', 'thumbnail', )
list_display = ('name', 'location', 'album_date', 'is_public', 'upload_link', 'thumbnail')
search_fields = ('name',)
ordering = ('-album_date',)
list_per_page = 20
list_editable = ('is_public',)
readonly_fields = ['cover_preview'] # Lisätään esikatselukuva readonly_fieldsiin
readonly_fields = ['cover_preview']
change_form_template = "admin/gallery/album/change_form.html"
def get_urls(self):
urls = super().get_urls()
custom_urls = [
path('<int:album_id>/upload/', self.admin_site.admin_view(self.upload_photos), name="gallery_album_upload"),
]
return custom_urls + urls
def upload_photos(self, request, album_id, *args, **kwargs):
"""Käsittelee valokuvien lataamisen albumiin."""
album = get_object_or_404(Album, id=album_id)
if request.method == 'POST' and request.FILES:
uploaded_files = request.FILES.getlist('photo')
for file in uploaded_files:
Photo.objects.create(album=album, photo=file)
return JsonResponse({"message": "Photos uploaded successfully!"})
return render(request, 'admin/upload_photos.html', {'album': album})
def upload_link(self, obj):
"""Lisää 'Upload Photos' -painikkeen albumin muokkaussivulle"""
if obj.id:
url = reverse("admin:gallery_album_upload", kwargs={"album_id": obj.id})
return format_html('<a href="{}" class="button">Upload Photos</a>', url)
return "-"
upload_link.short_description = "Upload Photos"
def thumbnail(self, obj):
if obj.cover and obj.cover.photo:
return format_html(
'<img src="{}" style="width: 50px; height: auto;"/>',
obj.cover.photo.url,
)
return "-"
thumbnail.short_description = "Thumbnail"
def cover_preview(self, obj):
if obj.cover and obj.cover.photo:
@ -81,21 +124,12 @@ class AlbumAdmin(admin.ModelAdmin):
return super().formfield_for_foreignkey(db_field, request, **kwargs)
def thumbnail(self, obj):
if obj.cover and obj.cover.photo:
return format_html(
'<img src="{}" style="width: 50px; height: auto;"/>',
obj.cover.photo.url,
)
return "-"
thumbnail.short_description = "Thumbnail"
class PhotoAdmin(admin.ModelAdmin):
list_display = ('slug', 'album', 'is_favorite', 'admin_thumbnail',)
list_display = ('slug', 'album', 'is_favorite', 'admin_thumbnail')
list_display_links = ('slug',)
search_fields = ('slug', 'photo',)
readonly_fields = ['slug', 'taken_at', 'height', 'width', 'exif', ]
search_fields = ('slug', 'photo')
readonly_fields = ['slug', 'taken_at', 'height', 'width', 'exif']
admin_thumbnail = AdminThumbnail(image_field=cached_admin_thumb)
list_filter = ('album',)
list_per_page = 30

7
gallery/migrations/0001_initial.py
View file

@ -1,4 +1,4 @@
# Generated by Django 5.1.4 on 2025-01-20 19:09
# Generated by Django 5.1.4 on 2025-02-23 15:54
import datetime
import django.db.models.deletion
@ -33,7 +33,8 @@ class Migration(migrations.Migration):
],
options={
'verbose_name_plural': 'Locations',
'unique_together': {('city', 'place')},
'ordering': ['city'],
'unique_together': {('place', 'city')},
},
),
migrations.CreateModel(
@ -56,7 +57,7 @@ class Migration(migrations.Migration):
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('slug', models.CharField(editable=False, max_length=15, verbose_name='Photo Slug')),
('photo', models.ImageField(height_field='height', upload_to=gallery.models.photo.Photo._get_upload_path, verbose_name='Photo', width_field='width')),
('photo', models.ImageField(height_field='height', upload_to=gallery.models.photo.get_upload_path, verbose_name='Photo', width_field='width')),
('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, editable=False, null=True, verbose_name='Taken at')),

49
gallery/models/photo.py
View file

@ -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):

7
gallery/templates/admin/gallery/album/change_form.html Normal file
View file

@ -0,0 +1,7 @@
{% extends "admin/change_form.html" %}
{% block object-tools-items %}
{{ block.super }}
<li>
<a href="{% url 'admin:gallery_album_upload' album_id=original.id %}" class="button">Upload Photos</a>
</li>
{% endblock %}

114
gallery/templates/admin/upload_photos.html Normal file
View file

@ -0,0 +1,114 @@
{% extends "admin/base_site.html" %}
{% block content %}
<div class="container mt-3">
<h1>Upload Photos to {{ album.name }}</h1>
<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/uikit/dist/css/uikit.min.css" />
<script src="https://cdn.jsdelivr.net/npm/uikit/dist/js/uikit.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/uikit/dist/js/uikit-icons.min.js"></script>
<form id="upload-form" method="post" enctype="multipart/form-data">
{% csrf_token %}
<div class="uk-margin">
<div id="js-drop" class="uk-placeholder uk-text-center uk-margin-medium-top">
<span uk-icon="icon: cloud-upload"></span>
<span class="uk-text-middle">Drag files here or</span>
<div uk-form-custom>
<input id="file-input" type="file" name="photo" multiple accept=".jpg,.jpeg">
<span class="uk-link">select them</span>
</div>
</div>
<ul id="file-list" class="uk-list uk-list-divider"></ul>
<p>Total size: <span id="total-size">0</span> MB</p>
<progress id="js-progressbar" class="uk-progress" value="0" max="100" hidden></progress>
</div>
<button id="upload-button" class="uk-button uk-button-primary" type="button">Upload</button>
</form>
</div>
<script>
const fileInput = document.getElementById('file-input');
const fileList = document.getElementById('file-list');
const totalSizeElement = document.getElementById('total-size');
const uploadButton = document.getElementById('upload-button');
const progressBar = document.getElementById('js-progressbar');
const dropArea = document.getElementById('js-drop');
let filesToUpload = [];
let totalSize = 0;
function updateFileList(newFiles) {
filesToUpload = [...newFiles].filter(file => file.name.match(/\.jpe?g$/i));
fileList.innerHTML = '';
totalSize = filesToUpload.reduce((acc, file) => acc + file.size, 0);
filesToUpload.forEach(file => {
const listItem = document.createElement('li');
listItem.textContent = `${file.name} (${(file.size / (1024 * 1024)).toFixed(2)} MB)`;
fileList.appendChild(listItem);
});
totalSizeElement.textContent = (totalSize / (1024 * 1024)).toFixed(2);
}
fileInput.addEventListener('change', event => updateFileList(event.target.files));
['dragenter', 'dragover'].forEach(eventName => dropArea.addEventListener(eventName, e => {
e.preventDefault();
dropArea.classList.add('uk-active');
}));
['dragleave', 'drop'].forEach(eventName => dropArea.addEventListener(eventName, e => {
e.preventDefault();
dropArea.classList.remove('uk-active');
}));
dropArea.addEventListener('drop', event => {
updateFileList(event.dataTransfer.files);
});
uploadButton.addEventListener('click', () => {
if (filesToUpload.length === 0) {
alert('Please select files to upload.');
return;
}
progressBar.hidden = false;
let uploaded = 0;
filesToUpload.forEach((file, index) => {
const xhr = new XMLHttpRequest();
const formData = new FormData();
formData.append('photo', file);
formData.append('csrfmiddlewaretoken', '{{ csrf_token }}');
xhr.open('POST', '', true);
xhr.upload.onprogress = event => {
if (event.lengthComputable) {
progressBar.value = ((uploaded + event.loaded) / totalSize) * 100;
}
};
xhr.onload = () => {
const listItem = fileList.children[index];
if (xhr.status === 200) {
listItem.textContent += ' - Upload successful!';
listItem.classList.add('uk-text-success');
} else {
listItem.textContent += ' - Upload failed!';
listItem.classList.add('uk-text-danger');
}
uploaded += file.size;
};
xhr.onerror = () => {
fileList.children[index].textContent += ' - Upload failed!';
fileList.children[index].classList.add('uk-text-danger');
};
xhr.send(formData);
});
});
</script>
{% endblock %}