Changeset 3002

Timestamp:

06/14/08 16:12:05 (5 years ago)

Author:

nopper

Message:

Initial working
==========================
M umitGUI/App.py
M umitGUI/MainWindow.py
M umitCore/BasePaths.py
M umitCore/Paths.py
M umitCore/UserConf.py
M umitCore/UmitConf.py

Location:

branch/UmitPlugins

Files:

• umitCore/BasePaths.py (modified) (2 diffs)
• umitCore/Paths.py (modified) (1 diff)
• umitCore/UmitConf.py (modified) (1 diff)
• umitCore/UserConf.py (modified) (2 diffs)
• umitGUI/App.py (modified) (3 diffs)
• umitGUI/MainWindow.py (modified) (6 diffs)

branch/UmitPlugins/umitCore/BasePaths.py

@@ -44 +44 @@
 ICONS_DIR = os.path.join(main_dir, "share", "icons", "umit")
 PIXMAPS_DIR = os.path.join(main_dir, "share", "pixmaps", "umit")
+PLUGINS_DIR = os.path.join(main_dir, "share", "umit", "plugins")
 DOCS_DIR = os.path.join(main_dir, "share", "doc", "umit")
 
@@ -58 +59 @@
                   umit_opt = 'umit.opt',
                   pixmaps_dir = PIXMAPS_DIR,
+                  plugins_dir = PLUGINS_DIR,
                   i18n_dir = LOCALE_DIR,
                   i18n_message_file = 'umit.mo',

branch/UmitPlugins/umitCore/Paths.py

@@ -246 +246 @@
            and not exists(user_dir):
         mkdir(user_dir)
+        mkdir(join(user_dir, "plugins"))
+        mkdir(join(user_dir, "plugins-download"))
         log.debug(">>> Umit user dir successfully created! %s" % user_dir)
     else:

branch/UmitPlugins/umitCore/UmitConf.py

@@ -538 +538 @@
     not_present = property(get_not_present, set_not_present)
 
+class Plugins(object):
+    def __init__(self):
+        self.parser = Path.config_parser
+        self.section_name = "plugins"
+
+        if not self.parser.has_section(self.section_name):
+            self.create_section()
+
+    def save_changes(self):
+        self.parser.save_changes()
+
+    def create_section(self):
+        from os.path import join
+        self.paths = [join(Path.config_dir, "plugins")]
+        self.plugins = ""
+
+    def __get_it(self, p_name):
+        value = None
+
+        try:     value = self.parser.get(self.section_name, p_name)
+        except:  pass
+        finally: return self.sanity_settings(value)
+
+    def __set_it(self, property_name, settings):
+        settings = self.sanity_settings(settings)
+        self.parser.set(self.section_name, property_name, settings)
+
+    def sanity_settings(self, settings):
+        # FIXME: more sensed :D
+        if not settings:
+            return ""
+        return settings
+
+    def get_paths(self):
+        return self.__get_it("paths").split(":")
+
+    def set_paths(self, settings):
+        self.__set_it("paths", ":".join(settings))
+
+    def get_plugins(self):
+        return self.__get_it("plugins").split(":")
+
+    def set_plugins(self, settings):
+        self.__set_it("plugins", ":".join(settings))
+
+    paths = property(get_paths, set_paths)
+    plugins = property(get_plugins, set_plugins)
+
 # Exceptions
 class ProfileNotFound:

branch/UmitPlugins/umitCore/UserConf.py

@@ -39 +39 @@
 not_present = [58079, 19076, 12703]
 modified = [63881, 42182, 13193]
+
+[plugins]
+paths = plugins
 '''
 
@@ -18516 +18519 @@
     return create_config_file(user_dir,
                               base_paths['config_file'],
-                              umit_conf_content)
+                              umit_conf_content % base_paths['plugins_dir'])
 
 def create_wizard(user_dir):

branch/UmitPlugins/umitGUI/App.py

@@ -32 +32 @@
 from umitCore.UmitLogging import log
 
+from umitPlugin.Engine import PluginEngine
 
 # Script found at http://www.py2exe.org/index.cgi/HowToDetermineIfRunningFromExe
@@ -46 +47 @@
 class App:
     def __init__(self, args=sys.argv):
-        pass
+        # Initialite the PluginEngine
+        PluginEngine()
 
     def __parse_cmd_line(self):
@@ -61 +63 @@
 
         self.main_window.show_all()
+
+        # Load the selected plugins
+        PluginEngine().load_selected_plugins()
     
     def safe_shutdown(self, signum, stack):

branch/UmitPlugins/umitGUI/MainWindow.py

@@ -56 +56 @@
 from umitCore.UmitDB import Scans, UmitDB
 
+from umitPlugin.Window import PluginWindow
+from umitPlugin.Engine import PluginEngine
+
 root = False
 try:
@@ -93 +96 @@
         self.set_title(_("Umit"))
 
+        self._plugin_win = PluginWindow()
         self._icontheme = gtk.IconTheme()
         self.main_accel_group = gtk.AccelGroup()
@@ -227 +231 @@
                       _('Use the selected scan profile to create another'),
                       self._new_scan_profile_with_selected_cb),
+                      
+                      ('Extensions',
+                       gtk.STOCK_INFO,
+                       _('_Extensions'),
+                       '<Control>e',
+                       _('Extensions manager'),
+                       self._show_plugin_manager),
 
                       ('Quit',
@@ -298 +309 @@
             <menuitem action='Compare Results'/>
             <menuitem action='Search Scan'/>
+            <separator/>
+            <menuitem action='Extensions'/>
             </menu>
 
@@ -357 +370 @@
                                   title=results[result][1].scan_name)
                 page.status.set_search_loaded()
-
+    
+    def _show_plugin_manager(self, widget, data=None):
+        self._plugin_win.show()
+    
     def _close_scan_cb(self, widget, data=None):
         # data can be none, if the current page is to be closed
@@ -989 +1005 @@
             UmitDB().cleanup(SearchConfig().converted_save_time)
 
+            # Saving the plugins
+            PluginEngine().plugins.save_changes()
+
             gtk.main_quit()