alex/yomichan-anki
1
Fork 0
Code Releases Activity

Simplify AnkiConnect RPC

Browse Source
This commit is contained in:
Alex Yatskov 2016-05-21 14:26:23 -07:00
parent 71f2e0ff67
commit ea0205955c
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
yomi_base/anki_connect.py
View File

@ -19,7 +19,6 @@
from PyQt4 import QtCore from PyQt4 import QtCore
from ajax import AjaxServer from ajax import AjaxServer
import constants
import reader_util import reader_util
@ -33,12 +32,6 @@ class AnkiConnect:
self.timer.timeout.connect(self.advance) self.timer.timeout.connect(self.advance)
self.timer.start(interval) self.timer.start(interval)
self.handlers = {
'addNote': self.apiAddNote,
'canAddNotes': self.apiCanAddNotes,
'getVersion': self.apiGetVersion,
}
def advance(self): def advance(self):
enabled = self.preferences['enableAnkiConnect'] enabled = self.preferences['enableAnkiConnect']
@ -87,35 +80,26 @@ class AnkiConnect:
def handler(self, request): def handler(self, request):
action = request.get('action') action = 'api_' + request.get('action', '')
params = request.get('params') if hasattr(self, action):
return getattr(self, action)(**request.get('params', {}))
return self.handlers.get(action, self.apiInvalidRequest)(params)
def apiAddNote(self, params): def api_addNote(self, definition, mode):
args = self.prepareNoteArgs(params.get('definition'), params.get('mode')) args = self.prepareNoteArgs(definition, mode)
if args is not None: if args is not None:
return self.anki.addNote(args['deck'], args['model'], args['fields'], args['tags']) return self.anki.addNote(args['deck'], args['model'], args['fields'], args['tags'])
def apiCanAddNotes(self, params): def api_canAddNotes(self, definitions, modes):
states = [] states = []
for definition in params.get('definitions', []): for definition in definitions:
state = {} state = {}
for mode in params.get('modes', []): for mode in modes:
args = self.prepareNoteArgs(definition, mode) args = self.prepareNoteArgs(definition, mode)
state[mode] = args is not None and self.anki.canAddNote(args['deck'], args['model'], args['fields']) state[mode] = args is not None and self.anki.canAddNote(args['deck'], args['model'], args['fields'])
states.append(state) states.append(state)
return states return states
def apiGetVersion(self, params):
return {'version': constants.c['appVersion']}
def apiInvalidRequest(self, params):
return None