ChronosXYZ/PyNesca
1
0
Fork 0
mirror of https://github.com/ChronosX88/PyNesca.git synced 2024-11-21 20:52:18 +00:00
Code Issues Projects Releases Wiki Activity

Removed unused metod

Browse Source
This commit is contained in:
Zloooy 2019-02-03 15:07:59 +03:00
parent f817a2e661
commit b621d51fa0
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
MainPresenter.py
View File

@ -22,7 +22,7 @@ class MainPresenter:
timeout = 3 if not timeout else int(timeout) timeout = 3 if not timeout else int(timeout)
addresses = self.parser.parse_address_field(ipRanges) addresses = self.parser.parse_address_field(ipRanges)
ports = self.parser.parse_port_field(portsStr) ports = self.parser.parse_port_field(portsStr)
self.ip_generator = IpGenerator(addresses,ports) self.ip_generator = IpGenerator(addresses, ports)
self.scanner = CoreModel(timeout) self.scanner = CoreModel(timeout)
threadNumber = int(threadNumber) threadNumber = int(threadNumber)
for i in range(threadNumber): for i in range(threadNumber):
@ -42,22 +42,22 @@ class MainPresenter:
for thread in self.threads: for thread in self.threads:
scan_worker, scan_thread = thread scan_worker, scan_thread = thread
scan_thread.start() scan_thread.start()
def changeThreadLabel(self,number_of_threads): def changeThreadLabel(self, number_of_threads):
self.number_of_threads = number_of_threads self.number_of_threads = number_of_threads
self.ui.currentThreadsLabel.setText(str(number_of_threads)) self.ui.currentThreadsLabel.setText(str(number_of_threads))
def on_worker_exit(self): def on_worker_exit(self):
print("on_worker_exit called")
self.changeThreadLabel(self.number_of_threads - 1) self.changeThreadLabel(self.number_of_threads - 1)
with self.exit_lock: with self.exit_lock:
for num, thread in enumerate(self.threads): for num, thread in enumerate(self.threads):
scan_worker, scan_thread = thread scan_worker, scan_thread = thread
if not scan_worker.isRunning: if not scan_worker.isRunning:
self.threads.pop(num) self.threads.pop(num)
break break
if self.number_of_threads == 0: if self.number_of_threads == 0:
self.on_end_scanning() self.on_end_scanning()
def on_end_scanning(self): def on_end_scanning(self):
self.isScanEnabled = False self.isScanEnabled = False
self.ui.startButton.setText("Start") self.ui.startButton.setText("Start")
@ -72,13 +72,9 @@ class MainPresenter:
def log_text(self, string): def log_text(self, string):
self.ui.dataText.append("[" + str(datetime.datetime.now()) + "] " + str(string)) self.ui.dataText.append("[" + str(datetime.datetime.now()) + "] " + str(string))
def setCurrentThreadsLabel(self, threadNumber):
self.ui.currentThreadsLabel.setText(str(threadNumber))
class ScanWorker(QObject): class ScanWorker(QObject):
log_signal = pyqtSignal(str) log_signal = pyqtSignal(str)
exit_signal = pyqtSignal() exit_signal = pyqtSignal()
@ -103,7 +99,8 @@ class ScanWorker(QObject):
self.log_signal.emit('%s has open port: %s' % scan_address) self.log_signal.emit('%s has open port: %s' % scan_address)
else: else:
self.log_signal.emit('%s has closed port: %s' % scan_address) self.log_signal.emit('%s has closed port: %s' % scan_address)
self.stop()
def stop(self): def stop(self):
print("stop called")
self.isRunning = False self.isRunning = False
self.exit_signal.emit() self.exit_signal.emit()