refactor: clean up threading logic

Author: GoodCoder666

constants.py

@@ -8,7 +8,7 @@ class DefaultConfig:
     test_host = 'translate.googleapis.com'
     save_hosts = ['translate.googleapis.com', 'translate-pa.googleapis.com']
     template = 'https://{}/translate_a/single?client=gtx&sl=en&tl=fr&q=a'
-    num_threads = 64
+    num_workers = 64
     timeout = 1.5
     repeat = 3
 

dlgSettings.py

@@ -33,7 +33,7 @@ def __init__(self, parent, settings, default_font):
         self.ui.spinBox_fontSize.setValue(font.pointSize())
         self.ui.hostEdit.setText(settings.value('test/host'))
         self.ui.templateEdit.setText(settings.value('test/template'))
-        self.ui.spinBox_threads.setValue(settings.value('test/num_threads', type=int))
+        self.ui.spinBox_workers.setValue(settings.value('test/num_workers', type=int))
         self.ui.doubleSpinBox_timeout.setValue(settings.value('test/timeout', type=float))
         self.ui.spinBox_repeat.setValue(settings.value('test/repeat', type=int))
         self._set_save_hosts(settings.value('saveHosts'))
@@ -60,7 +60,7 @@ def apply(self, settings):
         settings.setValue('appearance/font', font)
         settings.setValue('test/host', self.ui.hostEdit.text())
         settings.setValue('test/template', self.ui.templateEdit.text())
-        settings.setValue('test/num_threads', self.ui.spinBox_threads.value())
+        settings.setValue('test/num_workers', self.ui.spinBox_workers.value())
         settings.setValue('test/timeout', self.ui.doubleSpinBox_timeout.value())
         settings.setValue('test/repeat', self.ui.spinBox_repeat.value())
         settings.setValue('saveHosts', self._get_save_hosts())
@@ -74,7 +74,7 @@ def on_btnRestoreDefaults_clicked(self):
         self.ui.spinBox_fontSize.setValue(self.default_font.pointSize())
         self.ui.hostEdit.setText(DefaultConfig.test_host)
         self.ui.templateEdit.setText(DefaultConfig.template)
-        self.ui.spinBox_threads.setValue(DefaultConfig.num_threads)
+        self.ui.spinBox_workers.setValue(DefaultConfig.num_workers)
         self.ui.doubleSpinBox_timeout.setValue(DefaultConfig.timeout)
         self.ui.spinBox_repeat.setValue(DefaultConfig.repeat)
         self._set_save_hosts(DefaultConfig.save_hosts)

dlgSettings.ui

@@ -213,7 +213,7 @@
        </widget>
       </item>
       <item row="3" column="1">
-       <widget class="QSpinBox" name="spinBox_threads">
+       <widget class="QSpinBox" name="spinBox_workers">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
           <horstretch>0</horstretch>

main.py

@@ -104,7 +104,7 @@ def __init__(self, parent=None):
         self.settings = QSettings('GoodCoder666', 'IPFinder')
         if set(self.settings.allKeys()) == {
                 'appearance/style', 'appearance/font', 'appearance/language', 'scan/ranges', 'test/host',
-                'test/template', 'test/num_threads', 'test/timeout', 'test/repeat', 'saveHosts'}:
+                'test/template', 'test/num_workers', 'test/timeout', 'test/repeat', 'saveHosts'}:
             self._update_ui()
         else:
             self._reset_settings()
@@ -165,7 +165,7 @@ def _reset_settings(self):
         self.settings.setValue('scan/ranges', DefaultConfig.scan_ranges)
         self.settings.setValue('test/host', DefaultConfig.test_host)
         self.settings.setValue('test/template', DefaultConfig.template)
-        self.settings.setValue('test/num_threads', DefaultConfig.num_threads)
+        self.settings.setValue('test/num_workers', DefaultConfig.num_workers)
         self.settings.setValue('test/timeout', DefaultConfig.timeout)
         self.settings.setValue('test/repeat', DefaultConfig.repeat)
         self.settings.setValue('saveHosts', DefaultConfig.save_hosts)
@@ -370,7 +370,7 @@ def _test_ips(self, after_scan=True):
                                  request_format=self.settings.value('test/template'),
                                  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))
+                                 num_workers=self.settings.value('test/num_workers', type=int))
         thread.foundAvailable.connect(self._add_result)
         thread.foundUnavailable.connect(self._found_unavailable)
         thread.finished.connect(self._speedtest_finished)

ui_dlgSettings.py

@@ -150,15 +150,15 @@ def setupUi(self, Dialog):
 
         self.gridLayout_2.addWidget(self.hostEdit, 0, 1, 1, 1)
 
-        self.spinBox_threads = QSpinBox(self.groupBox_speedTest)
-        self.spinBox_threads.setObjectName(u"spinBox_threads")
-        sizePolicy2.setHeightForWidth(self.spinBox_threads.sizePolicy().hasHeightForWidth())
-        self.spinBox_threads.setSizePolicy(sizePolicy2)
-        self.spinBox_threads.setMinimum(1)
-        self.spinBox_threads.setMaximum(256)
-        self.spinBox_threads.setValue(64)
-
-        self.gridLayout_2.addWidget(self.spinBox_threads, 3, 1, 1, 1)
+        self.spinBox_workers = QSpinBox(self.groupBox_speedTest)
+        self.spinBox_workers.setObjectName(u"spinBox_workers")
+        sizePolicy2.setHeightForWidth(self.spinBox_workers.sizePolicy().hasHeightForWidth())
+        self.spinBox_workers.setSizePolicy(sizePolicy2)
+        self.spinBox_workers.setMinimum(1)
+        self.spinBox_workers.setMaximum(256)
+        self.spinBox_workers.setValue(64)
+
+        self.gridLayout_2.addWidget(self.spinBox_workers, 3, 1, 1, 1)
 
         self.labTimeout = QLabel(self.groupBox_speedTest)
         self.labTimeout.setObjectName(u"labTimeout")