Changed threads to workers in MainPresenter, added russian README

MainPresenter.py

@@ -1,8 +1,9 @@
 from network_scan.CoreModel import CoreModel
 from address_generation.Parser import Parser
-import threading
+from threading import RLock
 import datetime
-from PyQt5.Qt import *
+from PyQt5.Qt import QThread, pyqtSignal
+from PyQt5.QtCore import QObject, pyqtSlot
 from address_generation.IpGenerator import IpGenerator
 from storage.JSONStorage import JSONStorage
 
@@ -15,80 +16,94 @@ class MainPresenter:
         self.parser = Parser()
         #needed config to specify path
         self.storage = JSONStorage("results.json")
+        self.exit_lock = RLock()
 
     def startScan(self, ipRanges, portsStr, threadNumber, timeout):
-        if timeout == '':
-            timeout = '3'
+        timeout = 3 if not timeout else int(timeout)
         addresses = self.parser.parse_address_field(ipRanges)
         ports = self.parser.parse_port_field(portsStr)
-        print(ports)
         self.ip_generator = IpGenerator(addresses,ports)
-        for i in range(int(threadNumber)):
-            self.threads.append(ScanThread(self.ip_generator, ports, timeout, self))
-            self.setCurrentThreadsLabel(len(self.threads))
+        self.scanner = CoreModel(timeout)
+        threadNumber = int(threadNumber)
+        for i in range(threadNumber):
+            scan_worker = ScanWorker(
+                self.ip_generator,
+                self.scanner,
+                self.storage
+                )
+            scan_thread = QThread()
+            scan_worker.log_signal.connect(self.log_text)
+            scan_worker.moveToThread(scan_thread)
+            scan_worker.exit_signal.connect(scan_thread.exit)
+            scan_worker.exit_signal.connect(self.on_worker_exit)
+            scan_thread.started.connect(scan_worker.work)
+            self.threads.append((scan_worker, scan_thread))
+        self.changeThreadLabel(threadNumber)
         for thread in self.threads:
-            thread.signal.connect(self.setLogText)
-            thread.exit_signal.connect(self.on_thread_exit)
-            thread.start()
+            scan_worker, scan_thread = thread
+            scan_thread.start()
+    
+    def changeThreadLabel(self,number_of_threads):
+        self.number_of_threads = number_of_threads
+        self.ui.currentThreadsLabel.setText(str(number_of_threads))
 
-    def on_thread_exit(self):
-        count = 0
-        for thr in self.threads:
-            if thr.is_running:
-                count = count + 1
-        if count == len(self.threads):
+    def on_worker_exit(self):
+        print("on_worker_exit called")
+        self.changeThreadLabel(self.number_of_threads - 1)
+        with self.exit_lock: 
+            for num, thread in enumerate(self.threads):
+                scan_worker, scan_thread = thread
+                if not scan_worker.isRunning:
+                    self.threads.pop(num)
+                    break
+        if self.number_of_threads == 0:
             self.on_end_scanning()
-        self.setCurrentThreadsLabel(count)
-
     def on_end_scanning(self):
             self.isScanEnabled = False
             self.ui.startButton.setText("Start")
             self.storage.save()
 
     def stopScan(self):
-        self.isScanEnabled = False
-        for thread in self.threads:
-            thread.exit()
-        for thread in self.threads:
-            thread.wait()
-        self.on_end_scanning()
-        self.threads.clear()
-        self.ui.currentThreadsLabel.setText("0")
+        while self.threads:
+            scan_worker, scan_thread = self.threads[0]
+            if scan_worker.isRunning:
+                scan_worker.stop()
 
-    def setLogText(self, string):
+    def log_text(self, string):
         self.ui.dataText.append("[" + str(datetime.datetime.now()) + "] " + str(string))
 
     def setCurrentThreadsLabel(self, threadNumber):
         self.ui.currentThreadsLabel.setText(str(threadNumber))
 
 
-class ScanThread(QThread):
+class ScanWorker(QObject):
 
-    signal = pyqtSignal(str)
+
+    log_signal = pyqtSignal(str)
     exit_signal = pyqtSignal()
 
-    def __init__(self, ip_generator, ports, timeout, presenter, parent=None):
-        QThread.__init__(self, parent)
+    def __init__(self, ip_generator, scanner, storage, **kwargs):
+        super().__init__()
         self.ip_generator = ip_generator
+        self.storage = storage
+        self.scanner = scanner
         self.previous_address = None
-        self.coreModel = CoreModel(timeout)
-        self._stop_event = threading.Event()
-        self.timeout = timeout
-        self.presenter = presenter
-        self.is_running = True
+        self.isRunning = True
 
-    def run(self):
-        while True:
+    @pyqtSlot()
+    def work(self):
+        while self.isRunning:
             scan_address = self.ip_generator.get_next_address(self.previous_address)
             if not scan_address:
                 break
             self.previous_address = scan_address
-            scan_result = self.coreModel.scan_address(scan_address)
-            self.presenter.storage.put_responce(scan_address, scan_result)
+            scan_result = self.scanner.scan_address(scan_address)
+            self.storage.put_responce(scan_address, scan_result)
             if scan_result == 0:
-                self.signal.emit('%s has open port: %s' % scan_address)
+                self.log_signal.emit('%s has open port: %s' % scan_address)
             else:
-                self.signal.emit('%s has closed port: %s' % scan_address)
-        self.is_running = False
+                self.log_signal.emit('%s has closed port: %s' % scan_address)
+    def stop(self):
+        print("stop called")
+        self.isRunning = False
         self.exit_signal.emit()
-        self.exit(1)

README.md

@@ -1,5 +1,6 @@
 PySca - a NEtwork SCAnner rewritten in Python
 =============================
+[Вариант на русском](README.ru.md)
 What is it?
 ------------
 According to [Wikipedia](https://en.wikipedia.org/wiki/Network_enumeration#Software),

README.ru.md

@@ -0,0 +1,24 @@
+PySca - сетевой сканер, переписанный на Python
+=============================
+Что это?
+------------
+Согласно [Википедии](https://en.wikipedia.org/wiki/Network_enumeration#Software),
+сетевой сканер это компьютерная программа, используемая для получения информации о группах, общих ресурсах и сервисах компьютеров, подключённых к Сети.
+Этот проект основывается на идеях небезызвестного сканера [NESCA](https://github.com/pantyusha/nesca) - сканер, понятный каждому за счёт [GUI](https://ru.wikipedia.org/wiki/%D0%93%D1%80%D0%B0%D1%84%D0%B8%D1%87%D0%B5%D1%81%D0%BA%D0%B8%D0%B9_%D0%B8%D0%BD%D1%82%D0%B5%D1%80%D1%84%D0%B5%D0%B9%D1%81_%D0%BF%D0%BE%D0%BB%D1%8C%D0%B7%D0%BE%D0%B2%D0%B0%D1%82%D0%B5%D0%BB%D1%8F). PySca - не очередной форк NESCA - это её аналог, созданный с нуля на Python. Другое важное отличие от оригинала - модульность архитектуры сканера - PySca может брать данные (адреса для сканирования) из любого источника и сохранять результат куда возможно (при наличии соответствующих модулей), сохраняя тот же пользовательский интерфейс.
+
+УСТАНОВКА
+------------
+Введите в терминале
+```bash
+git clone http://github.com/ChronosX88/PySca.git
+cd PySca
+pip install -r requirements.txt
+```
+
+ЗАПУСК
+------------
+Введите в терминале
+```bash 
+python main.py
+```
+Находясь в корневой папке PySca