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

Compare commits

base: 0x2620:02a2d00f9dcc8ebf629e839230cc0136eb6ae946
Branches Tags
0x2620:master
0x2620:stable
..
compare: 0x2620:794b28f833634e00f8f573043cc3fea9791c057d
Branches Tags
0x2620:master
0x2620:stable

No commits in common. "02a2d00f9dcc8ebf629e839230cc0136eb6ae946" and "794b28f833634e00f8f573043cc3fea9791c057d" have entirely different histories.
02a2d00f9d ... 794b28f833

4 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pandora/archive/models.py
View file

@ -756,8 +756,9 @@ class Stream(models.Model):
ok, error = extract.stream(media, target, self.name(), info, flags=self.flags) ok, error = extract.stream(media, target, self.name(), info, flags=self.flags)
# file could have been moved while encoding # file could have been moved while encoding
# get current version from db and update # get current version from db and update
self.refresh_from_db() _self = Stream.objects.get(id=self.id)
self.update_status(ok, error) _self.update_status(ok, error)
return _self
def get_index(self): def get_index(self):
index = 1 index = 1

7
pandora/archive/tasks.py
View file

@ -128,7 +128,7 @@ def process_stream(fileId):
stream = streams[0] stream = streams[0]
stream.make_timeline() stream.make_timeline()
stream.extract_derivatives() stream.extract_derivatives()
file.refresh_from_db() file = models.File.objects.get(id=fileId)
file.encoding = False file.encoding = False
file.save() file.save()
file.item.update_selected() file.item.update_selected()
@ -158,12 +158,13 @@ def extract_stream(fileId):
if created: if created:
file.extract_frames() file.extract_frames()
stream.media.name = stream.path(stream.name()) stream.media.name = stream.path(stream.name())
stream.encode() stream = stream.encode()
if stream.available: if stream.available:
stream.make_timeline() stream.make_timeline()
stream.extract_derivatives() stream.extract_derivatives()
file.extract_tracks() file.extract_tracks()
file.refresh_from_db() # get current version from db
file = models.File.objects.get(id=fileId)
if not file.item.rendered \ if not file.item.rendered \
and not file.item.files.exclude(id=fileId).filter(Q(queued=True) | Q(encoding=True)).count(): and not file.item.files.exclude(id=fileId).filter(Q(queued=True) | Q(encoding=True)).count():
file.item.update_timeline() file.item.update_timeline()

1
pandora/place/managers.py
View file

@ -141,5 +141,4 @@ class PlaceManager(Manager):
user) user)
if conditions: if conditions:
qs = qs.filter(conditions) qs = qs.filter(conditions)
qs = qs.distinct()
return qs return qs

1
pandora/place/views.py
View file

@ -239,6 +239,7 @@ def findPlaces(request, data):
qs = order_query(query['qs'], query['sort']) qs = order_query(query['qs'], query['sort'])
qs = qs.distinct() qs = qs.distinct()
if 'keys' in data: if 'keys' in data:
qs = qs.select_related('user__profile')
qs = qs[query['range'][0]:query['range'][1]] qs = qs[query['range'][0]:query['range'][1]]
response['data']['items'] = [p.json(data['keys'], request.user) for p in qs] response['data']['items'] = [p.json(data['keys'], request.user) for p in qs]
elif 'position' in query: elif 'position' in query: