add flags back to cards, and fix syncing

anki/cards.py

@@ -40,6 +40,7 @@ class Card(object):
             self.grade = 0
             self.cycles = 0
             self.edue = 0
+            self.flags = 0
             self.data = ""
 
     def load(self):
@@ -59,6 +60,7 @@ class Card(object):
          self.grade,
          self.cycles,
          self.edue,
+         self.flags,
          self.data) = self.deck.db.first(
              "select * from cards where id = ?", self.id)
         self._qa = None
@@ -70,7 +72,7 @@ class Card(object):
         self.deck.db.execute(
             """
 insert or replace into cards values
-(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)""",
+(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)""",
             self.id,
             self.fid,
             self.gid,
@@ -87,6 +89,7 @@ insert or replace into cards values
             self.grade,
             self.cycles,
             self.edue,
+            self.flags,
             self.data)
 
     def flushSched(self):

anki/storage.py

@@ -108,6 +108,7 @@ create table if not exists cards (
     grade           integer not null,
     cycles          integer not null,
     edue            integer not null,
+    flags           integer not null,
     data            text not null
 );
 
@@ -278,7 +279,7 @@ order by created"""):
     db.execute("drop table cards")
     _addSchema(db, False)
     db.executemany("""
-insert into cards values (?,?,1,?,?,?,?,?,?,?,?,?,?,0,0,0,"")""",
+insert into cards values (?,?,1,?,?,?,?,?,?,?,?,?,?,0,0,0,0,"")""",
                    rows)
 
     # reviewHistory -> revlog

anki/sync.py

@@ -212,10 +212,10 @@ class Syncer(object):
 
     def mergeFacts(self, lchg, rchg):
         (toAdd, toRem) = self.findChanges(
-            lchg[0], lchg[1], rchg[0], rchg[1], 3, 4)
+            lchg[0], lchg[1], rchg[0], rchg[1], 4, 5)
         # add missing
         self.deck.db.executemany(
-            "insert or replace into facts values (?,?,?,?,?,?,?,?,?)",
+            "insert or replace into facts values (?,?,?,?,?,?,?,?,?,?,?)",
             toAdd)
         # update fsums table - fixme: in future could skip sort cache
         self.deck.updateFieldCache([f[0] for f in toAdd])
@@ -245,7 +245,7 @@ class Syncer(object):
         # add missing
         self.deck.db.executemany(
             "insert or replace into cards values "
-            "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
+            "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
             toAdd)
         # remove remotely deleted
         self.deck.remCards(toRem)