From 9138bffd199c9f3249e1aa55f142587b79052bb1 Mon Sep 17 00:00:00 2001 From: yomguy Date: Thu, 24 Mar 2011 12:03:14 +0100 Subject: [PATCH] delete item data files after nex uploading, get translation in webview, cleanup --- telemeta/cache.py | 6 ++++++ telemeta/locale/fr/LC_MESSAGES/django.mo | Bin 10478 -> 10520 bytes telemeta/locale/fr/LC_MESSAGES/django.po | 3 +++ .../telemeta_default/collection_edit.html | 5 ----- .../telemeta_default/mediaitem_add.html | 4 +--- .../telemeta_default/mediaitem_copy.html | 2 -- .../telemeta_default/mediaitem_edit.html | 8 +++----- telemeta/web/base.py | 12 ++++++++---- 8 files changed, 21 insertions(+), 19 deletions(-) diff --git a/telemeta/cache.py b/telemeta/cache.py index 2f879e98..a0b548ea 100644 --- a/telemeta/cache.py +++ b/telemeta/cache.py @@ -58,6 +58,12 @@ class TelemetaCache(object): self.files = self.get_files() return file in self.files + def delete_item_data(self, public_id): + # public_id is the public_id of an item + for file in self.get_files(): + if public_id in file: + os.remove(self.dir + os.sep + file) + def write_bin(self, data, file): path = self.dir + os.sep + file f = open(path, 'w') diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo index 37b393a73d76c61f5c33eefed4644817a4aa0b01..9c9544b9a7115fbc8f90e6dcf0ec03f9d9dfd720 100644 GIT binary patch delta 4155 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 - --> {% trans "Cancel" %} {% endblock %} @@ -22,9 +20,6 @@ {% endfor %}
- {% trans "Cancel" %} {% trans "Save" %} diff --git a/telemeta/templates/telemeta_default/mediaitem_add.html b/telemeta/templates/telemeta_default/mediaitem_add.html index d6ce6dac..04fae8d3 100644 --- a/telemeta/templates/telemeta_default/mediaitem_add.html +++ b/telemeta/templates/telemeta_default/mediaitem_add.html @@ -10,9 +10,7 @@
{% if perms.telemeta.add_mediaitem %} {% block tools %} - - {% trans "Cancel" %} {% endblock tools %} diff --git a/telemeta/templates/telemeta_default/mediaitem_copy.html b/telemeta/templates/telemeta_default/mediaitem_copy.html index b97add5d..21ef9b5e 100644 --- a/telemeta/templates/telemeta_default/mediaitem_copy.html +++ b/telemeta/templates/telemeta_default/mediaitem_copy.html @@ -11,8 +11,6 @@
{% if user.is_authenticated and perms.telemeta.add_mediaitem %} {% block tools %} - {% trans "Cancel" %} {% endblock tools %} {% endif %} diff --git a/telemeta/templates/telemeta_default/mediaitem_edit.html b/telemeta/templates/telemeta_default/mediaitem_edit.html index a07be4d0..2cdd9402 100644 --- a/telemeta/templates/telemeta_default/mediaitem_edit.html +++ b/telemeta/templates/telemeta_default/mediaitem_edit.html @@ -2,11 +2,9 @@ {% load i18n %} {% load telemeta_utils %} - {% block tools %} - - {% trans "Cancel" %} - {% endblock tools %} + {% block tools %} + {% trans "Cancel" %} + {% endblock tools %} {% block infos %}
diff --git a/telemeta/web/base.py b/telemeta/web/base.py index 2884b6cb..9e309356 100644 --- a/telemeta/web/base.py +++ b/telemeta/web/base.py @@ -56,6 +56,7 @@ from django.contrib.auth.decorators import login_required, permission_required from django.core.context_processors import csrf from django.forms.models import modelformset_factory from django.contrib.auth.models import User +from django.utils.translation import ugettext from telemeta.models import * import telemeta.models @@ -276,8 +277,10 @@ class WebView(object): form = MediaItemForm(request.POST, request.FILES, instance=item) if form.is_valid(): form.save() + if request.FILES: + self.cache.delete_item_data(form.cleaned_data['code']) item.set_revision(request.user) - return HttpResponseRedirect('/items/'+public_id) + return HttpResponseRedirect('/items/'+form.cleaned_data['code']) else: form = MediaItemForm(instance=item) @@ -346,7 +349,8 @@ class WebView(object): pipe.run() mime_type = decoder.format() analyzers.append({'name': 'Mime type', 'id': 'mime_type', 'unit': '', 'value': mime_type}) - + analyzers.append({'name': 'Channels', 'id': 'channels', 'unit': '', 'value': decoder.channels()}) + for analyzer in analyzers_sub: value = analyzer.result() if analyzer.id() == 'duration': @@ -354,7 +358,7 @@ class WebView(object): item.approx_duration = approx_value item.save() value = datetime.timedelta(0,value) - + analyzers.append({'name':analyzer.name(), 'id':analyzer.id(), 'unit':analyzer.unit(), @@ -948,5 +952,5 @@ class WebView(object): return response def not_allowed(self, request): - messages.error(request, 'Not allowed') + messages.error(request, ugettext('Not allowed')) return render(request, 'telemeta/messages.html') -- 2.39.5