delete item data files after nex uploading, get translation in webview, cleanup

diff --git a/telemeta/cache.py b/telemeta/cache.py
index 2f879e98b4ed415eadfc080b29e9d526985c0f40..a0b548eac6721af9a54e5f19d1dafd1769eb585b 100644 (file)
--- 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 (file)
Binary files a/telemeta/locale/fr/LC_MESSAGES/django.mo and b/telemeta/locale/fr/LC_MESSAGES/django.mo differ

diff --git a/telemeta/locale/fr/LC_MESSAGES/django.po b/telemeta/locale/fr/LC_MESSAGES/django.po
index 6b2935b61e0c203e4ff1b0e72e70ef52ae00e484..e736ada35f58a0734c20f6dc1a991bb49fd12de4 100644 (file)
--- a/telemeta/locale/fr/LC_MESSAGES/django.po
+++ b/telemeta/locale/fr/LC_MESSAGES/django.po
@@ -833,3 +833,6 @@ msgstr "Administration générale"
 msgid "Enumerations"
 msgstr "Énumérations"
 
+#: web.base.py:955
+msgid "Not allowed"
+msgstr "Non autorisé"

diff --git a/telemeta/templates/telemeta_default/collection_edit.html b/telemeta/templates/telemeta_default/collection_edit.html
index a619de96d1fc98f7e2cd360c405c42708b21f115..4a6241e4addddd2b0e19478dae8cfb46aaa37a50 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_edit.html
+++ b/telemeta/templates/telemeta_default/collection_edit.html
@@ -3,8 +3,6 @@
 {% load telemeta_utils %}
 
 {% block tools %}
-<!--    <a href="{% url telemeta-collection-detail collection.public_id %}">
-     <img src="images/edit_cancel.png" style="vertical-align:middle" /></a>-->
      <a href="{% url telemeta-collection-detail collection.public_id %}" class="mediaitem_button mediaitem_button_cancel">{% trans "Cancel" %}</a>
 {% endblock %}
 
@@ -22,9 +20,6 @@
        {% endfor %}
        </table>
         <div align="center">
-<!--         <a href="{% url telemeta-collection-detail collection.public_id %}">
-          <img src="images/edit_cancel.png" style="vertical-align:middle" /></a>
-         <input type="image" src="images/save_changes.png" style="vertical-align:middle" value="save"/>-->
          <a href="{% url telemeta-collection-detail collection.public_id %}" class="mediaitem_button mediaitem_button_cancel">{% trans "Cancel" %}</a>
          <a href="#" class="mediaitem_button mediaitem_button_save"
    onclick="document.getElementById('_editCollectionForm').submit(); return false;">{% trans "Save" %}</a>

diff --git a/telemeta/templates/telemeta_default/mediaitem_add.html b/telemeta/templates/telemeta_default/mediaitem_add.html
index d6ce6dac5367be00a370f43ec781e54a582c30fe..04fae8d34db3e7469925cd77d7e07db47cb3215b 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_add.html
+++ b/telemeta/templates/telemeta_default/mediaitem_add.html
@@ -10,9 +10,7 @@
 <div>
     {% if perms.telemeta.add_mediaitem %}
     {% block tools %}
-<!--     <a href="{% url telemeta-item-detail item.public_id %}">
-         <img src="images/edit_cancel.png" /></a>-->
- <a href="{% url telemeta-items %}"
+      <a href="{% url telemeta-items %}"
            class="roundBorder6 mediaitem_button mediaitem_button_cancel">{% trans "Cancel" %}</a>
     {% endblock tools %}
     

diff --git a/telemeta/templates/telemeta_default/mediaitem_copy.html b/telemeta/templates/telemeta_default/mediaitem_copy.html
index b97add5dd782fbef56d12607ccd543390ae00ac8..21ef9b5e4f3a136299ef2b81cd663eb14d444651 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_copy.html
+++ b/telemeta/templates/telemeta_default/mediaitem_copy.html
@@ -11,8 +11,6 @@
 <div>
     {% if user.is_authenticated and perms.telemeta.add_mediaitem %}
     {% block tools %}
-<!--     <a href="{% url telemeta-item-detail item.public_id %}">
-     <img src="images/edit_cancel.png" /></a>-->
     <a href="{% url telemeta-item-detail item.public_id %}" class="mediaitem_button mediaitem_button_cancel">{% trans "Cancel" %}</a>
     {% endblock tools %}
     {% endif %}

diff --git a/telemeta/templates/telemeta_default/mediaitem_edit.html b/telemeta/templates/telemeta_default/mediaitem_edit.html
index a07be4d0dd4d2da021b17afd1758b265848bd035..2cdd940256ce6ee12bbf5f3bc6476181775033f3 100644 (file)
--- 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 %}
-<!--     <a href="{% url telemeta-item-detail item.public_id %}">
-         <img src="images/edit_cancel.png" /></a>-->
- <a href="{% url telemeta-item-detail item.public_id %}" class="mediaitem_button mediaitem_button_cancel">{% trans "Cancel" %}</a>
-    {% endblock tools %}
+  {% block tools %}
+   <a href="{% url telemeta-item-detail item.public_id %}" class="mediaitem_button mediaitem_button_cancel">{% trans "Cancel" %}</a>
+  {% endblock tools %}
 
   {% block infos %}    
     <div class="infos">

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 2884b6cbfd8ab1a40e65f69b65d25fa87844ddf6..9e3093566dbf96bb2e1c5a56ed0c500f668e8eef 100644 (file)
--- 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')