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

allow pycmd() to return a value

Browse source 
based on pull request #228
This commit is contained in:
Damien Elmes 2018-03-08 17:48:14 +10:00
parent cf3cab2101
commit 56e1643bfa
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
aqt/webview.py
View file

@ -1,7 +1,7 @@
# Copyright: Damien Elmes <anki@ichi2.net> # Copyright: Damien Elmes <anki@ichi2.net>
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# 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 json
import sys import sys
import math import math
from anki.hooks import runHook from anki.hooks import runHook
@ -22,9 +22,9 @@ class AnkiWebPage(QWebEnginePage):
def _setupBridge(self): def _setupBridge(self):
class Bridge(QObject): class Bridge(QObject):
@pyqtSlot(str) @pyqtSlot(str, result=str)
def cmd(self, str): def cmd(self, str):
self.onCmd(str) return json.dumps(self.onCmd(str))
self._bridge = Bridge() self._bridge = Bridge()
self._bridge.onCmd = self._onCmd self._bridge.onCmd = self._onCmd
@ -41,7 +41,16 @@ class AnkiWebPage(QWebEnginePage):
script.setSourceCode(js + ''' script.setSourceCode(js + '''
var pycmd; var pycmd;
new QWebChannel(qt.webChannelTransport, function(channel) { new QWebChannel(qt.webChannelTransport, function(channel) {
pycmd = channel.objects.py.cmd; pycmd = function (arg, cb) {
var resultCB = function (res) {
// pass result back to user-provided callback
if (cb) {
cb(JSON.parse(res));
}
}
channel.objects.py.cmd(arg, resultCB);
}
pycmd("domDone"); pycmd("domDone");
}); });
''') ''')
@ -68,7 +77,7 @@ class AnkiWebPage(QWebEnginePage):
return False return False
def _onCmd(self, str): def _onCmd(self, str):
self._onBridgeCmd(str) return self._onBridgeCmd(str)
# Main web view # Main web view
########################################################################## ##########################################################################
@ -293,7 +302,7 @@ body {{ zoom: {}; {} }}
self._domDone = True self._domDone = True
self._maybeRunActions() self._maybeRunActions()
else: else:
self.onBridgeCmd(cmd) return self.onBridgeCmd(cmd)
def defaultOnBridgeCmd(self, cmd): def defaultOnBridgeCmd(self, cmd):
print("unhandled bridge cmd:", cmd) print("unhandled bridge cmd:", cmd)