From: yomguy <yomguy@parisson.com>
Date: Fri, 14 Dec 2012 09:27:42 +0000 (+0100)
Subject: fix item mime_type processing
X-Git-Tag: 1.4.5~52^2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0f0cb5b4f036a2d7595af257427fd14725b43428;p=telemeta.git

fix item mime_type processing
---

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 364de7a9..fd3bb42b 100644
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -393,16 +393,19 @@ class MediaItem(MediaResource):
 
     @property
     def mime_type(self):
-        if self.file:
-            if not self.mimetype:
-                if os.path.exists(self.file.path):
-                    self.mimetype = mimetypes.guess_type(self.file.path)[0]
-                    self.save()
-                    return self.mimetype
-                else:
-                    return 'none'        
+        if not self.mimetype:
+            if self.file:
+                if not self.mimetype:
+                    if os.path.exists(self.file.path):
+                        self.mimetype = mimetypes.guess_type(self.file.path)[0]
+                        self.save()
+                        return self.mimetype
+                    else:
+                        return 'none'
+            else:
+                return 'none'
         else:
-            return 'none'
+            return self.mimetype
 
     class Meta(MetaCore):
         db_table = 'media_items'
@@ -443,7 +446,7 @@ class MediaItem(MediaResource):
             title = unicode(self.collection)
         if self.track:
             title += ' ' + self.track
-        return title + ' - ' + self.mime_type 
+        return title + ' - ' + self.mime_type
 
     @property
     def instruments(self):