Max/LorenEteval_Furious
1
0
Fork 0
mirror of https://github.com/LorenEteval/Furious.git synced 2026-10-07 06:18:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Centralize connection lifecycle control

Browse Source 
Signed-off-by: Loren Eteval <loren.eteval@proton.me>
This commit is contained in:
Loren Eteval
2026-08-12 12:24:03 +08:00
parent a2401fa0d5
commit 8a0d082a32
18 changed files with 698 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Furious/Repository/Storage.py
+25 -23
View File
@@ -127,19 +127,15 @@ class Storage:
def UserHttpProxy() -> Union[str, None]:
"""Return the user HTTP proxy value."""
try:
if APP().isSystemTrayConnected():
index, servers = (
Storage.UserActivatedItemIndex(),
Storage.UserServers(),
)
controller = APP().connectionController
configuration = controller.activeConfiguration
if index >= 0:
return servers[index].httpProxy()
else:
# Should not reach here
return None
else:
return None
if controller.isConnected() and isinstance(
configuration, ServerProfile
):
return configuration.httpProxy()
return None
except Exception:
# Any non-exit exceptions
@@ -149,19 +145,25 @@ class Storage:
def UserServerRemark() -> Union[str, None]:
"""Return the user server remark value."""
try:
if APP().isSystemTrayConnected():
index, servers = (
Storage.UserActivatedItemIndex(),
Storage.UserServers(),
)
controller = APP().connectionController
configuration = controller.activeConfiguration
if index >= 0:
return f'{index + 1} - ' + servers[index].itemRemark
else:
# Should not reach here
return ''
else:
if not controller.isConnected() or not isinstance(
configuration, ServerProfile
):
return ''
index = next(
(
index
for index, server in enumerate(Storage.UserServers())
if server is configuration
),
-1,
)
prefix = f'{index + 1} - ' if index >= 0 else ''
return prefix + configuration.itemRemark
except Exception:
# Any non-exit exceptions