From 02e1cfbe5d9cb888e089025ff9ed8dda1faa09df Mon Sep 17 00:00:00 2001 From: Loren Eteval Date: Tue, 5 Sep 2023 11:04:07 +0800 Subject: [PATCH] Refine Tor relay behavior Signed-off-by: Loren Eteval --- Furious/Core/TorRelay.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Furious/Core/TorRelay.py b/Furious/Core/TorRelay.py index c3bc572..3ecd9be 100644 --- a/Furious/Core/TorRelay.py +++ b/Furious/Core/TorRelay.py @@ -22,7 +22,7 @@ from Furious.Utility.Constants import ( DEFAULT_TOR_SOCKS_PORT, DEFAULT_TOR_HTTPS_PORT, ) -from Furious.Utility.Utility import AsyncSubprocessMessage +from Furious.Utility.Utility import AsyncSubprocessMessage, runCommand from PySide6 import QtCore @@ -37,7 +37,7 @@ logger = logging.getLogger(__name__) class TorRelayStarter(AsyncSubprocessMessage): - BOOTSTRAP_STATUS = re.compile('Bootstrapped ([0-9]+)%') + BOOTSTRAP_STATUS = re.compile(r'Bootstrapped ([0-9]+)%') def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) @@ -103,12 +103,11 @@ class TorRelayStarter(AsyncSubprocessMessage): @functools.lru_cache(None) def getTorRelayVersion(): try: - result = subprocess.run( + result = runCommand( ['tor', '--version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=True, - creationflags=subprocess.CREATE_NO_WINDOW, ) # First line, 3rd param...