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

Remove redundant json.dumps() calls

Browse Source
This commit is contained in:
flan 2017-11-03 01:49:18 +01:00
parent 2ca7c596e3
commit 5ec0dd7418
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ankisyncd/sync_app.py
View File

@ -102,13 +102,13 @@ class SyncMediaHandler(anki.sync.MediaSyncer):
anki.sync.MediaSyncer.__init__(self, col) anki.sync.MediaSyncer.__init__(self, col)
def begin(self, skey): def begin(self, skey):
return json.dumps({ return {
'data':{ 'data': {
'sk':skey, 'sk': skey,
'usn':self.col.media.lastUsn() 'usn': self.col.media.lastUsn(),
}, },
'err':'' 'err': '',
}) }
def uploadChanges(self, data): def uploadChanges(self, data):
""" """
@ -125,13 +125,10 @@ class SyncMediaHandler(anki.sync.MediaSyncer):
our_last_usn = self.col.media.lastUsn() our_last_usn = self.col.media.lastUsn()
self.col.media.setLastUsn(our_last_usn + processed_count) self.col.media.setLastUsn(our_last_usn + processed_count)
return json.dumps( return {
{ 'data': [processed_count, self.col.media.lastUsn()],
'data': [processed_count, 'err': '',
self.col.media.lastUsn()], }
'err': ''
}
)
@staticmethod @staticmethod
def _check_zip_data(zip_data): def _check_zip_data(zip_data):
@ -274,7 +271,7 @@ class SyncMediaHandler(anki.sync.MediaSyncer):
for fname,mtime,csum, in self.col.media.db.execute("select fname,mtime,csum from media"): for fname,mtime,csum, in self.col.media.db.execute("select fname,mtime,csum from media"):
result.append([fname, usn, csum]) result.append([fname, usn, csum])
return json.dumps({'data':result, 'err':''}) return {'data': result, 'err': ''}
def mediaSanity(self, local=None): def mediaSanity(self, local=None):
if self.col.media.mediaCount() == local: if self.col.media.mediaCount() == local:
@ -282,7 +279,7 @@ class SyncMediaHandler(anki.sync.MediaSyncer):
else: else:
result = "FAILED" result = "FAILED"
return json.dumps({'data':result, 'err':''}) return {'data': result, 'err':''}
class SyncUserSession(object): class SyncUserSession(object):
def __init__(self, name, path, collection_manager, setup_new_collection=None): def __init__(self, name, path, collection_manager, setup_new_collection=None):