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

pass client media count to server

Browse source
This commit is contained in:
Damien Elmes 2013-12-09 17:36:17 +09:00
parent f057242da1
commit 4e900b4608
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
anki/sync.py
View file

@ -3,7 +3,6 @@
# License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
import urllib import urllib
import os
import sys import sys
import gzip import gzip
import random import random
@ -16,6 +15,7 @@ from anki.consts import *
from hooks import runHook from hooks import runHook
import anki import anki
# syncing vars # syncing vars
HTTP_TIMEOUT = 90 HTTP_TIMEOUT = 90
HTTP_PROXY = None HTTP_PROXY = None
@ -750,8 +750,8 @@ class MediaSyncer(object):
# step 5: sanity check during beta testing # step 5: sanity check during beta testing
# NOTE: when removing this, need to move server tidyup # NOTE: when removing this, need to move server tidyup
# back from sanity check to addFiles # back from sanity check to addFiles
s = self.server.mediaSanity()
c = self.mediaSanity() c = self.mediaSanity()
s = self.server.mediaSanity(client=c)
self.col.log("mediaSanity", c, s) self.col.log("mediaSanity", c, s)
if c != s: if c != s:
# if the sanity check failed, force a resync # if the sanity check failed, force a resync
@ -797,9 +797,9 @@ class RemoteMediaServer(HttpSyncer):
return json.loads( return json.loads(
self.req("addFiles", StringIO(zip), comp=0)) self.req("addFiles", StringIO(zip), comp=0))
def mediaSanity(self): def mediaSanity(self, **kw):
return json.loads( return json.loads(
self.req("mediaSanity")) self.req("mediaSanity", StringIO(json.dumps(kw))))
def mediaList(self): def mediaList(self):
return json.loads( return json.loads(