decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

fix part sort

Browse source
This commit is contained in:
j 2012-09-14 11:02:08 +02:00
parent 1b27def499
commit 7248616937
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pandora/archive/models.py
View file

@ -172,8 +172,8 @@ class File(models.Model):
data = self.get_path_info() data = self.get_path_info()
self.extension = data.get('extension') self.extension = data.get('extension')
self.language = data.get('language') self.language = data.get('language')
self.part = data.get('part') self.part = ox.sort_string(data.get('part') or '')
self.part_title = data.get('partTitle') self.part_title = ox.sort_string(data.get('partTitle') or '')
self.type = data.get('type') or 'unknown' self.type = data.get('type') or 'unknown'
self.version = data.get('version') self.version = data.get('version')
@ -259,11 +259,6 @@ class File(models.Model):
'framerate': self.framerate, 'framerate': self.framerate,
'id': self.oshash, 'id': self.oshash,
'instances': [i.json() for i in self.instances.all()], 'instances': [i.json() for i in self.instances.all()],
'extension': self.extension,
'language': self.language,
'part': self.part,
'partTitle': self.part_title,
'version': self.version,
'path': self.path, 'path': self.path,
'resolution': resolution, 'resolution': resolution,
'samplerate': self.samplerate, 'samplerate': self.samplerate,
@ -273,6 +268,8 @@ class File(models.Model):
'videoCodec': self.video_codec, 'videoCodec': self.video_codec,
'wanted': self.wanted, 'wanted': self.wanted,
} }
for key in ('part', 'partTitle', 'version', 'language', 'extension'):
data[key] = self.path_info[key]
data['users'] = list(set([i['user'] for i in data['instances']])) data['users'] = list(set([i['user'] for i in data['instances']]))
if keys: if keys:
for k in data.keys(): for k in data.keys():