mirror of
https://github.com/ankitects/anki.git
synced 2025-09-19 06:22:22 -04:00
support bulk download on one way sync
This commit is contained in:
parent
e01d3dbc84
commit
0cd478c0b7
2 changed files with 7 additions and 6 deletions
|
@ -1164,6 +1164,7 @@ class AnkiQt(QMainWindow):
|
||||||
(type, x, y, fname) = args
|
(type, x, y, fname) = args
|
||||||
self.syncProgressDialog.setMaximum(y)
|
self.syncProgressDialog.setMaximum(y)
|
||||||
self.syncProgressDialog.setValue(x)
|
self.syncProgressDialog.setValue(x)
|
||||||
|
self.syncProgressDialog.setMinimumDuration(0)
|
||||||
if type == "up":
|
if type == "up":
|
||||||
self.syncProgressDialog.setLabelText("Uploading %s.." % fname)
|
self.syncProgressDialog.setLabelText("Uploading %s.." % fname)
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -108,10 +108,8 @@ class Sync(QThread):
|
||||||
# apply reply
|
# apply reply
|
||||||
self.setStatus(_("Applying reply.."), 0)
|
self.setStatus(_("Applying reply.."), 0)
|
||||||
client.applyPayloadReply(res)
|
client.applyPayloadReply(res)
|
||||||
# bulk update?
|
if client.mediaSyncPending:
|
||||||
if not client.bundleMedia:
|
self.doBulkDownload(proxy.deckName)
|
||||||
# need to load bulk media fetcher now
|
|
||||||
self.doBulkDownload()
|
|
||||||
# finished. save deck, preserving mod time
|
# finished. save deck, preserving mod time
|
||||||
self.setStatus(_("Sync complete."))
|
self.setStatus(_("Sync complete."))
|
||||||
self.deck.lastLoaded = self.deck.modified
|
self.deck.lastLoaded = self.deck.modified
|
||||||
|
@ -137,6 +135,8 @@ class Sync(QThread):
|
||||||
self.setStatus(msg + _(" applied %d modified cards.") %
|
self.setStatus(msg + _(" applied %d modified cards.") %
|
||||||
len(payload['cards']))
|
len(payload['cards']))
|
||||||
client.applyOneWayPayload(payload)
|
client.applyOneWayPayload(payload)
|
||||||
|
if client.mediaSyncPending:
|
||||||
|
self.doBulkDownload("")
|
||||||
self.setStatus(_("Check complete."))
|
self.setStatus(_("Check complete."))
|
||||||
self.deck.s.flush()
|
self.deck.s.flush()
|
||||||
self.deck.s.commit()
|
self.deck.s.commit()
|
||||||
|
@ -156,11 +156,11 @@ class Sync(QThread):
|
||||||
time.sleep(3)
|
time.sleep(3)
|
||||||
self.emit(SIGNAL("syncFinished"))
|
self.emit(SIGNAL("syncFinished"))
|
||||||
|
|
||||||
def doBulkDownload(self):
|
def doBulkDownload(self, deckname):
|
||||||
self.emit(SIGNAL("openSyncProgress"))
|
self.emit(SIGNAL("openSyncProgress"))
|
||||||
client = BulkMediaSyncer(self.deck)
|
client = BulkMediaSyncer(self.deck)
|
||||||
client.server = BulkMediaSyncerProxy(self.user, self.pwd)
|
client.server = BulkMediaSyncerProxy(self.user, self.pwd)
|
||||||
client.server.deckName = self.parent.syncName
|
client.server.deckName = deckname
|
||||||
client.progressCallback = self.bulkCallback
|
client.progressCallback = self.bulkCallback
|
||||||
client.sync()
|
client.sync()
|
||||||
self.emit(SIGNAL("closeSyncProgress"))
|
self.emit(SIGNAL("closeSyncProgress"))
|
||||||
|
|
Loading…
Reference in a new issue