From a6df569719f85fbc4baa5684ee9285739710ea5f Mon Sep 17 00:00:00 2001 From: Aidan Timson Date: Wed, 4 May 2022 12:47:49 +0100 Subject: [PATCH 1/6] Use pythonw instead of hiding window on startup --- backend/requirements_windows.txt | 1 - backend/setup.py | 7 ------- backend/systembridgebackend/autostart/windows.py | 3 ++- backend/systembridgebackend/server/__init__.py | 2 +- backend/systembridgebackend/shortcut/windows.py | 2 +- 5 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 backend/requirements_windows.txt diff --git a/backend/requirements_windows.txt b/backend/requirements_windows.txt deleted file mode 100644 index e44f79e15..000000000 --- a/backend/requirements_windows.txt +++ /dev/null @@ -1 +0,0 @@ -pywin32==304 diff --git a/backend/setup.py b/backend/setup.py index 6e381d5d7..6e17b4835 100644 --- a/backend/setup.py +++ b/backend/setup.py @@ -12,13 +12,6 @@ with io.open("requirements.txt", encoding="utf-8") as f: requirements = f.read().splitlines() -if platform.system() == "Windows": - with io.open("requirements_windows.txt", encoding="utf-8") as f: - requirements = [ - *requirements, - *f.read().splitlines(), - ] - package_data = ["icon.png", "icon.ico"] setup( diff --git a/backend/systembridgebackend/autostart/windows.py b/backend/systembridgebackend/autostart/windows.py index 00ac09331..42b7f9e74 100644 --- a/backend/systembridgebackend/autostart/windows.py +++ b/backend/systembridgebackend/autostart/windows.py @@ -1,4 +1,5 @@ """System Bridge: Autostart Windows""" +import os import platform import sys @@ -52,6 +53,6 @@ def autostart_windows_enable(): "systembridgebackend", 0, REG_SZ, - f'"{sys.executable}" -m systembridgebackend --silent', + f'"{os.path.join(os.path.dirname(sys.executable), "pythonw.exe")}" -m systembridgebackend --silent', ) CloseKey(key) diff --git a/backend/systembridgebackend/server/__init__.py b/backend/systembridgebackend/server/__init__.py index 12b0f0ff9..fb95ea6b4 100644 --- a/backend/systembridgebackend/server/__init__.py +++ b/backend/systembridgebackend/server/__init__.py @@ -348,6 +348,7 @@ def start_server(self) -> None: debug=self._settings.get(SETTING_LOG_LEVEL) == "DEBUG", motd=False, ) + self._logger.info("After server start") def stop_server(self) -> None: """Stop Server""" @@ -358,6 +359,5 @@ def stop_server(self) -> None: pending_task.cancel() self._logger.info("Stop the event loop") loop.stop() - # self._server.enable_websocket(False) self._listeners.remove_all_listeners() self._server.stop() diff --git a/backend/systembridgebackend/shortcut/windows.py b/backend/systembridgebackend/shortcut/windows.py index c715da939..4e77ffc61 100644 --- a/backend/systembridgebackend/shortcut/windows.py +++ b/backend/systembridgebackend/shortcut/windows.py @@ -37,6 +37,6 @@ def create_windows_shortcuts(): shortcut.Arguments = "-m systembridgebackend --silent" shortcut.Description = "System Bridge" shortcut.IconLocation = os.path.join(os.path.dirname(__file__), "../icon.ico") - shortcut.Targetpath = sys.executable + shortcut.Targetpath = os.path.join(os.path.dirname(sys.executable), "pythonw.exe") shortcut.WorkingDirectory = sys.prefix shortcut.save() From ba6b10051dc8aea76db5aa8cb99f24ba87867f5b Mon Sep 17 00:00:00 2001 From: Aidan Timson Date: Wed, 4 May 2022 12:54:15 +0100 Subject: [PATCH 2/6] Run windows sensors as windows application instead of console --- windowssensors/WindowsSensors/SystemBridgeWindowsSensors.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windowssensors/WindowsSensors/SystemBridgeWindowsSensors.csproj b/windowssensors/WindowsSensors/SystemBridgeWindowsSensors.csproj index f874f56ef..809fa2625 100644 --- a/windowssensors/WindowsSensors/SystemBridgeWindowsSensors.csproj +++ b/windowssensors/WindowsSensors/SystemBridgeWindowsSensors.csproj @@ -5,7 +5,7 @@ Debug AnyCPU {058EAD2E-13C9-4586-9039-AE097F3AC080} - Exe + WinExe SystemBridgeWindowsSensors SystemBridgeWindowsSensors v4.8 From 15c98ad614d59bde98f6f47a78da954a54eb111d Mon Sep 17 00:00:00 2001 From: Aidan Timson Date: Wed, 4 May 2022 12:57:14 +0100 Subject: [PATCH 3/6] Cleanup --- backend/systembridgebackend/server/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/systembridgebackend/server/__init__.py b/backend/systembridgebackend/server/__init__.py index fb95ea6b4..aa79c3686 100644 --- a/backend/systembridgebackend/server/__init__.py +++ b/backend/systembridgebackend/server/__init__.py @@ -348,7 +348,6 @@ def start_server(self) -> None: debug=self._settings.get(SETTING_LOG_LEVEL) == "DEBUG", motd=False, ) - self._logger.info("After server start") def stop_server(self) -> None: """Stop Server""" From f379f2aaaa7c543555a2066b18f02542157d6cdf Mon Sep 17 00:00:00 2001 From: Aidan Timson Date: Thu, 12 May 2022 21:54:55 +0100 Subject: [PATCH 4/6] Run as admin --- windowssensors/WindowsSensors/app.manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windowssensors/WindowsSensors/app.manifest b/windowssensors/WindowsSensors/app.manifest index 9c055ce49..3665dcf45 100644 --- a/windowssensors/WindowsSensors/app.manifest +++ b/windowssensors/WindowsSensors/app.manifest @@ -4,7 +4,7 @@ - + From 1e608305dcafd3ff25c1bb3dc830b2b3576be533 Mon Sep 17 00:00:00 2001 From: Aidan Timson Date: Thu, 30 Jun 2022 12:33:23 +0100 Subject: [PATCH 5/6] asInvoker --- windowssensors/WindowsSensors/app.manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windowssensors/WindowsSensors/app.manifest b/windowssensors/WindowsSensors/app.manifest index 3665dcf45..9c055ce49 100644 --- a/windowssensors/WindowsSensors/app.manifest +++ b/windowssensors/WindowsSensors/app.manifest @@ -4,7 +4,7 @@ - + From 4c115686c3b97ff6b8cea378da64054abff809b2 Mon Sep 17 00:00:00 2001 From: Aidan Timson Date: Thu, 30 Jun 2022 13:42:20 +0100 Subject: [PATCH 6/6] Remove unused import --- backend/setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/setup.py b/backend/setup.py index 6e17b4835..3be383282 100644 --- a/backend/setup.py +++ b/backend/setup.py @@ -1,6 +1,5 @@ """Setup""" import io -import platform from setuptools import find_packages, setup