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

Cleanup develop code and dont output trailing commas for JSON

Browse Source
This commit is contained in:
Kovid Goyal 2023-01-24 18:07:08 +05:30
parent a58baba395
commit 4d23f9649a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/utils/windows/winspeech.cpp
View File

@ -205,20 +205,24 @@ public:
return serialize_string_for_json(s, out);
case DT_LIST: {
out << '[';
bool first = true;
for (auto const &i : list) {
if (!first) out << ", ";
first = false;
i.serialize(out);
out << ", ";
}
out << ']';
break;
}
case DT_OBJECT: {
out << '{';
bool first = true;
for (const auto& [key, value]: object) {
if (!first) out << ", ";
first = false;
serialize_string_for_json(key, out);
out << ": ";
value.serialize(out);
out << ", ";
}
out << '}';
break;

23
src/calibre/utils/windows/winspeech.py
View File

@ -2,22 +2,34 @@
# License: GPLv3 Copyright: 2023, Kovid Goyal <kovid at kovidgoyal.net>
import json
import sys
import time
from contextlib import closing
from queue import Queue
from threading import Thread
from calibre.utils.ipc.simple_worker import start_pipe_worker
def decode_msg(line: bytes) -> dict:
parts = line.strip().split(b' ', 2)
msg_id, msg_type, ans = int(parts[0]), parts[1].decode(), json.loads(parts[2])
ans['related_to'] = msg_id
ans['payload_type'] = msg_type
return ans
def develop_speech(text='Lucca brazzi sleeps with the fishes'):
p = start_pipe_worker('from calibre_extensions.winspeech import run_main_loop; run_main_loop()')
print('\x1b[32mSpeaking', text, '\x1b[39m', flush=True)
print('\x1b[32mSpeaking', text, '\x1b[39m', flush=True) # ]]
q = Queue()
def echo_output(p):
for line in p.stdout:
sys.stdout.buffer.write(b'\x1b[33m' + line + b'\x1b[39m')
sys.stdout.buffer.write(b'\x1b[33m' + line + b'\x1b[39m') # ]]
sys.stdout.buffer.flush()
q.put(decode_msg(line))
def send(*a):
cmd = ' '.join(map(str, a)) + '\n'
@ -29,10 +41,13 @@ def develop_speech(text='Lucca brazzi sleeps with the fishes'):
try:
send('1 echo Synthesizer started')
send('2 speak text inline', text)
time.sleep(6)
while True:
m = q.get()
if m['payload_type'] == 'media_state_changed' and m['state'] == 'ended':
break
send('3 echo Synthesizer exiting')
send('exit')
time.sleep(1)
p.wait(1)
finally:
if p.poll() is None:
p.kill()