don't fail if progress handler unavailable or tags table existing

This commit is contained in:
Damien Elmes 2009-03-10 23:38:29 +09:00
parent c266248edb
commit 004030af0d
2 changed files with 21 additions and 15 deletions

View file

@ -128,8 +128,11 @@ class Deck(object):
self.reviewedAheadCards = [] self.reviewedAheadCards = []
self.extraNewCards = 0 self.extraNewCards = 0
self.reviewEarly = False self.reviewEarly = False
self.engine.raw_connection().set_progress_handler( try:
self.progressHandler, 100000) self.engine.raw_connection().set_progress_handler(
self.progressHandler, 100000)
except:
print "please install pysqlite 2.4 for better progress dialogs"
self.progressHandlerEnabled = False self.progressHandlerEnabled = False
def modifiedSinceSave(self): def modifiedSinceSave(self):

View file

@ -19,19 +19,22 @@ from anki.db import *
########################################################################## ##########################################################################
def initTagTables(s): def initTagTables(s):
s.statement(""" try:
create table tags ( s.statement("""
id integer not null, create table tags (
tag text not null collate nocase, id integer not null,
priority integer not null default 2, tag text not null collate nocase,
primary key(id))""") priority integer not null default 2,
s.statement(""" primary key(id))""")
create table cardTags ( s.statement("""
id integer not null, create table cardTags (
cardId integer not null, id integer not null,
tagId integer not null, cardId integer not null,
src integer not null, tagId integer not null,
primary key(id))""") src integer not null,
primary key(id))""")
except:
pass
def tagId(s, tag): def tagId(s, tag):
"Return ID for tag, creating if necessary." "Return ID for tag, creating if necessary."