GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-24 16:56:36 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

remove bulk media support

Browse source
This commit is contained in:
Damien Elmes 2009-06-19 11:50:45 +09:00
parent a3da966462
commit c6def7d5e9
1 changed files with 2 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ankiqt/ui/sync.py
View file

@ -6,8 +6,8 @@ from PyQt4.QtCore import *
import os, types, socket, time, traceback import os, types, socket, time, traceback
import ankiqt import ankiqt
import anki import anki
from anki.sync import SyncClient, HttpSyncServerProxy, BulkMediaSyncerProxy from anki.sync import SyncClient, HttpSyncServerProxy, copyLocalMedia
from anki.sync import BulkMediaSyncer, SYNC_HOST, SYNC_PORT from anki.sync import SYNC_HOST, SYNC_PORT
from anki.errors import * from anki.errors import *
from anki import DeckStorage from anki import DeckStorage
import ankiqt.forms import ankiqt.forms
@ -127,8 +127,6 @@ class Sync(QThread):
else: else:
self.setStatus(_("Downloading..."), 0) self.setStatus(_("Downloading..."), 0)
client.fullSyncFromServer(ret[1], ret[2]) client.fullSyncFromServer(ret[1], ret[2])
if client.mediaSupported():
self.doBulkDownload(proxy.deckName)
self.setStatus(_("Sync complete."), 0) self.setStatus(_("Sync complete."), 0)
else: else:
# diff # diff
@ -142,8 +140,6 @@ class Sync(QThread):
# apply reply # apply reply
self.setStatus(_("Applying reply..."), 0) self.setStatus(_("Applying reply..."), 0)
client.applyPayloadReply(res) client.applyPayloadReply(res)
if client.mediaSyncPending:
self.doBulkDownload(proxy.deckName)
# 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
@ -173,8 +169,6 @@ 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()
@ -197,22 +191,6 @@ class Sync(QThread):
'a': err}) 'a': err})
self.error(e) self.error(e)
def doBulkDownload(self, deckname):
self.emit(SIGNAL("openSyncProgress"))
client = BulkMediaSyncer(self.deck)
client.server = BulkMediaSyncerProxy(self.user, self.pwd)
client.server.deckName = deckname
client.progressCallback = self.bulkCallback
try:
client.sync()
except:
self.emit(SIGNAL("bulkSyncFailed"))
time.sleep(0.1)
self.emit(SIGNAL("closeSyncProgress"))
def bulkCallback(self, *args):
self.emit(SIGNAL("updateSyncProgress"), args)
# Choosing a deck to sync to # Choosing a deck to sync to
########################################################################## ##########################################################################