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

fix default itemKey data

Browse source
This commit is contained in:
j 2012-12-16 16:21:05 +00:00
parent 28aadd6a43
commit e1dbb7089f
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pandora/item/models.py
View file

@ -78,6 +78,7 @@ def get_item(info, user=None, async=False):
} }
if filter(lambda k: k['id'] == 'year', settings.CONFIG['itemKeys']): if filter(lambda k: k['id'] == 'year', settings.CONFIG['itemKeys']):
item_data['year'] =info.get('year', '') item_data['year'] =info.get('year', '')
for key in ('episodeTitle', 'episodeDirector', 'episodeYear', for key in ('episodeTitle', 'episodeDirector', 'episodeYear',
'season', 'episode', 'seriesTitle'): 'season', 'episode', 'seriesTitle'):
if key in info and info[key]: if key in info and info[key]:
@ -112,10 +113,6 @@ def get_item(info, user=None, async=False):
item = Item() item = Item()
item.user = user item.user = user
item.data = item_data item.data = item_data
#set default values
for k in settings.CONFIG['itemKeys']:
if 'default' in k:
item.data[k['id']] = default_data[k['default']]
item.itemId = info.get('oxdbId', item.oxdb_id()) item.itemId = info.get('oxdbId', item.oxdb_id())
try: try:
existing_item = Item.objects.get(oxdbId=item.oxdb_id()) existing_item = Item.objects.get(oxdbId=item.oxdb_id())
@ -279,6 +276,11 @@ class Item(models.Model):
else: else:
self.make_poster(True) self.make_poster(True)
def add_default_data(self):
for k in settings.CONFIG['itemKeys']:
if 'default' in k and not k['id'] in self.data:
self.data[k['id']] = k['default']
def expand_connections(self): def expand_connections(self):
c = self.get('connections') c = self.get('connections')
if c: if c:
@ -320,6 +322,7 @@ class Item(models.Model):
self.level = settings.CONFIG['rightsLevel']['member'] self.level = settings.CONFIG['rightsLevel']['member']
if not self.itemId: if not self.itemId:
self.itemId = str(uuid.uuid1()) self.itemId = str(uuid.uuid1())
self.add_default_data()
super(Item, self).save(*args, **kwargs) super(Item, self).save(*args, **kwargs)
if not settings.USE_IMDB: if not settings.USE_IMDB:
self.itemId = ox.toAZ(self.id) self.itemId = ox.toAZ(self.id)