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

unbreak parse_path

Browse source
This commit is contained in:
j 2010-12-08 01:30:45 +01:00
parent 7a3c36d4ca
commit 91582033a1
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pandora/archive/admin.py
View file

@ -7,14 +7,14 @@ from django.contrib import admin
import models import models
class FileAdmin(admin.ModelAdmin): class FileAdmin(admin.ModelAdmin):
search_fields = ['path', 'video_codec'] search_fields = ['name', 'video_codec']
#form = FileAdminForm #form = FileAdminForm
admin.site.register(models.File, FileAdmin) admin.site.register(models.File, FileAdmin)
class InstanceAdmin(admin.ModelAdmin): class InstanceAdmin(admin.ModelAdmin):
search_fields = ['path', 'volume__name'] search_fields = ['name', 'volume', 'volume__name']
#form = ArchiveFileAdminForm #form = ArchiveFileAdminForm
admin.site.register(models.Instance, InstanceAdmin) admin.site.register(models.Instance, InstanceAdmin)

10
pandora/item/utils.py
View file

@ -44,7 +44,7 @@ def oxdb_id(title, directors=[], year='', season='', episode='', episode_title='
return u'0x' + oxdb_id return u'0x' + oxdb_id
def oxdb_directors(director): def oxdb_directors(director):
director = os.path.basename(os.path.dirname(os.path.dirname(director))) director = os.path.basename(os.path.dirname(director))
if director.endswith('_'): if director.endswith('_'):
director = "%s." % director[:-1] director = "%s." % director[:-1]
directors = [normalizeName(d) for d in director.split('; ')] directors = [normalizeName(d) for d in director.split('; ')]
@ -96,7 +96,7 @@ def oxdb_year(data):
def oxdb_series_title(path): def oxdb_series_title(path):
seriesTitle = u'' seriesTitle = u''
if path.startswith('Series'): if path.startswith('Series'):
seriesTitle = os.path.basename(os.path.dirname(path)) seriesTitle = os.path.basename(path)
else: else:
t = oxdb_title(path) t = oxdb_title(path)
if " (S" in t: if " (S" in t:
@ -142,6 +142,12 @@ def oxdb_part(path):
return part return part
def parse_path(path): def parse_path(path):
'''
expects path in the form
L/Last, First/Title (YYYY)
M/McCarthy, Thomas/The Visitor (2007)
G/Godard, Jean-Luc/Histoire(s) du cinema_ Toutes les histoires (1988)
'''
import ox.web.imdb import ox.web.imdb
search_title = oxdb_title(path, True) search_title = oxdb_title(path, True)
r = {} r = {}