Changes in / [35f7009:f95dd85]

Files:

• INSTALL (modified) (1 diff)
• telemeta/admin.py (modified) (1 diff)
• telemeta/templates/telemeta_default/login.html (modified) (1 diff)
• telemeta/web/base.py (modified) (5 diffs)

INSTALL

@@ -115 +115 @@
 
     ADMINS =            telemeta requires that you indicate an administrator here
-    DATABASES =         your database setting dict (don't forget to create the database if needed)
+    DATABASE_* =        your database settings (don't forget to create the database if needed)
     MEDIA_ROOT =        absolute path to the media directory you just created
     INSTALLED_APPS =    add 'telemeta' to the tuple
     
 Add the following variables:
-    
-    TEMPLATE_CONTEXT_PROCESSORS = (
-        'django.core.context_processors.request',
-        'django.core.context_processors.auth',)
 
     TELEMETA_ORGANIZATION =  name of the organization which hosts this installation

telemeta/admin.py

@@ -1 +1 @@
 from telemeta.models.media import MediaCollection, MediaItem
-from telemeta.models.system import User
 from django.contrib import admin
 
 admin.site.register(MediaCollection)
 admin.site.register(MediaItem)
-admin.site.register(User)
 

telemeta/templates/telemeta_default/login.html

@@ -9 +9 @@
 {% endif %}
 
-<form class="login" method="post" action="{% url telemeta-login %}">{% csrf_token %}
+<form class="login" method="post" action="{% url telemeta-login %}">
 <p>
 {{ form.username.label_tag }}

telemeta/web/base.py

@@ -48 +48 @@
 from django.contrib import auth
 from django.contrib.auth.decorators import login_required
-from django.core.context_processors import csrf
 
 from telemeta.models import MediaItem, Location, MediaCollection, EthnicGroup
@@ -146 +145 @@
                 decoder  = timeside.decoder.FileDecoder(item.file.path)
                 pipe = decoder
+                mime_type = decoder.mimetype
                 
                 for analyzer in self.analyzers:
@@ -154 +154 @@
                 pipe.run()
                 
-                mime_type = decoder.format()
-                analyzers.append({'name': 'Mime type', 'id': 'mime_type', 'unit': '', 'value': mime_type})
-                    
                 for analyzer in analyzers_sub:
                     value = analyzer.result()
@@ -164 +161 @@
                         item.save()
                         value = datetime.timedelta(0,value)
+                    if analyzer.id() == 'mime_type':
+                        value = decoder.format()
                         
                     analyzers.append({'name':analyzer.name(),
@@ -169 +168 @@
                                       'unit':analyzer.unit(),
                                       'value':str(value)})
-                  
+                
             self.cache.write_analyzer_xml(analyzers, analyze_file)