Changeset 5840

Timestamp:

08/19/10 23:57:57 (3 years ago)

Author:

diogo

Message:

fixed bugs: scan save, and nmap scan result parsing

Location:

network-scanner/branches/GSoC2010/umit/gui

Files:

• MainWindow.py (modified) (11 diffs)
• ScanNotebook.py (modified) (2 diffs)

network-scanner/branches/GSoC2010/umit/gui/MainWindow.py

@@ -26 +26 @@
 import gtk
 import sys
+from subprocess import Popen, PIPE
 from os.path import split, isfile, join
 import xml.sax.saxutils
@@ -40 +41 @@
 from umit.gui.FileChoosers import SaveResultsFileChooserDialog
 from umit.gui.FileChoosers import ExportHTMLResultsFileChooserDialog
-from umit.gui.ScanNotebook import ScanNotebook, ScanNotebookPage
+from umit.gui.ScanNotebook import ScanNotebook, ScanNotebookPage, NmapScanNotebookPage
 from umit.gui.ScanPage import ScanPage
 from umit.gui.ProfileEditor import ProfileEditor
@@ -389 +390 @@
                 self._load_script_manager_cb
             ),
+            
+            # QuickScan
+
+            ('QuickScan',
+                gtk.STOCK_INDEX,
+                _('QuickScan'),
+                "<Alt>Q",
+                _('Launch QuickScan'),
+                self._launch_quickscan
+            ),
 
             # Scan Scheduler
@@ -475 +486 @@
             </menu>
             <menuitem action='Script Manager'/>
+            <menuitem action='QuickScan'/>
             </menu>
 
@@ -1069 +1081 @@
                 scan_page = self._new_scan_cb()
 
+            if scan_page.get_tool()!='nmap':
+                log.error(">>> Not available for Zion") 
+                return
+            
             log.debug(">>> Enabling page widgets")
-            scan_page.enable_widgets()
+            scan_page.get_page().enable_widgets()
 
         if filename and os.access(filename, os.R_OK):
@@ -1080 +1096 @@
             # Parse result
             f = open(filename)
-            scan_page.parse_result(f)
-            scan_page.saved_filename = filename
+            scan_page.get_page().parse_result(f)
+            scan_page.get_page().saved_filename = filename
 
             # Closing file to avoid problems with file descriptors
@@ -1091 +1107 @@
         elif parsed_result:
             # Load scan result from parsed object
-            scan_page.load_from_parsed_result(parsed_result)
+            scan_page.get_page().load_from_parsed_result(parsed_result)
 
             log.debug(">>> Setting tab label")
@@ -1295 +1311 @@
         a.save()
     def _save(self, saving_page, saved_filename):
+        
+        # TODO: save Zion scans
+        if saving_page.get_tool()!='nmap':
+            alert = HIGAlertDialog(message_format=_('Can\'t save file'),
+                                       secondary_text=_('Can\'t open file \
+to write'))
+            alert.run()
+            alert.destroy()
+            log.debug(">>> Can\'t save zion scan")
+            return
+                
         log.debug(">>> File been saved: %s" % saved_filename)
         if os.access(split(saved_filename)[0], os.W_OK):
@@ -1310 +1337 @@
                 saving_page.changes = False
                 saving_page.saved_filename = saved_filename
-                saving_page.collect_umit_info()
+                saving_page.get_page().collect_umit_info()
 
                 log.debug(">>> Page saved? %s" % saving_page.status.saved)
@@ -1317 +1344 @@
                           saving_page.saved_filename)
 
-                saving_page.parsed.write_xml(f)
+                saving_page.get_page().parsed.write_xml(f)
 
                 # Closing file to avoid problems with file descriptors
@@ -1501 +1528 @@
         self.script_manager_window.show_all()        
 
+    def _launch_quickscan(self, widget=None, extra=None):
+        pass
 
     # Properties

network-scanner/branches/GSoC2010/umit/gui/ScanNotebook.py

@@ -282 +282 @@
             
         if not title:
-            title = self.get_new_tab_title(page.parsed)
+            title = self.get_new_tab_title(page.get_page().parsed)
         else:
             title = self.sanitize_tab_title(title)
@@ -346 +346 @@
         self.__page = {'nmap': NmapScanNotebookPage(self),
                        'zion': ZionScanNotebookPage(self)}
+        
+    def get_page(self):
+        return self.__page[self.__tool]
 
     def __create_toolbar(self):