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

Rename "network state" to "network connectivity"

Browse Source 
Signed-off-by: Loren Eteval <loren.eteval@proton.me>
This commit is contained in:
Loren Eteval
2026-04-05 01:19:48 +08:00
parent 77a13edca1
commit e0bbe4b22a
6 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Furious/Externals/GenTranslation.py
Vendored
+3 -3
View File
@@ -1835,12 +1835,12 @@ TRANSLATION = {
"ZH": "输入网络速度测试URL：",
"isReviewed": "True"
},
"Enter network state test URL:": {
"Enter network connectivity test URL:": {
"source": [
"Furious.Widget.GuiCustomizeNetworkTest"
],
"RU": "Введите URL теста состояния сети:",
"ZH": "输入网络状态测试URL：",
"RU": "Введите URL теста подключения к сети:",
"ZH": "输入网络连通性测试URL：",
"isReviewed": "True"
},
"Activate Selected Server": {
Furious/Frozenlib/Constants.py
+1 -1
View File
@@ -111,7 +111,7 @@ APPLICATION_TUN_INTERFACE_DNS_ADDRESS = '1.1.1.1'
ADMINISTRATOR_NAME = 'Administrator' if PLATFORM == 'Windows' else 'Superuser'
NETWORK_STATE_TEST_URL = 'http://cp.cloudflare.com'
NETWORK_CONNECTIVITY_TEST_URL = 'http://cp.cloudflare.com'
# Fixed to 95MB
NETWORK_SPEED_TEST_URL = (
f'http://speed.cloudflare.com/__down?during=download&bytes={95 * 1024 * 1024}'
Furious/Qt/NetworkStateManager.py → Furious/Qt/NetworkConnectivityManager.py
+13 -13
View File
@@ -26,22 +26,22 @@ from PySide6.QtNetwork import *
import logging
import functools
__all__ = ['NetworkStateManager']
__all__ = ['NetworkConnectivityManager']
logger = logging.getLogger(__name__)
class NetworkStateManager(Mixins.ConnectionAware, WebGETManager):
class NetworkConnectivityManager(Mixins.ConnectionAware, WebGETManager):
MIN_JOB_INTERVAL = 2500
MAX_JOB_INTERVAL = 2000000000
def __init__(self, parent=None, **kwargs):
actionMessage = kwargs.pop('actionMessage', 'test network state')
actionMessage = kwargs.pop('actionMessage', 'test network connectivity')
super().__init__(parent, actionMessage=actionMessage)
self.jobStatus = False
self.jobInterval = NetworkStateManager.MIN_JOB_INTERVAL
self.jobInterval = NetworkConnectivityManager.MIN_JOB_INTERVAL
self.jobTimeoutTimer = QtCore.QTimer()
self.jobArrangeTimer = QtCore.QTimer()
@@ -54,13 +54,13 @@ class NetworkStateManager(Mixins.ConnectionAware, WebGETManager):
if self.jobStatus is jobStatus:
self.jobInterval *= 2
else:
self.jobInterval = NetworkStateManager.MIN_JOB_INTERVAL
self.jobInterval = NetworkConnectivityManager.MIN_JOB_INTERVAL
self.jobStatus = jobStatus
if self.jobInterval >= NetworkStateManager.MAX_JOB_INTERVAL:
if self.jobInterval >= NetworkConnectivityManager.MAX_JOB_INTERVAL:
# Limited
self.jobInterval = NetworkStateManager.MAX_JOB_INTERVAL
self.jobInterval = NetworkConnectivityManager.MAX_JOB_INTERVAL
return self.jobInterval
@@ -73,11 +73,11 @@ class NetworkStateManager(Mixins.ConnectionAware, WebGETManager):
self.jobArrangeTimer.start(self.recalculateJobInterval(jobStatus=False))
def startSingleTest(self):
# Use custom network state test URL if possible
settings = AppSettings.get('CustomNetworkStateTestURL')
# Use custom network connectivity test URL if possible
settings = AppSettings.get('CustomNetworkConnectivityTestURL')
if settings is None:
url = NETWORK_SPEED_TEST_URL
url = NETWORK_CONNECTIVITY_TEST_URL
else:
url = settings
@@ -88,7 +88,7 @@ class NetworkStateManager(Mixins.ConnectionAware, WebGETManager):
_networkReply.abort()
self.jobTimeoutTimer.timeout.connect(functools.partial(abort, networkReply))
self.jobTimeoutTimer.start(NetworkStateManager.MIN_JOB_INTERVAL - 500)
self.jobTimeoutTimer.start(NetworkConnectivityManager.MIN_JOB_INTERVAL - 500)
def stopTest(self):
self.jobArrangeTimer.stop()
@@ -97,11 +97,11 @@ class NetworkStateManager(Mixins.ConnectionAware, WebGETManager):
def connectedCallback(self):
if AppSettings.isStateON_('PowerSaveMode'):
# Power optimization
logger.info('no job for network state manager in power save mode')
logger.info('no job for network connectivity manager in power save mode')
self.stopTest()
else:
self.jobInterval = NetworkStateManager.MIN_JOB_INTERVAL
self.jobInterval = NetworkConnectivityManager.MIN_JOB_INTERVAL
self.jobArrangeTimer.start(self.jobInterval)
Furious/Qt/__init__.py
+1 -1
View File
@@ -19,7 +19,7 @@ from .DNSResolver import *
from .DynamicTheme import *
from .DynamicTranslate import *
from .GuiEditorXXX import *
from .NetworkStateManager import *
from .NetworkConnectivityManager import *
from .QtGui import *
from .QtNetwork import *
from .QtWidgets import *
Furious/Widget/GuiCustomizeNetworkTest.py
+28 -28
View File
@@ -32,7 +32,7 @@ __all__ = ['GuiCustomizeNetworkTestDialog']
logger = logging.getLogger(__name__)
registerAppSettings('CustomNetworkSpeedTestURL')
registerAppSettings('CustomNetworkStateTestURL')
registerAppSettings('CustomNetworkConnectivityTestURL')
class GuiCustomizeNetworkTestDialog(AppQDialog):
@@ -45,22 +45,22 @@ class GuiCustomizeNetworkTestDialog(AppQDialog):
self.speedTestURLText = AppQLabel(_('Enter network speed test URL:'))
self.speedTestURLEdit = QLineEdit()
speedTestSettings = AppSettings.get('CustomNetworkSpeedTestURL')
speedTestURLSettings = AppSettings.get('CustomNetworkSpeedTestURL')
if speedTestSettings is None:
if speedTestURLSettings is None:
self.speedTestURLEdit.setText(NETWORK_SPEED_TEST_URL)
else:
self.speedTestURLEdit.setText(speedTestSettings)
self.speedTestURLEdit.setText(speedTestURLSettings)
self.stateTestURLText = AppQLabel(_('Enter network state test URL:'))
self.stateTestURLEdit = QLineEdit()
self.connectivityText = AppQLabel(_('Enter network connectivity test URL:'))
self.connectivityEdit = QLineEdit()
stateTestSettings = AppSettings.get('CustomNetworkStateTestURL')
connectivitySettings = AppSettings.get('CustomNetworkConnectivityTestURL')
if stateTestSettings is None:
self.stateTestURLEdit.setText(NETWORK_STATE_TEST_URL)
if connectivitySettings is None:
self.connectivityEdit.setText(NETWORK_CONNECTIVITY_TEST_URL)
else:
self.stateTestURLEdit.setText(stateTestSettings)
self.connectivityEdit.setText(connectivitySettings)
self.dialogBtns = AppQDialogButtonBox(QtCore.Qt.Orientation.Horizontal)
self.dialogBtns.addButton(_('OK'), AppQDialogButtonBox.ButtonRole.AcceptRole)
@@ -70,28 +70,28 @@ class GuiCustomizeNetworkTestDialog(AppQDialog):
self.dialogBtns.accepted.connect(self.accept)
self.dialogBtns.rejected.connect(self.reject)
self.speedTestResetBtn = AppQPushButton(_('Reset'))
self.speedTestResetBtn.clicked.connect(
self.speedTestURLResetBtn = AppQPushButton(_('Reset'))
self.speedTestURLResetBtn.clicked.connect(
lambda: self.speedTestURLEdit.setText(NETWORK_SPEED_TEST_URL)
)
self.stateTestResetBtn = AppQPushButton(_('Reset'))
self.stateTestResetBtn.clicked.connect(
lambda: self.stateTestURLEdit.setText(NETWORK_STATE_TEST_URL)
self.connectivityResetBtn = AppQPushButton(_('Reset'))
self.connectivityResetBtn.clicked.connect(
lambda: self.connectivityEdit.setText(NETWORK_CONNECTIVITY_TEST_URL)
)
self.speedTestHboxLayout = QHBoxLayout()
self.speedTestHboxLayout.addWidget(self.speedTestURLEdit)
self.speedTestHboxLayout.addWidget(self.speedTestResetBtn)
self.speedTestURLHboxLayout = QHBoxLayout()
self.speedTestURLHboxLayout.addWidget(self.speedTestURLEdit)
self.speedTestURLHboxLayout.addWidget(self.speedTestURLResetBtn)
self.stateTestHboxLayout = QHBoxLayout()
self.stateTestHboxLayout.addWidget(self.stateTestURLEdit)
self.stateTestHboxLayout.addWidget(self.stateTestResetBtn)
self.connectivityHboxLayout = QHBoxLayout()
self.connectivityHboxLayout.addWidget(self.connectivityEdit)
self.connectivityHboxLayout.addWidget(self.connectivityResetBtn)
layout = QFormLayout()
layout.addRow(self.speedTestURLText)
layout.addRow(self.speedTestHboxLayout)
layout.addRow(self.stateTestURLText)
layout.addRow(self.stateTestHboxLayout)
layout.addRow(self.speedTestURLHboxLayout)
layout.addRow(self.connectivityText)
layout.addRow(self.connectivityHboxLayout)
layout.addRow(self.dialogBtns)
layout.setFormAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
@@ -111,10 +111,10 @@ class GuiCustomizeNetworkTestDialog(AppQDialog):
NETWORK_SPEED_TEST_URL,
),
(
self.stateTestURLEdit,
'state test URL',
'CustomNetworkStateTestURL',
NETWORK_STATE_TEST_URL,
self.connectivityEdit,
'connectivity test URL',
'CustomNetworkConnectivityTestURL',
NETWORK_CONNECTIVITY_TEST_URL,
),
]:
if code == PySide6Legacy.enumValueWrapper(AppQDialog.DialogCode.Accepted):
Furious/Window/AppMainWindow.py
+2 -2
View File
@@ -49,7 +49,7 @@ registerAppSettings('AppMainWindowGeometry')
registerAppSettings('AppMainWindowState')
class AppNetworkStateManager(NetworkStateManager):
class AppNetworkConnectivityManager(NetworkConnectivityManager):
def __init__(self, parent=None):
super().__init__(parent)
@@ -117,7 +117,7 @@ class AppMainWindow(AppQMainWindow):
# self.setAttribute(QtCore.Qt.WidgetAttribute.WA_ShowWithoutActivating)
self.updatesManager = UpdatesManager(parent=self)
self.networkStateManager = AppNetworkStateManager(parent=self)
self.networkConnectivityManager = AppNetworkConnectivityManager(parent=self)
self.userServersQTableWidget = UserServersQTableWidget(parent=self)
self.userSubsWindow = UserSubsWindow(