forked from 0x2620/pandora
remove unused force flag from make_poster, update_timeline
This commit is contained in:
parent
0f9e80e1e6
commit
8ac78f3bd6
3 changed files with 6 additions and 6 deletions
|
@ -200,7 +200,7 @@ def addMedia(request, data):
|
||||||
}
|
}
|
||||||
i.user = request.user
|
i.user = request.user
|
||||||
i.save()
|
i.save()
|
||||||
i.make_poster(True)
|
i.make_poster()
|
||||||
f = models.File(oshash=oshash, item=i)
|
f = models.File(oshash=oshash, item=i)
|
||||||
f.path = data.get('filename', 'Untitled')
|
f.path = data.get('filename', 'Untitled')
|
||||||
extension = f.path.split('.')
|
extension = f.path.split('.')
|
||||||
|
|
|
@ -1310,7 +1310,7 @@ class Item(models.Model):
|
||||||
qs = qs.order_by('file__part', 'file__sort_path')
|
qs = qs.order_by('file__part', 'file__sort_path')
|
||||||
return qs
|
return qs
|
||||||
|
|
||||||
def update_timeline(self, force=False, async=True):
|
def update_timeline(self, async=True):
|
||||||
streams = self.streams()
|
streams = self.streams()
|
||||||
self.make_timeline()
|
self.make_timeline()
|
||||||
if streams.count() == 1:
|
if streams.count() == 1:
|
||||||
|
@ -1334,7 +1334,7 @@ class Item(models.Model):
|
||||||
self.json = self.get_json()
|
self.json = self.get_json()
|
||||||
self.update_sort()
|
self.update_sort()
|
||||||
self.select_frame()
|
self.select_frame()
|
||||||
self.make_poster(True)
|
self.make_poster()
|
||||||
self.make_icon()
|
self.make_icon()
|
||||||
self.make_torrent()
|
self.make_torrent()
|
||||||
self.rendered = streams.count() > 0
|
self.rendered = streams.count() > 0
|
||||||
|
@ -1385,9 +1385,9 @@ class Item(models.Model):
|
||||||
for f in glob(os.path.join(settings.MEDIA_ROOT, self.path(), 'timeline*.jpg')):
|
for f in glob(os.path.join(settings.MEDIA_ROOT, self.path(), 'timeline*.jpg')):
|
||||||
os.unlink(f)
|
os.unlink(f)
|
||||||
|
|
||||||
def make_poster(self, force=False):
|
def make_poster(self):
|
||||||
ox.makedirs(os.path.join(settings.MEDIA_ROOT, self.path()))
|
ox.makedirs(os.path.join(settings.MEDIA_ROOT, self.path()))
|
||||||
if not self.poster or force:
|
if not self.poster:
|
||||||
poster = self.make_siteposter()
|
poster = self.make_siteposter()
|
||||||
url = self.prefered_poster_url()
|
url = self.prefered_poster_url()
|
||||||
if url:
|
if url:
|
||||||
|
|
|
@ -520,7 +520,7 @@ def add(request, data):
|
||||||
if p:
|
if p:
|
||||||
p.wait()
|
p.wait()
|
||||||
else:
|
else:
|
||||||
i.make_poster(True)
|
i.make_poster()
|
||||||
response = json_response(status=200, text='created')
|
response = json_response(status=200, text='created')
|
||||||
response['data'] = i.get_json()
|
response['data'] = i.get_json()
|
||||||
add_changelog(request, data, i.public_id)
|
add_changelog(request, data, i.public_id)
|
||||||
|
|
Loading…
Reference in a new issue