From 99e498b077152b13f867efb1cbf116fea0e4ab28 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Tue, 14 Jul 2009 12:51:49 +0200 Subject: [PATCH] load host settings, fix oxid for series, load data from imdb --- lookup/models.py | 27 ++++++++++++++++++++------- settings.py | 12 +++++++++++- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/lookup/models.py b/lookup/models.py index 6c2bf82..7d12a92 100644 --- a/lookup/models.py +++ b/lookup/models.py @@ -9,6 +9,8 @@ from django.contrib.auth.models import User import simplejson import oxweb.wikipedia +import oxweb.imdb +from oxlib import stripTags def getMovieIdByImdbId(imdb_id): @@ -47,7 +49,8 @@ class MovieId(models.Model): def __unicode__(self): id = self.imdb_id - if id: id = self.id + if not id: + id = self.id return '%s (%s)' % (self.title, id) def updateFromWikipedia(self): @@ -63,11 +66,25 @@ class MovieId(models.Model): setattr(self, _key.get(key, key), data[key]) self.save() + def updateFromImdb(self): + if self.imdb_id: + data = oxweb.imdb.getMovieInfo(self.imdb_id) + _key = { + 'episode title': 'episode_title', + 'series title': 'series_title', + } + for key in ('title', 'year', 'series title', 'episode title', 'season', 'episode'): + if key in data and data[key]: + setattr(self, _key.get(key, key), data[key]) + directors = oxweb.imdb.getMovieCredits(self.imdb_id)['directors'] + self.director = ', '.join([stripTags(d[0]) for d in directors]) + self.save() + def gen_oxdb_id(self): oxid_value = u"\n".join([self.title, self.director, self.year]) oxid = hashlib.sha1(oxid_value.encode('utf-8')).hexdigest() if self.episode > -1: - oxid_value = u"\n".join([self.title, "%02d" % self.season]) + oxid_value = u"\n".join([self.series_title, "%02d" % self.season]) oxid = hashlib.sha1(oxid_value.encode('utf-8')).hexdigest()[:20] oxid_value = u"\n".join(["%02d" % self.episode, self.episode_title, self.director, self.year]) oxid += hashlib.sha1(oxid_value.encode('utf-8')).hexdigest()[:20] @@ -87,11 +104,7 @@ class MovieId(models.Model): json[key] = value return simplejson.dumps(json, indent=4) -def getMappingByKaragargaId(id): - kg = Karagarga.objects.get(imdb_id=imdb_id) - return kg.mapping - class Karagarga(models.Model): - mapping = models.ForeignKey(MovieId, related_name='karagarga_ids', default=None) + movie_id = models.ForeignKey(MovieId, related_name='karagarga_ids', default=None) karagarga_id = models.IntegerField(unique=True) diff --git a/settings.py b/settings.py index 6b1cf00..ce4dc54 100644 --- a/settings.py +++ b/settings.py @@ -6,7 +6,7 @@ from os.path import join PROJECT_PATH = os.path.dirname(__file__) -DEBUG = True +DEBUG = False TEMPLATE_DEBUG = DEBUG ADMINS = ( @@ -97,3 +97,13 @@ INSTALLED_APPS = ( LOGIN_REDIRECT_URL='/' +try: + import socket + # hostname = socket.gethostname().replace('.','_') + # exec "from host_settings.%s import *" % hostname + local_settings_module = socket.gethostname().split(".")[0] + if local_settings_module: + execfile(os.path.join(PROJECT_PATH, "host_settings", "%s.py" % local_settings_module)) +except ImportError, e: + raise e +