From b33c2e99c047eb9293df4840c6a14781c2002ff3 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Mon, 5 Dec 2011 14:39:14 +0900 Subject: [PATCH] return false, not 'continue', when not finished --- anki/collection.py | 2 +- anki/media.py | 1 - anki/sync.py | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/anki/collection.py b/anki/collection.py index 7cf8c790f..774d3c26f 100644 --- a/anki/collection.py +++ b/anki/collection.py @@ -144,7 +144,7 @@ crt=?, mod=?, scm=?, dty=?, usn=?, ls=?, conf=?""", self.media.close() def reopen(self): - "Reconnect to DB (after changing threads, etc). Doesn't reload." + "Reconnect to DB (after changing threads, etc)." import anki.db if not self.db: self.db = anki.db.DB(self.path) diff --git a/anki/media.py b/anki/media.py index 59aa5df09..4cba3f09a 100644 --- a/anki/media.py +++ b/anki/media.py @@ -347,7 +347,6 @@ create table log (fname text primary key, type int); if finished: self.syncMod() # also need to clear log after sync finished - return finished # Streaming zips diff --git a/anki/sync.py b/anki/sync.py index 5e02cef81..bf9cb03c8 100644 --- a/anki/sync.py +++ b/anki/sync.py @@ -557,7 +557,7 @@ class MediaSyncer(object): while 1: runHook("sync", "streamMedia") zip = self.server.files() - if self.addFiles(zip=zip) != "continue": + if self.addFiles(zip=zip): break # step 4: stream files to the server runHook("sync", "client") @@ -565,7 +565,7 @@ class MediaSyncer(object): runHook("sync", "streamMedia") zip = self.files() usn = self.server.addFiles(zip=zip) - if usn != "continue": + if usn: # when server has run out of files, it returns bumped usn break # step 5: finalize