Changeset df08f22

Timestamp:

11/10/11 15:59:33 (19 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, diadems, forma, generic, instru_search, lam, nlivemulti, production, release/1.4.4, security, social, storage, test, video

Children:

d4c2dd3, 57cb399

Parents:

887f937

git-author:

yomguy <yomguy@…> (11/10/11 15:59:33)

git-committer:

yomguy <yomguy@…> (11/10/11 15:59:33)

Message:

fix exported item metadata writing

Location:

telemeta

Files:

• models/media.py (modified) (2 diffs)
• web/base.py (modified) (2 diffs)

telemeta/models/media.py

@@ -529 +529 @@
     """ a mapping class to get item DublinCore metadata dictionaries 
     in various audio metadata format (MP3, OGG, etc...)"""
+    
+    #FIXME: should be given by timeside
+    unavailable_extensions = ['wav', 'aiff', 'aif']
     
     metadata_mapping = { 
@@ -552 +555 @@
                         'all': 'all', 
                        }, 
+                    'wav': {
+                        'creator': 'artist',
+                        'relation': 'album', 
+                        'all': 'all', 
+                       }, 
                     }
     

telemeta/web/base.py

@@ -811 +811 @@
             format = decoder.format()
         
+        dc_metadata = dublincore.express_item(item).to_list()
+        mapping = DublinCoreToFormatMetadata(extension)
+        metadata = mapping.get_metadata(dc_metadata)     
+        
         if mime_type in format:
             # source > stream
+            if not extension in mapping.unavailable_extensions:
+                proc = encoder(audio)
+                proc.set_metadata(metadata)
+                proc.write_metadata()
             response = HttpResponse(stream_from_file(audio), mimetype = mime_type)
-            
-        else:
-            dc_metadata = dublincore.express_item(item).to_list()
-            mapping = DublinCoreToFormatMetadata(extension)
-            metadata = mapping.get_metadata(dc_metadata)     
+        else:
             media = self.cache_export.dir + os.sep + file
             if not self.cache_export.exists(file) or flag.value == False:
@@ -830 +834 @@
             else:
                 # cache > stream
-                proc = encoder(media)
-                proc.set_metadata(metadata)
-                proc.write_metadata()
+                if not extension in mapping.unavailable_extensions:
+                    proc = encoder(media)
+                    proc.set_metadata(metadata)
+                    proc.write_metadata()
                 response = HttpResponse(self.cache_export.read_stream_bin(file), mimetype = mime_type)