fix item mime_type processing

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 364de7a91d94cc1f942c6f10ba49ef7cb503d692..fd3bb42b86825c5138a7783ff8790ce7aa051182 100644 (file)
--- 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):