From 6bf5df57bb8dbb7919bd16f6689ca764176250cc Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Mon, 17 Sep 2012 12:42:50 +0200 Subject: [PATCH] title should be full title, add seriesTitle, fixes #985 --- oxdata/movie/models.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/oxdata/movie/models.py b/oxdata/movie/models.py index 8757ef3..137c2f0 100644 --- a/oxdata/movie/models.py +++ b/oxdata/movie/models.py @@ -10,7 +10,9 @@ import ox def normalize_value(value): if isinstance(value, str): value = value.decode('utf-8') - return unicodedata.normalize('NFD', value) + if isinstance(value, unicode): + value = unicodedata.normalize('NFD', value) + return value def find(info, guess=True): q = Imdb.objects.all() @@ -21,8 +23,6 @@ def find(info, guess=True): i.save() q = Imdb.objects.filter(imdb=info['id']) else: - if 'seriesTitle' in info: - info['title'] = info['seriesTitle'] for key in Imdb.keys: if key in info and info[key]: if isinstance(info[key], basestring): @@ -63,6 +63,7 @@ class Imdb(models.Model): episodeTitle = models.CharField(max_length=1000, blank=True, default='') episodeYear = models.CharField(max_length=4, blank=True, default='') episodeDirector = models.CharField(max_length=1000, blank=True, default='') + seriesTitle = models.CharField(max_length=1000, blank=True, default='') invalid = models.BooleanField(default=False) @@ -70,7 +71,7 @@ class Imdb(models.Model): return u"[%s] %s%s" % (self.imdb, self.title, self.year and ' (%s)' % self.year or '') keys = ('title', 'director', 'year', 'season', 'episode', - 'episodeTitle', 'episodeYear', 'episodeDirector') + 'seriesTitle', 'episodeTitle', 'episodeYear', 'episodeDirector') def update(self): info = ox.web.imdb.ImdbCombined(self.imdb) @@ -78,8 +79,6 @@ class Imdb(models.Model): for key in self.keys: if key in info: value = info[key] - if key == 'title' and 'seriesTitle' in info: - value = info['seriesTitle'] if isinstance(value, list): value = u'\n'.join(value) + '\n' if isinstance(value, basestring):