From a8f150272e55b8b929e46194581d1064d849fa55 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Wed, 1 Sep 2010 13:32:25 +0200 Subject: [PATCH] suggested name --- oxdata/lookup/models.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/oxdata/lookup/models.py b/oxdata/lookup/models.py index ccbf7fc..9dbb54a 100644 --- a/oxdata/lookup/models.py +++ b/oxdata/lookup/models.py @@ -8,7 +8,7 @@ from django.db.models import Q, Max from django.contrib.auth.models import User import ox -from ox.normalize import canonicalName +from ox.normalize import canonicalName, normalizePath from ox import stripTags import ox.web.imdb import ox.web.wikipedia @@ -108,6 +108,9 @@ class MovieId(models.Model): self.oxdb_id = u"0x" + oxid self.save() + def suggested_name(self): + return normalizePath(self.title) + def suggested_path(self): if self.series_title: title = self.series_title @@ -118,7 +121,7 @@ class MovieId(models.Model): title = self.title if self.year: title += ' (%s)' % self.year - return os.path.join(directors[0], directors, title) + return os.path.join(directors[0].upper(), normalizePath(directors), normalizePath(title)) def json(self): json = {} @@ -144,6 +147,7 @@ class MovieId(models.Model): if 'year' in json and json['year']: json['year'] = int(json['year']) + json['suggested_name'] = self.suggested_name() json['suggested_path'] = self.suggested_path() return json