0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

better item detection of existing items, sort steams by part and fallback to path

Browse source
This commit is contained in:
j 2013-02-08 11:05:35 +00:00
commit d1b210d06a
4 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pandora/item/models.py
View file

@ -123,7 +123,7 @@ def get_item(info, user=None, async=False):
if not p:
tasks.update_poster.delay(item.itemId)
else:
qs = Item.objects.filter(find__key='title', find__value=info['title'])
qs = Item.objects.filter(find__key='title', find__value__iexact=info['title'])
if qs.count() == 1:
item = qs[0]
else:
@ -1055,7 +1055,9 @@ class Item(models.Model):
def streams(self):
return archive.models.Stream.objects.filter(
source=None, available=True, file__item=self, file__selected=True
).filter(Q(file__is_audio=True)|Q(file__is_video=True)).order_by('file__part')
).filter(
Q(file__is_audio=True)|Q(file__is_video=True)
).order_by('file__part', 'file__sort_path')
def update_timeline(self, force=False):
streams = self.streams()

2
pandora/item/views.py
View file

@ -802,7 +802,7 @@ def video(request, id, resolution, format, index=None):
#if streams.count() != 1:
# reise Http404
streams = Stream.objects.filter(file__item__itemId=item.itemId,
resolution=resolution, format=format).order_by('file__part')
resolution=resolution, format=format).order_by('file__part', 'file__sort_path')
if index + 1 > streams.count():
raise Http404
stream = streams[index]