timelines could be from file now

This commit is contained in:
j 2011-08-26 18:14:33 +02:00
parent f04c1a7deb
commit 19a338e21f

View file

@ -920,8 +920,7 @@ class Item(models.Model):
poster = os.path.abspath(os.path.join(settings.MEDIA_ROOT, poster)) poster = os.path.abspath(os.path.join(settings.MEDIA_ROOT, poster))
frame = self.get_poster_frame_path() frame = self.get_poster_frame_path()
timeline = self.path('timeline.64.png') timeline = '%.64.png' % self.timeline_prefix
timeline = os.path.abspath(os.path.join(settings.MEDIA_ROOT, timeline))
director = u', '.join(self.get('director', ['Unknown Director'])) director = u', '.join(self.get('director', ['Unknown Director']))
cmd = [settings.ITEM_POSTER, cmd = [settings.ITEM_POSTER,
@ -989,8 +988,7 @@ class Item(models.Model):
frame = self.get_poster_frame_path() frame = self.get_poster_frame_path()
icon = self.path('icon.jpg') icon = self.path('icon.jpg')
self.icon.name = icon self.icon.name = icon
timeline = self.path('timeline.64.png') timeline = '%.64.png' % self.timeline_prefix
timeline = os.path.abspath(os.path.join(settings.MEDIA_ROOT, timeline))
cmd = [settings.ITEM_ICON, cmd = [settings.ITEM_ICON,
'-i', self.icon.path '-i', self.icon.path
] ]