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

do clock skew check on initial connect only

Browse source
This commit is contained in:
Damien Elmes 2010-07-30 16:37:37 +09:00
parent 7f41973972
commit 1204f977e5
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ankiqt/ui/sync.py
View file

@ -61,6 +61,8 @@ class Sync(QThread):
error.data = {} error.data = {}
if error.data.get('type') == 'noResponse': if error.data.get('type') == 'noResponse':
self.emit(SIGNAL("noSyncResponse")) self.emit(SIGNAL("noSyncResponse"))
elif error.data.get('type') == 'clockOff':
pass
else: else:
error = self.getErrorMessage(error) error = self.getErrorMessage(error)
self.emit(SIGNAL("showWarning"), error) self.emit(SIGNAL("showWarning"), error)
@ -88,6 +90,11 @@ class Sync(QThread):
proxy.sourcesToCheck = self.sourcesToCheck proxy.sourcesToCheck = self.sourcesToCheck
proxy.connect("ankiqt-" + ankiqt.appVersion) proxy.connect("ankiqt-" + ankiqt.appVersion)
self.proxy = proxy self.proxy = proxy
# check clock
timediff = abs(proxy.timestamp - time.time())
if timediff > 300:
self.emit(SIGNAL("syncClockOff"), timediff)
raise SyncError(type="clockOff")
return self.proxy return self.proxy
def syncAllDecks(self): def syncAllDecks(self):
@ -139,11 +146,6 @@ class Sync(QThread):
self.emit(SIGNAL("noMatchingDeck"), keys, not self.onlyMerge) self.emit(SIGNAL("noMatchingDeck"), keys, not self.onlyMerge)
self.setStatus("") self.setStatus("")
return return
# check clock
timediff = abs(proxy.timestamp - time.time())
if timediff > 300:
self.emit(SIGNAL("syncClockOff"), timediff)
return
# check conflicts # check conflicts
proxy.deckName = syncName proxy.deckName = syncName
remoteMod = proxy.modified() remoteMod = proxy.modified()