GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-19 14:32:22 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

drop syncName, fix leech unit test

Browse source
This commit is contained in:
Damien Elmes 2011-09-07 20:11:26 +09:00
parent d34465c1e6
commit 7034c1ed29
3 changed files with 8 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
anki/deck.py
View file

@ -74,14 +74,13 @@ class _Deck(object):
self.mod, self.mod,
self.scm, self.scm,
self.dty, self.dty,
self.syncName,
self.lastSync, self.lastSync,
self.conf, self.conf,
models, models,
groups, groups,
gconf, gconf,
tags) = self.db.first(""" tags) = self.db.first("""
select crt, mod, scm, dty, syncName, lastSync, select crt, mod, scm, dty, lastSync,
conf, models, groups, gconf, tags from deck""") conf, models, groups, gconf, tags from deck""")
self.conf = simplejson.loads(self.conf) self.conf = simplejson.loads(self.conf)
self.models.load(models) self.models.load(models)
@ -93,10 +92,9 @@ conf, models, groups, gconf, tags from deck""")
self.mod = intTime() if mod is None else mod self.mod = intTime() if mod is None else mod
self.db.execute( self.db.execute(
"""update deck set """update deck set
crt=?, mod=?, scm=?, dty=?, syncName=?, lastSync=?, conf=?""", crt=?, mod=?, scm=?, dty=?, lastSync=?, conf=?""",
self.crt, self.mod, self.scm, self.dty, self.crt, self.mod, self.scm, self.dty,
self.syncName, self.lastSync, self.lastSync, simplejson.dumps(self.conf))
simplejson.dumps(self.conf))
self.models.flush() self.models.flush()
self.groups.flush() self.groups.flush()
self.tags.flush() self.tags.flush()
@ -147,8 +145,8 @@ crt=?, mod=?, scm=?, dty=?, syncName=?, lastSync=?, conf=?""",
self.scm = intTime() self.scm = intTime()
def schemaChanged(self): def schemaChanged(self):
"True if schema changed since last sync, or syncing off." "True if schema changed since last sync."
return not self.syncingEnabled() or self.scm > self.lastSync return self.scm > self.lastSync
def setDirty(self): def setDirty(self):
"Signal there are temp. suspended cards that need cleaning up on close." "Signal there are temp. suspended cards that need cleaning up on close."
@ -483,26 +481,6 @@ where c.fid == f.id
return True return True
return False return False
# Syncing
##########################################################################
def enableSyncing(self):
self.syncName = self.getSyncName()
def disableSyncing(self):
self.syncName = u""
def syncingEnabled(self):
return not not self.syncName
def genSyncName(self):
return unicode(checksum(self.path.encode("utf-8")))
def syncHashBad(self):
if self.syncName and self.syncName != self.genSyncName():
self.disableSyncing()
return True
# Schedulers and cramming # Schedulers and cramming
########################################################################## ##########################################################################

5
anki/storage.py
View file

@ -63,7 +63,6 @@ create table if not exists deck (
scm integer not null, scm integer not null,
ver integer not null, ver integer not null,
dty integer not null, dty integer not null,
syncName text not null,
lastSync integer not null, lastSync integer not null,
conf text not null, conf text not null,
models text not null, models text not null,
@ -126,7 +125,7 @@ create table if not exists revlog (
); );
insert or ignore into deck insert or ignore into deck
values(1,0,0,0,%(v)s,0,'',0,'','{}','','','{}'); values(1,0,0,0,%(v)s,0,0,'','{}','','','{}');
""" % ({'v':CURRENT_VERSION})) """ % ({'v':CURRENT_VERSION}))
import anki.deck import anki.deck
import anki.groups import anki.groups
@ -341,7 +340,7 @@ def _migrateDeckTbl(db):
db.execute("delete from deck") db.execute("delete from deck")
db.execute(""" db.execute("""
insert or replace into deck select id, cast(created as int), :t, insert or replace into deck select id, cast(created as int), :t,
:t, 99, 0, ifnull(syncName, ""), cast(lastSync as int), :t, 99, 0, cast(lastSync as int),
"", "", "", "", "" from decks""", t=intTime()) "", "", "", "", "" from decks""", t=intTime())
# prepare a group to store the old deck options # prepare a group to store the old deck options
import anki.groups import anki.groups

2
tests/test_sched.py
View file

@ -242,7 +242,7 @@ def test_reviews():
# leech handling # leech handling
################################################## ##################################################
c = copy.copy(cardcopy) c = copy.copy(cardcopy)
c.lapses = 15 c.lapses = 7
c.flush() c.flush()
# steup hook # steup hook
hooked = [] hooked = []