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

rename items instead of merge

Browse source
This commit is contained in:
j 2011-10-24 23:41:55 +02:00
parent b77a29933c
commit 408af96aa2
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pandora/item/models.py
View file

@ -264,10 +264,19 @@ class Item(models.Model):
if self.oxdbId != oxdbId: if self.oxdbId != oxdbId:
q = Item.objects.filter(oxdbId=oxdbId).exclude(id=self.id) q = Item.objects.filter(oxdbId=oxdbId).exclude(id=self.id)
if q.count() != 0: if q.count() != 0:
self.oxdbId = None if len(self.itemId) == 7:
q[0].merge_with(self, save=False) self.oxdbId = None
else: q[0].merge_with(self, save=False)
self.oxdbId = oxdbId else:
n = 1
key = 'episodeTitle' in self.data and 'episodeTitle' or 'title'
title = self.get(key, 'Untitled')
while q.count() != 0:
n += 1
self.data[key] = u'%s [%d]' % (title, n)
oxdbId = self.oxdb_id()
q = Item.objects.filter(oxdbId=oxdbId).exclude(id=self.id)
self.oxdbId = oxdbId
update_poster = True update_poster = True
#id changed, what about existing item with new id? #id changed, what about existing item with new id?