From 9bd1a089dc79884d4962192fe6cf1890488bbad4 Mon Sep 17 00:00:00 2001 From: "Maksim A. Boyko" Date: Sun, 28 Oct 2012 17:22:07 -0400 Subject: tools: Fix bug --- tools/migrate_db.py | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/tools/migrate_db.py b/tools/migrate_db.py index b5c12f8..70918c2 100755 --- a/tools/migrate_db.py +++ b/tools/migrate_db.py @@ -39,7 +39,10 @@ class MigrateDB(DB): for i, r in enumerate(row[:]): if isinstance(r, str): detect = chardet.detect(r) - row[i] = unicode(r, detect['encoding'] or 'utf8', 'replace') + try: + row[i] = unicode(r, detect['encoding'] or 'utf8', 'replace') + except LookupError: + row[i] = unicode(r, 'utf8', 'replace') yield dict(zip(fields, row)) def get_radio_chat_table(self): @@ -254,19 +257,19 @@ if __name__ == '__main__': pk = map_video.get(row['videoid'], 0) if pk: video = SJContent.objects.get(pk=pk) - try: - like = SJLike.objects.get( - user=user, - datetime=datetime.fromtimestamp(row['date']), - content=video) - except SJContent.DoesNotExist: - like = SJLike( - user=user, - datetime=datetime.fromtimestamp(row['date']), - content=video) - like.save() - - row['__sjlike_pk'] = like.pk + try: + like = SJLike.objects.get( + user=user, + datetime=datetime.fromtimestamp(row['date']), + content=video) + except SJLike.DoesNotExist: + like = SJLike( + user=user, + datetime=datetime.fromtimestamp(row['date']), + content=video) + like.save() + + row['__sjlike_pk'] = like.pk # Migrate sj_chat table -- cgit v1.2.3-70-g09d2