don't keep changing the hard interval on load

only adjust it if it looks like the defaults haven't been changed
This commit is contained in:
Damien Elmes 2010-11-24 05:32:09 +09:00
parent 6bdca8b3c6
commit f698481c19

View file

@ -68,7 +68,7 @@ SEARCH_FIELD = 6
SEARCH_FIELD_EXISTS = 7 SEARCH_FIELD_EXISTS = 7
SEARCH_QA = 8 SEARCH_QA = 8
SEARCH_PHRASE_WB = 9 SEARCH_PHRASE_WB = 9
DECK_VERSION = 52 DECK_VERSION = 53
deckVarsTable = Table( deckVarsTable = Table(
'deckVars', metadata, 'deckVars', metadata,
@ -3616,10 +3616,6 @@ class DeckStorage(object):
# - ensure cards suspended on older clients are recognized # - ensure cards suspended on older clients are recognized
deck.s.statement(""" deck.s.statement("""
update cards set type = type - 3 where type between 0 and 2 and priority = -3""") update cards set type = type - 3 where type between 0 and 2 and priority = -3""")
# - ensure hard scheduling over a day if per day
if deck.getBool("perDay"):
deck.hardIntervalMin = max(1.0, deck.hardIntervalMin)
deck.hardIntervalMax = max(1.1, deck.hardIntervalMax)
# - new delay1 handling # - new delay1 handling
if deck.delay0 == deck.delay1: if deck.delay0 == deck.delay1:
deck.delay1 = 0 deck.delay1 = 0
@ -4217,6 +4213,13 @@ syncing again via Settings>Deck Properties>Synchronsiation. \
deck.enableSyncing() deck.enableSyncing()
deck.version = 52 deck.version = 52
deck.s.commit() deck.s.commit()
if deck.version < 53:
if deck.getBool("perDay"):
if deck.hardIntervalMin = 0.333:
deck.hardIntervalMin = max(1.0, deck.hardIntervalMin)
deck.hardIntervalMax = max(1.1, deck.hardIntervalMax)
deck.version = 53
deck.s.commit()
# executing a pragma here is very slow on large decks, so we store # executing a pragma here is very slow on large decks, so we store
# our own record # our own record
if not deck.getInt("pageSize") == 4096: if not deck.getInt("pageSize") == 4096: