From 7034c1ed29893ae32c4c6d76d4ee6ea3fef245ef Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Wed, 7 Sep 2011 20:11:26 +0900
Subject: [PATCH] drop syncName, fix leech unit test

---
 anki/deck.py        | 32 +++++---------------------------
 anki/storage.py     |  5 ++---
 tests/test_sched.py |  2 +-
 3 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/anki/deck.py b/anki/deck.py
index 2c0ddffe6..99764dd2a 100644
--- a/anki/deck.py
+++ b/anki/deck.py
@@ -74,14 +74,13 @@ class _Deck(object):
          self.mod,
          self.scm,
          self.dty,
-         self.syncName,
          self.lastSync,
          self.conf,
          models,
          groups,
          gconf,
          tags) = self.db.first("""
-select crt, mod, scm, dty, syncName, lastSync,
+select crt, mod, scm, dty, lastSync,
 conf, models, groups, gconf, tags from deck""")
         self.conf = simplejson.loads(self.conf)
         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.db.execute(
             """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.syncName, self.lastSync,
-            simplejson.dumps(self.conf))
+            self.lastSync, simplejson.dumps(self.conf))
         self.models.flush()
         self.groups.flush()
         self.tags.flush()
@@ -147,8 +145,8 @@ crt=?, mod=?, scm=?, dty=?, syncName=?, lastSync=?, conf=?""",
         self.scm = intTime()
 
     def schemaChanged(self):
-        "True if schema changed since last sync, or syncing off."
-        return not self.syncingEnabled() or self.scm > self.lastSync
+        "True if schema changed since last sync."
+        return self.scm > self.lastSync
 
     def setDirty(self):
         "Signal there are temp. suspended cards that need cleaning up on close."
@@ -483,26 +481,6 @@ where c.fid == f.id
             return True
         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
     ##########################################################################
 
diff --git a/anki/storage.py b/anki/storage.py
index 2204f9074..e96a0936f 100644
--- a/anki/storage.py
+++ b/anki/storage.py
@@ -63,7 +63,6 @@ create table if not exists deck (
     scm             integer not null,
     ver             integer not null,
     dty             integer not null,
-    syncName        text not null,
     lastSync        integer not null,
     conf            text not null,
     models          text not null,
@@ -126,7 +125,7 @@ create table if not exists revlog (
 );
 
 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}))
     import anki.deck
     import anki.groups
@@ -341,7 +340,7 @@ def _migrateDeckTbl(db):
     db.execute("delete from deck")
     db.execute("""
 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())
     # prepare a group to store the old deck options
     import anki.groups
diff --git a/tests/test_sched.py b/tests/test_sched.py
index 1c843d2ef..63f20287b 100644
--- a/tests/test_sched.py
+++ b/tests/test_sched.py
@@ -242,7 +242,7 @@ def test_reviews():
     # leech handling
     ##################################################
     c = copy.copy(cardcopy)
-    c.lapses = 15
+    c.lapses = 7
     c.flush()
     # steup hook
     hooked = []