From 004030af0d08ebd4b1e4d4e3d368bfb70a330791 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Tue, 10 Mar 2009 23:38:29 +0900 Subject: [PATCH] don't fail if progress handler unavailable or tags table existing --- anki/deck.py | 7 +++++-- anki/tags.py | 29 ++++++++++++++++------------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/anki/deck.py b/anki/deck.py index b8df014ce..785b2f8ab 100644 --- a/anki/deck.py +++ b/anki/deck.py @@ -128,8 +128,11 @@ class Deck(object): self.reviewedAheadCards = [] self.extraNewCards = 0 self.reviewEarly = False - self.engine.raw_connection().set_progress_handler( - self.progressHandler, 100000) + try: + self.engine.raw_connection().set_progress_handler( + self.progressHandler, 100000) + except: + print "please install pysqlite 2.4 for better progress dialogs" self.progressHandlerEnabled = False def modifiedSinceSave(self): diff --git a/anki/tags.py b/anki/tags.py index d2c27d647..b7acea369 100644 --- a/anki/tags.py +++ b/anki/tags.py @@ -19,19 +19,22 @@ from anki.db import * ########################################################################## def initTagTables(s): - s.statement(""" -create table tags ( -id integer not null, -tag text not null collate nocase, -priority integer not null default 2, -primary key(id))""") - s.statement(""" -create table cardTags ( -id integer not null, -cardId integer not null, -tagId integer not null, -src integer not null, -primary key(id))""") + try: + s.statement(""" + create table tags ( + id integer not null, + tag text not null collate nocase, + priority integer not null default 2, + primary key(id))""") + s.statement(""" + create table cardTags ( + id integer not null, + cardId integer not null, + tagId integer not null, + src integer not null, + primary key(id))""") + except: + pass def tagId(s, tag): "Return ID for tag, creating if necessary."