no manual data if item has imdb id

pandora/clip/models.py

@@ -11,8 +11,11 @@ import managers
 
 class MetaClip:
     def update_calculated_values(self):
-        start = min(self.start, self.item.sort.duration)
-        end = min(self.end, self.item.sort.duration)
+        start = self.start
+        end = self.end
+        if self.item.sort.duration:
+            start = min(self.start, self.item.sort.duration)
+            end = min(self.end, self.item.sort.duration)
         self.duration = end - start
         if self.duration > 0:
             self.hue, self.saturation, self.lightness = extract.average_color(

pandora/item/models.py

@@ -290,6 +290,11 @@ class Item(models.Model):
         if settings.USE_IMDB and len(self.itemId) != 7 and self.oxdbId != self.itemId:
             self.itemId = self.oxdbId
             #FIXME: move files to new id here
+        if settings.USE_IMDB and len(self.itemId) == 7:
+            for key in ('title', 'year', 'director', 'season', 'episode',
+                        'seriesTitle', 'episodeTitle'):
+                if key in self.data:
+                    del self.data[key]
 
         if self.poster and os.path.exists(self.poster.path):
             self.poster_height = self.poster.height