mirror of
https://github.com/yusufipk/dikte.git
synced 2026-09-12 03:16:19 +00:00
Let a second copy yield to the instance already running
listen() was the whole of the single-instance check and it cannot be one: a Windows named pipe takes a second server on the same name rather than refusing it, and everywhere else removeServer() first takes the live socket away from the instance holding it. Starting Dikte over a running Dikte then left two whole copies up, two tray icons and all, and the newer one's sweep() killed the whisper the older one was answering dictations with. On a machine that sleeps instead of logging out, that is one Start Menu click away, and it cost a real dictation before it was understood. A QLockFile in the data directory closes the race on all three systems, taken before the QApplication is even built, and behind it the probe is the side-effect-free status verb: the Settings window opens as the sign of life only when a bare second start deliberately asks for it, not as a byproduct of a probe racing a forwarded toggle. The two Windows relaunch dances collapse into one ipc.respawn. The checkout installer and the packaged setup each kept an autostart the other could not see, so a machine that tried both started two copies at every sign-in: each autostart now removes the other's entry, the silent every-start repair backs off from a Run value whose target still exists, and each uninstaller deletes the shared dikte.cmd only when the shim names its own install. Co-Authored-By: Claude Fable 5 <[email protected]>
This commit is contained in:
co-authored by
Claude Fable 5
parent
0a70484d84
commit
6f601ab969
@@ -14,6 +14,7 @@ import unittest
|
||||
from unittest import mock
|
||||
|
||||
from dikte import ipc
|
||||
from tests.support import DikteTest
|
||||
|
||||
|
||||
class FakeSocket:
|
||||
@@ -185,5 +186,74 @@ class Send(unittest.TestCase):
|
||||
self.assertTrue(sock.disconnected)
|
||||
|
||||
|
||||
class AlreadyServing(unittest.TestCase):
|
||||
"""The single-instance check, which listen() cannot be: a Windows pipe
|
||||
takes a second server on the same name rather than refusing it."""
|
||||
|
||||
def probe(self, socket):
|
||||
with mock.patch.object(ipc, "QLocalSocket", return_value=socket):
|
||||
return ipc.already_serving()
|
||||
|
||||
def test_nothing_running_means_go_ahead(self):
|
||||
self.assertFalse(self.probe(FakeSocket(connected=False)))
|
||||
|
||||
def test_an_answer_means_yield(self):
|
||||
self.assertTrue(self.probe(FakeSocket(reply=b'{"ok": true}\n')))
|
||||
|
||||
def test_the_probe_has_no_side_effect(self):
|
||||
"""A probe that opened a window would open it during the relaunch a
|
||||
slow instance provokes, on top of the verb being forwarded."""
|
||||
sock = FakeSocket(reply=b'{"ok": true}\n')
|
||||
self.probe(sock)
|
||||
self.assertEqual(sock.written.decode("utf-8").strip(), "status")
|
||||
|
||||
def test_an_instance_too_old_to_answer_still_counts_as_running(self):
|
||||
self.assertTrue(self.probe(FakeSocket(reply=b"")))
|
||||
|
||||
|
||||
class InstanceLock(DikteTest):
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
# The lock derives its home from paths, which DikteTest's cfg patches
|
||||
# do not cover; without this the test would write into the real one.
|
||||
from dikte import paths
|
||||
self.patch_attr(paths, "DATA_DIR", self.path("data"))
|
||||
|
||||
def test_one_holder_at_a_time(self):
|
||||
first = ipc.instance_lock()
|
||||
self.assertIsNotNone(first)
|
||||
self.assertTrue(first.tryLock(0))
|
||||
second = ipc.instance_lock()
|
||||
self.assertFalse(second.tryLock(0))
|
||||
first.unlock()
|
||||
self.assertTrue(second.tryLock(0))
|
||||
second.unlock()
|
||||
|
||||
def test_the_lock_lives_in_the_data_directory(self):
|
||||
from dikte import paths
|
||||
lock = ipc.instance_lock()
|
||||
self.assertTrue(lock.tryLock(0))
|
||||
self.assertTrue((paths.DATA_DIR / "dikte.lock").exists())
|
||||
lock.unlock()
|
||||
|
||||
|
||||
class Respawn(unittest.TestCase):
|
||||
def test_windows_starts_a_detached_process_and_returns(self):
|
||||
with mock.patch.object(sys, "platform", "win32"), \
|
||||
mock.patch.object(ipc, "launcher", return_value=["py", "x"]), \
|
||||
mock.patch.object(ipc.subprocess, "Popen") as popen:
|
||||
ipc.respawn(["--gui"])
|
||||
self.assertEqual(popen.call_args.args[0], ["py", "x", "--gui"])
|
||||
self.assertEqual(popen.call_args.kwargs["creationflags"],
|
||||
0x00000008 | 0x00000200)
|
||||
|
||||
def test_everywhere_else_the_process_is_replaced(self):
|
||||
with mock.patch.object(sys, "platform", "linux"), \
|
||||
mock.patch.object(ipc, "launcher", return_value=["py", "x"]), \
|
||||
mock.patch.object(ipc.os, "execv") as execv:
|
||||
ipc.respawn(["toggle", "--gui"])
|
||||
execv.assert_called_once_with("py", ["py", "x", "toggle", "--gui"])
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
|
||||
Reference in New Issue
Block a user