Changeset 77ca855

Timestamp:

11/30/11 11:35:05 (18 months ago)

Author:

yomguy <yomguy@…>

Branches:

video

Children:

5f1d1f5

Parents:

6946b6e (diff), 7748c20 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

yomguy <yomguy@…> (11/30/11 11:35:05)

git-committer:

yomguy <yomguy@…> (11/30/11 11:35:05)

Message:

Merge branch 'master' into video

Location:

telemeta

Files:

• models/media.py (modified) (1 diff)
• models/query.py (modified) (1 diff)
• templates/telemeta_default/mediaitem_detail.html (modified) (2 diffs)
• web/base.py (modified) (4 diffs)

telemeta/models/media.py

@@ -468 +468 @@
     def to_dict(self):
         if self.analyzer_id == 'duration':
-            value = self.value.split('.')
-            self.value = '.'.join([value[0], value[1][:2]])
+            if '.' in self.value:
+                value = self.value.split('.')
+                self.value = '.'.join([value[0], value[1][:2]])
         return {'id': self.analyzer_id, 'name': self.name, 'value': self.value, 'unit': self.unit}
         

telemeta/models/query.py

@@ -324 +324 @@
 
     def sound(self):
-        return self.filter(items__file__contains='/')
+        return self.filter(items__file__contains='/').distinct()
         
         

telemeta/templates/telemeta_default/mediaitem_detail.html

@@ -113 +113 @@
             <a href="#" class="toggle">Maximize</a>
             <a href="#" class="embed_player_frame">&lt;/&gt;</a>
-            <div class="wazing"></div>
+            <div class="wazing">
+                <video name="video" width=362">
+                    <source src="http://localhost/test/test.webm" type='video/webm'>
+                    video not supported
+                </video>
+            </div>
             <div id="player" class="ts-player">
             </div>
@@ -150 +155 @@
         </div>
         {% endif %}
-
-    </div>
+        
+    </div>
+    
     {% endif %}
     {% endif %}

telemeta/web/base.py

@@ -552 +552 @@
                                                 str(item.recorded_to_date).split('-')[0])
         
+        try:
+            analysis = MediaItemAnalysis.objects.get(item=item, analyzer_id='mime_type')
+            mime_type = analysis.value 
+        except:
+            mime_type = ''
+        
+
         related_media = MediaItemRelated.objects.filter(item=item)
         for media in related_media:
@@ -568 +575 @@
                     media.title = media.url
                 media.save()
-                
+        
         return render(request, template,
                     {'item': item, 'export_formats': formats,
@@ -575 +582 @@
                     'previous' : previous, 'next' : next, 'marker': marker_id, 'playlists' : playlists, 
                     'public_access': public_access, 'width': width, 'height': height, 
-                    'related_media': related_media, 
+                    'related_media': related_media, 'mime_type': mime_type, 
                     })
         
@@ -825 +832 @@
             if encoder.file_extension() == extension:
                 break
-
+        
         if encoder.file_extension() != extension:
             raise Http404('Unknown export file extension: %s' % extension)