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

Refine server-table behavior

Browse Source 
Signed-off-by: Loren Eteval <loren.eteval@proton.me>
This commit is contained in:
Loren Eteval
2025-02-23 15:09:33 +08:00
parent 5be8e0e564
commit ad888fff79
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Furious/Widget/UserServersQTableWidget.py
+16 -15
View File
@@ -340,11 +340,11 @@ class TestDownloadSpeedWorker(WorkerSequence, QtCore.QObject):
self.currentItem.setExtras('speedResult', 'Starting')
self.updateResult()
copy = self.currentItem.deepcopy()
itemcopy = self.currentItem.deepcopy()
if isinstance(copy, ConfigurationXray):
if isinstance(itemcopy, ConfigurationXray):
# Force redirect
copy['inbounds'] = [
itemcopy['inbounds'] = [
{
'tag': 'http',
'port': 20809,
@@ -366,7 +366,7 @@ class TestDownloadSpeedWorker(WorkerSequence, QtCore.QObject):
]
try:
for outboundObject in copy['outbounds']:
for outboundObject in itemcopy['outbounds']:
if outboundObject['tag'] == 'proxy':
# Avoid confusion with potentially existing 'proxy' tag
outboundObject['tag'] = 'proxy20809'
@@ -376,7 +376,7 @@ class TestDownloadSpeedWorker(WorkerSequence, QtCore.QObject):
pass
self.coreManager.start(
copy,
itemcopy,
'Global',
coreExitCallback,
msgCallbackCore=msgCallback,
@@ -384,20 +384,20 @@ class TestDownloadSpeedWorker(WorkerSequence, QtCore.QObject):
proxyModeOnly=True,
log=False,
)
elif isinstance(copy, ConfigurationHysteria1) or isinstance(
copy, ConfigurationHysteria2
elif isinstance(itemcopy, ConfigurationHysteria1) or isinstance(
itemcopy, ConfigurationHysteria2
):
# Force redirect
copy['http'] = {
itemcopy['http'] = {
'listen': '127.0.0.1:20809',
'timeout': 300,
'disable_udp': False,
}
# No socks inbounds
copy.pop('socks5', '')
itemcopy.pop('socks5', '')
self.coreManager.start(
copy,
itemcopy,
'Global',
coreExitCallback,
msgCallbackCore=msgCallback,
@@ -459,7 +459,7 @@ class TestDownloadSpeedWorker(WorkerSequence, QtCore.QObject):
except Exception:
# Any non-exit exceptions
error = 'Unknown Error'
error = 'UnknownError'
if isinstance(error, bytes):
# Some old version PySide6 returns it as bytes. Protect it.
@@ -467,9 +467,9 @@ class TestDownloadSpeedWorker(WorkerSequence, QtCore.QObject):
elif isinstance(error, str):
errorString = error
else:
errorString = 'Unknown Error'
errorString = 'UnknownError'
if errorString.endswith('Error'):
if errorString != 'UnknownError' and errorString.endswith('Error'):
self.currentItem.setExtras('speedResult', errorString[:-5])
else:
self.currentItem.setExtras('speedResult', errorString)
@@ -968,7 +968,8 @@ class UserServersQTableWidget(QTranslatable, AppQTableWidget):
editor.accepted.disconnect()
editor.rejected.disconnect()
def handleGuiEditorRejected(self, editor: GuiEditorWidgetQDialog):
@staticmethod
def handleGuiEditorRejected(editor: GuiEditorWidgetQDialog):
editor.accepted.disconnect()
editor.rejected.disconnect()
@@ -1026,7 +1027,7 @@ class UserServersQTableWidget(QTranslatable, AppQTableWidget):
newItem = QTableWidgetItem(header(item))
if oldItem is None:
# Item does not exists
# Item does not exist
newItem.setFont(QFont(APP().customFontName))
if str(header) == 'Latency' or str(header) == 'Speed':