v3 update

Author: GoodCoder666

.github/workflows/pyinstaller.yml

@@ -16,15 +16,15 @@ jobs:
     - name: Checkout source code
       uses: actions/checkout@v4
 
-    - name: Set up Python 3.11
+    - name: Set up Python 3.12
       uses: actions/setup-python@v5
       with:
-        python-version: '3.11'
+        python-version: '3.12'
 
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install pyinstaller "PySide6-Essentials==6.4.0.1"
+        pip install pyinstaller "PySide6-Essentials==6.6.3.1" "aiohttp==3.12.15"
 
     - name: Install UPX
       uses: crazy-max/ghaction-upx@v3
@@ -49,15 +49,15 @@ jobs:
     - name: Checkout source code
       uses: actions/checkout@v4
 
-    - name: Set up Python 3.11
+    - name: Set up Python 3.12
       uses: actions/setup-python@v5
       with:
-        python-version: '3.11'
+        python-version: '3.12'
 
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install pyinstaller "PySide6-Essentials==6.4.0.1"
+        pip install pyinstaller "PySide6-Essentials==6.6.3.1" "aiohttp==3.12.15"
   
     - name: Package application
       run: |

MainWindow.ui

@@ -161,7 +161,11 @@
    <addaction name="optionsMenu"/>
    <addaction name="helpMenu"/>
   </widget>
-  <widget class="QStatusBar" name="statusbar"/>
+  <widget class="QStatusBar" name="statusbar">
+   <property name="sizeGripEnabled">
+    <bool>false</bool>
+   </property>
+  </widget>
   <action name="actSettings">
    <property name="text">
     <string>设置…</string>

README.md

@@ -84,14 +84,14 @@ Windows 11 系统演示如下：
 
 ## 从源代码运行
 
-从源代码运行的方法适用于所有支持图形界面的操作系统，只需 Python >= 3.6（额外安装 `PySide6` 包）。
+从源代码运行的方法适用于所有支持图形界面的操作系统，只需 Python >= 3.8（推荐 3.12 及以上版本）。
 
 对于 Linux 系统：
 
 ```bash
 $ git clone https://github.com/GoodCoder666/GoogleTranslate_IPFinder.git
 $ cd GoogleTranslate_IPFinder
-$ pip3 install PySide6
+$ pip3 install PySide6 aiohttp
 $ python3 main.py
 ```
 

dlgAbout.ui

@@ -73,7 +73,7 @@
    <item row="3" column="0">
     <widget class="QLabel" name="labCopyright">
      <property name="text">
-      <string>Copyright © GoodCoder666 2025</string>
+      <string>Copyright © GoodCoder666 2026</string>
      </property>
     </widget>
    </item>

dlgDebug.py

@@ -43,5 +43,5 @@ def _insertHtml(self, html):
     def _success(self, response_time):
         self._insertHtml(f'<font color="green"><b>成功 [{self.currentIP}]：响应时间 {time_repr(response_time)}</b></font><br/>')
 
-    def _fail(self, reason):
-        self._insertHtml(f'<font color="red"><b>失败 [{self.currentIP}]：{escape(reason)}</b></font><br/>')
+    def _fail(self, error_type, message):
+        self._insertHtml(f'<font color="red"><b>失败 [{self.currentIP}]：({error_type}) {escape(message)}</b></font><br/>')

dlgScan.ui

@@ -56,7 +56,7 @@
      <item>
       <widget class="QLabel" name="labThreads">
        <property name="text">
-        <string>最大线程数：</string>
+        <string>最大并发数：</string>
        </property>
       </widget>
      </item>
@@ -113,7 +113,22 @@
        </item>
        <item>
         <property name="text">
-         <string>200</string>
+         <string>256</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>512</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>768</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>1024</string>
         </property>
        </item>
       </widget>

dlgSettings.ui

@@ -198,7 +198,7 @@
          </sizepolicy>
         </property>
         <property name="text">
-         <string>线程数</string>
+         <string>并发数</string>
         </property>
        </widget>
       </item>

main.py

@@ -29,6 +29,33 @@ def __lt__(self, other):
         return self.secs < other.secs
 
 
+class ElidedLabel(QLabel):
+    def __init__(self, parent=None, mode=Qt.ElideRight):
+        super().__init__(parent)
+        self._mode = mode
+        self._full_text = ''
+        self.setWordWrap(False)
+        self.setTextInteractionFlags(Qt.NoTextInteraction)
+        self.setMinimumWidth(0)
+        self.setSizePolicy(QSizePolicy.Ignored, QSizePolicy.Preferred)
+
+    def setText(self, text: str):
+        self._full_text = text
+        self._update_elide()
+
+    def resizeEvent(self, event):
+        super().resizeEvent(event)
+        self._update_elide()
+
+    def _update_elide(self):
+        w = self.width()
+        if w > 0:
+            fm = self.fontMetrics()
+            super().setText(fm.elidedText(self._full_text, self._mode, w))
+        else:
+            super().setText(self._full_text)
+
+
 class MainWindow(QMainWindow):
     SUPPORTED_INPUT_FILTERS = QMainWindow.tr('文本文件(*.txt);;所有文件(*.*)')
     SUPPORTED_OUTPUT_FILTERS = QMainWindow.tr('文本文件(*.txt);;CSV 表格(*.csv);;所有文件(*.*)')
@@ -68,6 +95,10 @@ def __init__(self, parent=None):
         # clipboard
         self.clipboard = QApplication.clipboard()
 
+        # status bar
+        self.ui.statusbar.setContentsMargins(9, 0, 9, 0)
+        self.ui.statusbar.setStyleSheet('QStatusBar::item { border: none; }')
+
         # settings
         self.ui.actResetSettings.triggered.connect(self._reset_settings)
         self.settings = QSettings('GoodCoder666', 'IPFinder')
@@ -280,15 +311,15 @@ def _set_buttons_enabled(self, enabled):
         self.ui.btnWait_Test.setEnabled(enabled)
 
     def _init_progessBar(self, prog_max):
-        self.progressBar = QProgressBar(self)
-        self.progressBar.setFixedWidth(390)
+        self.progressBar = QProgressBar(self.ui.statusbar)
         self.progressBar.setRange(0, prog_max)
         self.progressBar.setValue(0)
-        self.logLabel = QLabel(self)
-        self.logLabel.setMaximumWidth(370)
+        self.progressBar.setMaximumHeight(18)
+        self.logLabel = ElidedLabel(self.ui.statusbar)
+        self.logLabel.setAlignment(Qt.AlignCenter)
         self.ui.statusbar.clearMessage()
-        self.ui.statusbar.addWidget(self.progressBar)
-        self.ui.statusbar.addWidget(self.logLabel)
+        self.ui.statusbar.addWidget(self.progressBar, 1)
+        self.ui.statusbar.addWidget(self.logLabel, 1)
 
     def _update_progressBar(self, dt=1):
         self.progressBar.setValue(self.progressBar.value() + dt)
@@ -301,21 +332,21 @@ def _remove_progessBar(self):
         self.progressBar.deleteLater()
         self.logLabel.deleteLater()
 
-    def _add_result(self, ip, seconds):
+    def _add_result(self, ip, latency):
         self.ui.resultTable.setSortingEnabled(False) # TODO: maybe there's a better way to temporarily disable sorting?
 
         row = self.ui.resultTable.rowCount()
         self.ui.resultTable.setRowCount(row + 1)
         self.ui.resultTable.setItem(row, 0, QTableWidgetItem(ip))
-        time_str = time_repr(seconds)
-        self.ui.resultTable.setItem(row, 1, QTableWidgetTimeItem(seconds, time_str))
+        time_str = time_repr(latency)
+        self.ui.resultTable.setItem(row, 1, QTableWidgetTimeItem(latency, time_str))
         self.logLabel.setText(self.tr('发现可用IP: %s [%s]') % (ip, time_str))
         self._update_progressBar()
 
         self.ui.resultTable.setSortingEnabled(True)
 
     def _found_unavailable(self, ip, reason):
-        self.logLabel.setText(self.tr('IP %s 不可用 [原因: %s]') % (ip, reason))
+        self.logLabel.setText(self.tr('IP %s 不可用 [%s]') % (ip, reason))
         self._update_progressBar()
 
     def _speedtest_finished(self):
@@ -327,20 +358,21 @@ def _test_ips(self, after_scan=True):
         self.ui.resultTable.setRowCount(0)
         ips = [self.ui.ipList.item(i).text() for i in range(self.ui.ipList.count())]
         if after_scan:
-            self.progressBar.setValue(0)
             self.progressBar.setMaximum(len(ips))
+            self.progressBar.setValue(0)
+            self.logLabel.setText(self.tr('扫描完成，开始测速...'))
             self.ui.btnWait_Scan.setText(self.tr('扫描'))
             self.ui.btnWait_Scan.setEnabled(False)
         else:
             self._init_progessBar(len(ips))
         thread = SpeedtestThread(self, ips,
                                  host=self.settings.value('test/host'),
                                  request_format=self.settings.value('test/template'),
-                                 available_callback=self._add_result,
-                                 unavailable_callback=self._found_unavailable,
                                  timeout=self.settings.value('test/timeout', type=float),
                                  repeat=self.settings.value('test/repeat', type=int),
                                  num_workers=self.settings.value('test/num_threads', type=int))
+        thread.foundAvailable.connect(self._add_result)
+        thread.foundUnavailable.connect(self._found_unavailable)
         thread.finished.connect(self._speedtest_finished)
         thread.start()
 
@@ -349,9 +381,9 @@ def on_btnWait_Test_clicked(self):
         self._set_buttons_enabled(False)
         self._test_ips(False)
 
-    def _report_single_scan_result(self, ip):
+    def _report_single_scan_result(self, ip, latency):
         self.ui.ipList.addItem(QListWidgetItem(ip))
-        self.logLabel.setText(self.tr('发现可用IP: %s') % ip)
+        self.logLabel.setText(self.tr('发现可用IP: %s [%s]') % (ip, time_repr(latency)))
 
     def _after_scan(self):
         self._set_buttons_enabled(True)
@@ -368,6 +400,9 @@ def on_btnWait_Scan_clicked(self):
 
         dlg = dlgScan(self, self.settings.value('scan/ranges'))
         if dlg.exec() == QDialog.Accepted:
+            # TODO: add separate host/template settings for scan?
+            host = self.settings.value('test/host')
+            request_format = self.settings.value('test/template')
             max_ips = dlg.ui.spinBox_MaxIP.value()
             num_workers = int(dlg.ui.comboBox_threads.currentText())
             timeout = dlg.ui.spinBox_timeout.value()
@@ -394,13 +429,13 @@ def on_btnWait_Scan_clicked(self):
             self._set_buttons_enabled(False)
             self.ui.ipList.clear()
 
-            thread = ScanThread(self, ip_networks, max_ips, num_workers, timeout, randomized)
+            thread = ScanThread(self, ip_networks, host, request_format,
+                                max_ips, num_workers, timeout, randomized)
             thread.finished.connect(self._test_ips if autoTest else self._after_scan)
             thread.foundAvailable.connect(self._report_single_scan_result)
             thread.progressUpdate.connect(self._scan_update)
-            total_addrs = sum(map(len, thread.networks))
-            self._init_progessBar(total_addrs)
-            self.logLabel.setText(self.tr('开始扫描，共 %n 个 IP...', '', total_addrs))
+            self._init_progessBar(thread.total_ips)
+            self.logLabel.setText(self.tr('开始扫描，共 %n 个 IP...', '', thread.total_ips))
             thread.start()
 
             self.sthread = thread

requirements.txt

@@ -1 +1,2 @@
-PySide6-Essentials
+PySide6-Essentials>=6.6.0,<7.0
+aiohttp>=3.8.1,<4.0