Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 18:24:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Dont use the horrible QLocalSocket for GUI IPC

Browse Source 
Fixes #2105415 [ERROR: Failed to update annotations after upgrading from 8.0.1 to 8.1.1 macOS](https://bugs.launchpad.net/calibre/+bug/2105415)
This commit is contained in:
Kovid Goyal 2025-03-30 14:51:24 +05:30
parent cea5d7f980
commit 05f17d0212
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/calibre/gui2/listener.py
View File

@ -4,11 +4,12 @@
import errno import errno
import os import os
import socket import socket
import sys
from contextlib import closing from contextlib import closing
from functools import partial from functools import partial
from itertools import count from itertools import count
from qt.core import QAbstractSocket, QByteArray, QLocalServer, QLocalSocket, pyqtSignal from qt.core import QAbstractSocket, QLocalServer, pyqtSignal
from calibre.utils.ipc import gui_socket_address from calibre.utils.ipc import gui_socket_address
@ -78,24 +79,15 @@ def send_message_in_process(msg, address=None, timeout=5):
address = address or gui_socket_address() address = address or gui_socket_address()
if isinstance(msg, str): if isinstance(msg, str):
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
s = QLocalSocket() if address.startswith('\\'):
qt_timeout = int(timeout * 1000) with open(address, 'r+b') as f:
if address.startswith('\0'): f.write(msg)
else:
ps = unix_socket(timeout) ps = unix_socket(timeout)
ps.connect(address) ps.connect(address)
s.setSocketDescriptor(ps.detach()) ps.sendall(msg)
else: ps.shutdown(socket.SHUT_RDWR)
s.connectToServer(address) ps.close()
if not s.waitForConnected(qt_timeout):
raise OSError(f'Failed to connect to Listener at: {address} with error: {s.errorString()}')
data = QByteArray(msg)
while True:
written = s.write(data)
if not s.waitForBytesWritten(qt_timeout):
raise OSError(f'Failed to write data to address: {s.serverName()} with error: {s.errorString()}')
if written >= len(data):
break
data = data.right(len(data) - written)
def send_message_via_worker(msg, address=None, timeout=5, wait_till_sent=False): def send_message_via_worker(msg, address=None, timeout=5, wait_till_sent=False):
@ -108,7 +100,7 @@ def send_message_via_worker(msg, address=None, timeout=5, wait_till_sent=False):
from calibre.startup import get_debug_executable from calibre.startup import get_debug_executable
cmd = get_debug_executable() + [ cmd = get_debug_executable() + [
'-c', 'from calibre.gui2.listener import *; import sys, json;' '-c', 'from calibre.gui2.listener import *; import sys, json;'
'send_message_implementation(sys.stdin.buffer.read(), address=json.loads(sys.argv[-2]), timeout=int(sys.argv[-1]))', 'send_message_in_process(sys.stdin.buffer.read(), address=json.loads(sys.argv[-2]), timeout=float(sys.argv[-1]))',
json.dumps(address), str(timeout)] json.dumps(address), str(timeout)]
p = subprocess.Popen(cmd, stdin=subprocess.PIPE) p = subprocess.Popen(cmd, stdin=subprocess.PIPE)
if isinstance(msg, str): if isinstance(msg, str):
@ -124,13 +116,19 @@ def test():
app = QApplication([]) app = QApplication([])
l = QLabel() l = QLabel()
l.setText('Waiting for message...') l.setText('Waiting for message...')
m = '123456789' * 8192 * 10
def show_message(msg): def show_message(msg):
print(msg) q = msg.decode()
l.setText(msg.decode('utf-8')) if q != m:
print(f'Received incorrect message of length: {len(q)} expecting length: {len(m)}', file=sys.stderr)
else:
print('Received msg correctly', file=sys.stderr)
l.setText(q)
QTimer.singleShot(1000, app.quit)
def send(): def send():
send_message_via_worker('hello!', wait_till_sent=False) send_message_via_worker(m, wait_till_sent=False)
QTimer.singleShot(1000, send) QTimer.singleShot(1000, send)
s = Listener(parent=l) s = Listener(parent=l)
@ -140,7 +138,6 @@ def test():
l.show() l.show()
app.exec() app.exec()
del app
if __name__ == '__main__': if __name__ == '__main__':