Minor bug fixes

network_monitor.py

@@ -97,7 +97,6 @@ class NetworkMonitor(QMainWindow):
         self.menubar.addAction(self.actionScroll) 
         
     def autoScrollSet(self):
-        print(self.actionScroll.isChecked())
         if (self.actionScroll.isChecked() == True):
             self.tableWidget.scrollToBottom()
             self.actionScroll.setText('Disable Auto Scroll')
@@ -108,10 +107,6 @@ class NetworkMonitor(QMainWindow):
         if self.interfaceSelected == None:
             self.interfaceDialog()
         
-        print("Monitoring - {}".format(
-            self.interfaceSelected
-        ))
-        
         self.actionStart.setEnabled(False)
         self.actionStop.setEnabled(True)
         self.actionClear.setEnabled(True)
@@ -130,18 +125,15 @@ class NetworkMonitor(QMainWindow):
     
     quitBool = pyqtSignal()
     def stopSniff(self, quitBool):
-        print(quitBool)
         if(quitBool == 1):
             self.thread.quit()
             self.actionStart.setEnabled(True)
             self.actionStop.setEnabled(False)
             self.actionPickInterface.setEnabled(True)
             
-            print("Terminating thread")
-            self.thread.quit()
-        
     def packetClear(self):
-        self.thread.terminate()
+        if hasattr(self.thread, 'quit'):
+            self.thread.quit()
         self.tableWidget.clearContents()
         self.tableWidget.setRowCount(0)
     
@@ -150,7 +142,6 @@ class NetworkMonitor(QMainWindow):
         self.interfaceDiag.exec_()
         if hasattr(self.interfaceDiag, 'interfaceName'):
             self.interfaceSelected = self.interfaceDiag.interfaceName
-            print(self.interfaceSelected)
     
     packetData = pyqtSignal()
     def addPacketToTableWidget(self, packetData):
@@ -179,17 +170,20 @@ class NetworkMonitor(QMainWindow):
             
     def savePacketsPCAP(self):
         path = QFileDialog.getSaveFileName(self, 'Save File', '', 'pcap(*.pcap)')
+        if path[0] is not '':
             path = str(path[0])
             wrpcap(path, self.worker.packetList)
     
     def savePacketsBLIP(self):
         path = QFileDialog.getSaveFileName(self, 'Save File', '', 'pcap(*.pcap)')
+        if path[0] is not '':
             path = str(path[0])
             wrpcap(path, self.worker.blackListAccess)
             self.worker.blackListAccess = []
     
     def savePacketsCSV(self):
         path = QFileDialog.getSaveFileName(self, 'Save File', '', 'CSV(*.csv)')
+        if path[0] is not '':
             with open(path[0], 'w') as stream:
                 writer = csv.writer(stream, lineterminator='\n')
                 for row in range(self.tableWidget.rowCount()):

network_monitor_thread.py

@@ -10,7 +10,6 @@ class NetworkMonitorThread(QObject):
     def __init__(self, interface, parent=None):
         
         self.IP_blacklist = set(line.strip() for line in open('IP_Blacklist.txt'))
-        print(self.IP_blacklist)
         QObject.__init__(self, parent=parent)
         self.interface = interface
         self.packetList = []
@@ -21,7 +20,6 @@ class NetworkMonitorThread(QObject):
 
     def endSniff(self):
         QApplication.processEvents()
-        print("Ending")
         self.end = True
         self.quitBool.emit(1)