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

update paths on item edit, enable editable fields in editFile, part is a string now

Browse source
This commit is contained in:
j 2012-09-11 15:17:35 +02:00
commit 3de99bb4b6
4 changed files with 21 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

24
pandora/archive/models.py
View file

@ -39,7 +39,7 @@ class File(models.Model):
#editable
extension = models.CharField(default="", max_length=255, null=True)
language = models.CharField(default="", max_length=8, null=True)
part = models.IntegerField(null=True)
part = models.CharField(default="", max_length=255, null=True)
part_title = models.CharField(default="", max_length=255, null=True)
version = models.CharField(default="", max_length=255, null=True)
@ -167,6 +167,8 @@ class File(models.Model):
if self.path:
self.path = self.normalize_path()
self.sort_path = utils.sort_string(self.path)
data = ox.movie.parse_path(self.path)
self.type = data['type'] or 'unknown'
self.is_audio = self.type == 'audio'
self.is_video = self.type == 'video'
self.is_subtitle = self.path.endswith('.srt')
@ -245,7 +247,11 @@ class File(models.Model):
'framerate': self.framerate,
'id': self.oshash,
'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,
'resolution': resolution,
'samplerate': self.samplerate,
@ -262,22 +268,6 @@ class File(models.Model):
del data[k]
return data
def get_part(self):
if self.type not in ('audio', 'video'):
name = os.path.splitext(self.path)[0]
if self.language:
name = name[-(len(self.language)+1)]
qs = self.item.files.filter(Q(is_video=True)|Q(is_audio=True),
selected=True, path__startswith=name)
if qs.count()>0:
return qs[0].get_part()
if self.selected:
files = list(self.item.files.filter(type=self.type, language=self.language,
selected=self.selected).order_by('sort_path'))
if self in files:
return files.index(self) + 1
return None
def all_paths(self):
return [self.path] + [i.path for i in self.instances.all()]

7
pandora/archive/views.py
View file

@ -402,10 +402,11 @@ def editFile(request):
#FIXME: is this to slow to run sync?
f.item.update_selected()
f.item.update_wanted()
for key in ('part', 'language'):
for key in ('extension', 'language', 'part', 'partTitle', 'version'):
if key in data:
setattr(f, key, data[key])
f.auto = False
setattr(f,
re.sub('([A-Z])', lambda m: '_%s' % m.groups()[0].lower(), key),
data[key])
update = True
if update:
f.save()