Changeset 1295

Timestamp:

08/09/07 01:54:48 (6 years ago)

Author:

ggpolo

Message:

Added modules for handling data removal, and some minor changes

Location:

branch/ggpolo

Files:

• higwidgets/higlabels.py (modified) (3 diffs)
• share/umit/config/umit.conf (modified) (1 diff)
• umitCore/DataDecay.py (added)
• umitDB/Remove.py (modified) (4 diffs)
• umitDB/XMLStore.py (modified) (1 diff)
• umitGUI/MainWindow.py (modified) (2 diffs)
• umitInventory/ConfigureDataRemoval.py (added)
• umitInventory/Viewer.py (modified) (9 diffs)

branch/ggpolo/higwidgets/higlabels.py

@@ -26 +26 @@
 """
 
-__all__ = ['HIGSectionLabel', 'HIGHintSectionLabel', 'HIGEntryLabel', 'HIGDialogLabel']
+__all__ = ['HIGSectionLabel', 'HIGHintSectionLabel', 'HIGEntryLabel', 
+           'HIGDialogLabel']
 
 import gtk
@@ -44 +45 @@
 class HIGHintSectionLabel(gtk.HBox, object):
     """
-    Bold label used to define sections, with a little icon that shows up a hint when mouse is
-    over it.
+    Bold label used to define sections, with a little icon that shows up a 
+    hint when mouse is over it.
     """
     def __init__(self, text=None, hint=None):
@@ -62 +63 @@
 
         self.hint_image = gtk.Image()
-        self.hint_image.set_from_stock(gtk.STOCK_DIALOG_INFO, gtk.ICON_SIZE_SMALL_TOOLBAR)
+        self.hint_image.set_from_stock(gtk.STOCK_DIALOG_INFO, 
+                                       gtk.ICON_SIZE_SMALL_TOOLBAR)
 
         self.add(self.hint_image)

branch/ggpolo/share/umit/config/umit.conf

@@ -95 +95 @@
 search_db = 1
 
+[database]
+umit_decay = 60
+inventory_decay = 0

branch/ggpolo/umitDB/Remove.py

@@ -19 +19 @@
 
 from datetime import datetime, timedelta
+
+from umitCore.Logging import log
 
 from umitDB.Connection import ConnectDB
@@ -88 +90 @@
         to_remove = scans_ids.difference(inventory_scans_ids)
         
+        if not to_remove:
+            # nothing to do
+            return
+
+        log.debug(">>> Removing UMIT scans older than %d days \
+from database.." % older_than)
+
         # remove scans
         for scan_id in to_remove:
             self.remove_scan(scan_id)
+            
+        log.debug(">>> Removal completed")
         
         
@@ -110 +121 @@
                                         (old_data_date, )).fetchall()
         scans_ids = [id[0] for id in scans_ids]
+
+        if not scans_ids:
+            # nothing to do
+            return
+
+        log.debug(">>> Removing Inventory scans older than %d days \
+from database.." % older_than)
         
         # remove scans
@@ -125 +143 @@
             
         self.conn.commit()
+        
+        log.debug(">>> Removal completed")
             
             

branch/ggpolo/umitDB/XMLStore.py

@@ -19 +19 @@
 
 from datetime import datetime
+
 from umitCore.NmapParser import NmapParser
+
 from umitDB.Connection import ConnectDB
 from umitDB.Store import RawStore

branch/ggpolo/umitGUI/MainWindow.py

@@ -55 +55 @@
 from umitCore.UmitDB import Scans, UmitDB
 from umitCore.Utils import amiroot, is_maemo
+from umitCore.DataDecay import remove_old_data
 import umitCore.Scheduler as Scheduler
 
@@ -1018 +1019 @@
             UmitDB().cleanup(SearchConfig().converted_save_time)
             
-            # Stop Scheduler if it is running
-            #if os.path.isfile(os.path.split(Path.config_file)[0] + \
-            #"/schedrunning"):
-            #    subprocess.Popen([sys.executable, Path.sched_control, 'stop'])
+            # Remove old data from database
+            remove_old_data()
 
             gtk.main_quit()

branch/ggpolo/umitInventory/Viewer.py

@@ -34 +34 @@
 from umitCore.I18N import _
 from umitCore.Paths import Path
+from umitCore.DataDecay import remove_old_data
 
 from umitDB.Retrieve import InventoryRetrieve
@@ -46 +47 @@
 from umitInventory.InventoryTree import InventoryTree
 from umitInventory.Timeline import TLHolder
+from umitInventory.ConfigureDataRemoval import ConfigureDataRemoval
 
 umitdb = Path.umitdb_ng
@@ -375 +377 @@
         # hosts info
         hb = gtk.HBox()
-        hb.pack_start(gtk.Label(_("Hosts: %s" % ', '.join(host for host in hosts))), False, False, 0)
+        hb.pack_start(gtk.Label(_("Hosts: %s" % ', '.join(host for host in hosts))), 
+                      False, False, 0)
         box.pack_start(hb, False, False, 0)
         
@@ -419 +422 @@
         for invid, invname in self.invdb.get_inventories_ids_names():
             root = tr.append(None, ['%s' % invname])
-            tr.append(root, [inventory_info])
             
             # retrieve scans id for each inventory
-            for scan in self.invdb.get_scans_id_for_inventory(invid):
+            scans_ids = self.invdb.get_scans_id_for_inventory(invid)
+            if scans_ids:
+                tr.append(root, [inventory_info])
+            
+            for scan in scans_ids:
 
                 # retrieve scan finish timestamp
@@ -436 +442 @@
                     # check if host is already in current Inventory
                     new_host = False                    
-                    #if self.addresses.has_key(invname):
+                    
                     if invname in self.addresses:
                         if not addr in self.addresses[invname]:
-                            newlist = self.addresses[invname] # this is the old 
-                                                              # list actually
-                            newlist.append(addr) # now this is the new list
-                            self.addresses[invname] = newlist
+                            self.addresses[invname].append(addr)
                             new_host = True
                     else:
@@ -663 +666 @@
              None, self.schedctrl.status_text,
              self.schedctrl._scheduler_control),
+            
+            # Edit
+            ('Control Data Removal', None, _("Data Removal"), None,
+             _("Data Removal"), self._edit_data_removal)
         ]
         
@@ -711 +718 @@
                     </menu>
                     <menuitem action='ShowTips' />
+                    <menuitem action='Control Data Removal' />
                 </menu>
             </menubar>
@@ -733 +741 @@
 
         
+    def _edit_data_removal(self, event):
+        """
+        Open window for editing data removal for Inventories.
+        """
+        w = ConfigureDataRemoval()
+        w.show_all()
+        
+        
     def _edit_inventory(self, event):
         """
@@ -763 +779 @@
             self.daddy.running_ni = False
         else: # started umit with -i argument
+            # Remove old data from database
+            remove_old_data()
+            
             gtk.main_quit()