From dae4c2c45306745000f6018583bd3313a9d33914 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Thu, 24 May 2012 14:10:15 +0900 Subject: [PATCH] upgrade decks and conf --- anki/consts.py | 4 ++-- anki/decks.py | 3 +-- anki/storage.py | 23 +++++++++++++++++++++++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/anki/consts.py b/anki/consts.py index aac07f45f..144dac3a7 100644 --- a/anki/consts.py +++ b/anki/consts.py @@ -41,10 +41,10 @@ MODEL_STD = 0 MODEL_CLOZE = 1 # deck schema & syncing vars -SCHEMA_VERSION = 10 +SCHEMA_VERSION = 11 SYNC_ZIP_SIZE = int(2.5*1024*1024) SYNC_URL = os.environ.get("SYNC_URL") or "https://beta.ankiweb.net/sync/" -SYNC_VER = 4 +SYNC_VER = 5 # Labels ########################################################################## diff --git a/anki/decks.py b/anki/decks.py index 1b37d0984..f4f50b702 100644 --- a/anki/decks.py +++ b/anki/decks.py @@ -37,10 +37,9 @@ defaultDynamicDeck = { 'usn': 0, 'delays': None, 'separate': True, - # added in beta13 - 'resched': True, # list of (search, limit, order); we only use first element for now 'terms': [["", 100, 0]], + 'resched': True, 'return': True, # currently unused } diff --git a/anki/storage.py b/anki/storage.py index 6b98b518f..ca3409723 100644 --- a/anki/storage.py +++ b/anki/storage.py @@ -139,6 +139,29 @@ def _upgrade(col, ver): col.db.execute(""" update cards set left = left + left*1000 where queue = 1""") col.db.execute("update col set ver = 10") + if ver < 11: + col.modSchema() + for d in col.decks.all(): + if d['dyn']: + d['terms'] = [[d['search'], d['limit'], d['order']]] + del d['search'] + del d['limit'] + del d['order'] + d['resched'] = True + d['return'] = True + else: + if 'extendNew' not in d: + d['extendNew'] = 10 + d['extendRev'] = 50 + col.decks.save(d) + for c in col.decks.allConf(): + r = c['rev'] + r['ivlFct'] = r.get("ivlfct", 1) + if 'ivlfct' in r: + del r['ivlfct'] + r['maxIvl'] = 36500 + col.decks.save(c) + col.db.execute("update col set ver = 11") def _upgradeClozeModel(col, m): m['type'] = MODEL_CLOZE