ouczbs/anki-sync-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Got a complete 'fullup' working!

Browse Source
This commit is contained in:
David Snopek 2013-04-03 22:42:28 +01:00
parent d425b03d3e
commit 457a88d484
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
AnkiServer/sync.py
View File

@ -39,9 +39,18 @@ class SyncMediaHandler(MediaSyncer):
def __init__(self, col): def __init__(self, col):
MediaSyncer.__init__(self, col) MediaSyncer.__init__(self, col)
# Client passes 'minUsn' but MediaSyncer doesn't have the argument
def files(self, minUsn=0): def files(self, minUsn=0):
return MediaSyncer.files(self) import zipfile, StringIO
zipdata, fnames = MediaSyncer.files(self)
# add a _usn element to the zipdata
fd = StringIO.StringIO(zipdata)
zfd = zipfile.ZipFile(fd, "a", compression=zipfile.ZIP_DEFLATED)
zfd.writestr("_usn", str(minUsn + len(fnames)))
zfd.close()
return fd.getvalue()
class SyncUser(object): class SyncUser(object):
def __init__(self, name, path): def __init__(self, name, path):
@ -74,7 +83,7 @@ class SyncApp(object):
def authenticate(self, username, password): def authenticate(self, username, password):
"""Override this to change how users are authenticated.""" """Override this to change how users are authenticated."""
# TODO: This should have the exact opposite default ;-) # TODO: This should have the exact opposite default ;-)
return True return True
def username2dirname(self, username): def username2dirname(self, username):
@ -120,7 +129,7 @@ class SyncApp(object):
data = req.POST['data'].file.read() data = req.POST['data'].file.read()
data = self._decode_data(data, compression) data = self._decode_data(data, compression)
except KeyError: except KeyError:
data = None data = {}
except ValueError: except ValueError:
# Bad JSON # Bad JSON
raise HTTPBadRequest() raise HTTPBadRequest()
@ -182,11 +191,14 @@ class SyncApp(object):
finally: finally:
col.close() col.close()
print result # If it's a complex data type, we convert it to JSON
if type(result) not in (str, unicode):
result = json.dumps(result)
return Response( return Response(
status='200 OK', status='200 OK',
content_type='application/json', content_type='application/json',
body=json.dumps(result)) body=result)
elif url == 'upload': elif url == 'upload':
# TODO: deal with thread pool # TODO: deal with thread pool