diff options
Diffstat (limited to 'program')
| -rw-r--r-- | program/admin.py | 2 | ||||
| -rw-r--r-- | program/migrations/0013_show_and_note_images.py | 29 | ||||
| -rw-r--r-- | program/models.py | 20 | ||||
| -rw-r--r-- | program/templates/v2/show_detail.html | 6 | ||||
| -rw-r--r-- | program/templates/v2/timeslot_detail.html | 4 | ||||
| -rw-r--r-- | program/utils.py | 10 |
6 files changed, 64 insertions, 7 deletions
diff --git a/program/admin.py b/program/admin.py index 16d6973..b186c3e 100644 --- a/program/admin.py +++ b/program/admin.py @@ -154,7 +154,7 @@ class ShowAdmin(admin.ModelAdmin): prepopulated_fields = {'slug': ('name',)} search_fields = ('name', 'short_description', 'description') fields = ( - 'predecessor', 'broadcastformat', 'name', 'slug', 'image', 'image_enabled', 'short_description', 'description', + 'predecessor', 'broadcastformat', 'name', 'slug', 'image', 'short_description', 'description', 'email', 'website', 'hosts', 'owners', 'showinformation', 'showtopic', 'language', 'musicfocus', ) diff --git a/program/migrations/0013_show_and_note_images.py b/program/migrations/0013_show_and_note_images.py new file mode 100644 index 0000000..2cf8d1a --- /dev/null +++ b/program/migrations/0013_show_and_note_images.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models +import program.models + + +class Migration(migrations.Migration): + + dependencies = [ + ('program', '0012_add_language'), + ] + + operations = [ + migrations.RemoveField( + model_name='show', + name='image_enabled', + ), + migrations.AlterField( + model_name='show', + name='image', + field=models.ImageField(upload_to=program.models.show_image_filename, null=True, verbose_name='Image', blank=True), + ), + migrations.AddField( + model_name='note', + name='image', + field=models.ImageField(upload_to=program.models.note_image_filename, null=True, verbose_name='Image', blank=True), + ), + ] diff --git a/program/models.py b/program/models.py index b5123cb..048e51b 100644 --- a/program/models.py +++ b/program/models.py @@ -1,3 +1,4 @@ +import os from django.contrib.auth.models import User from django.core.exceptions import ObjectDoesNotExist, ValidationError, MultipleObjectsReturned from django.core.urlresolvers import reverse @@ -11,7 +12,7 @@ from datetime import date, datetime, time, timedelta from dateutil.relativedelta import relativedelta from dateutil.rrule import rrule -from utils import get_automation_id_choices +from utils import get_automation_id_choices, hash_file class BroadcastFormat(models.Model): @@ -243,6 +244,12 @@ class Host(models.Model): return self.shows.filter(programslots__until__gt=datetime.today).distinct() +def show_image_filename(instance, filename): + instance.image.open() + filename_base, filename_ext = os.path.splitext(filename) + return "shows/%s/%s%s" % (instance.slug, hash_file(instance.image.file), filename_ext) + + class Show(models.Model): predecessor = models.ForeignKey('self', blank=True, null=True, related_name='successors', verbose_name=_("Predecessor")) hosts = models.ManyToManyField(Host, blank=True, related_name='shows', verbose_name=_("Hosts")) @@ -254,8 +261,7 @@ class Show(models.Model): musicfocus = models.ManyToManyField(MusicFocus, blank=True, related_name='shows', verbose_name=_("Music focus")) name = models.CharField(_("Name"), max_length=255) slug = models.CharField(_("Slug"), max_length=255, unique=True) - image = models.ImageField(_("Image"), blank=True, null=True, upload_to='show_images') - image_enabled = models.BooleanField(_("show Image"), default=True) + image = models.ImageField(_("Image"), blank=True, null=True, upload_to=show_image_filename) short_description = models.CharField(_("Short description"), max_length=64) description = tinymce_models.HTMLField(_("Description"), blank=True, null=True) email = models.EmailField(_("E-Mail"), blank=True, null=True) @@ -492,7 +498,14 @@ class TimeSlot(models.Model): return reverse('timeslot-detail', args=[str(self.id)]) +def note_image_filename(instance, filename): + instance.image.open() + filename_base, filename_ext = os.path.splitext(filename) + return "notes/%s/%s%s" % (instance.show.slug, hash_file(instance.image.file), filename_ext) + + class Note(models.Model): + STATUS_CHOICES = ( (0, _("Cancellation")), (1, _("Recommendation")), @@ -500,6 +513,7 @@ class Note(models.Model): ) timeslot = models.OneToOneField(TimeSlot, verbose_name=_("Time slot")) title = models.CharField(_("Title"), max_length=128) + image = models.ImageField(_("Image"), blank=True, null=True, upload_to=note_image_filename) content = tinymce_models.HTMLField(_("Content")) status = models.IntegerField(_("Status"), choices=STATUS_CHOICES, default=1) start = models.DateTimeField(editable=False) diff --git a/program/templates/v2/show_detail.html b/program/templates/v2/show_detail.html index 55f7f3b..7b2e07e 100644 --- a/program/templates/v2/show_detail.html +++ b/program/templates/v2/show_detail.html @@ -43,8 +43,8 @@ <div id="description">{{ show.description|safe }}</div> {% endif %} -{% if show.image and show.image_enabled %} - <div id="image" style="float: right;"><img src="/program/static/{{ show.image }}" width="200" alt="image"></div> +{% if show.image %} + <div id="image"><img src="https://images.helsinki.at/program/{{ show.image }}"></div> {% endif %} <p> @@ -69,7 +69,7 @@ <div class="title">{{ note.title }}</div> </li> {% endfor %} -{% if show.predecessor and show.predecessor.notes.all %} +{% if show.predecessor and show.predecessor.notes.all %}p {% if show.name != show.predecessor.name %} <h3>Davor als <a href="/program/shows/{{ show.predecessor.slug }}">{{ show.predecessor.name }}</a></h3> {% endif %} diff --git a/program/templates/v2/timeslot_detail.html b/program/templates/v2/timeslot_detail.html index ab3b429..f1e65b4 100644 --- a/program/templates/v2/timeslot_detail.html +++ b/program/templates/v2/timeslot_detail.html @@ -32,6 +32,10 @@ {% if timeslot.note %} <div class="timeslot-note">{{ timeslot.note.content|safe }}</div> + +{% if timeslot.note.image %} + <div id="timeslot-note-image"><img src="https://images.helsinki.at/notes/{{ timeslot.note.image }}"></div> +{% endif %} {% endif %} </div> diff --git a/program/utils.py b/program/utils.py index 1a81766..3bfecc4 100644 --- a/program/utils.py +++ b/program/utils.py @@ -3,8 +3,10 @@ from django.conf import settings import json import urllib import bisect +import hashlib from os.path import join from datetime import datetime, date, timedelta +from functools import partial def get_automation_id_choices(): @@ -56,3 +58,11 @@ def tofirstdayinisoweek(year, week): if date(year, 1, 4).isoweekday() > 4: ret -= timedelta(days=7) return ret + + +def hash_file(file, block_size=65536): + hasher = hashlib.sha256() + for buf in iter(partial(file.read, block_size), b''): + hasher.update(buf) + + return hasher.hexdigest() |