Changeset 312

Timestamp:

10/31/08 18:07:02 (2 months ago)

Author:

llaumgui

Message:

Mise en place de l'option --force permettant d'outre-passer les désactivcation du fichier de configuration.
Amélioration du code
Gestion du restore

Location:

python/netbook_blo/trunk/src

Files:

• NetbookBLO/GlobalOptimizations.py (modified) (3 diffs)
• netbook_blo.py (modified) (6 diffs)

python/netbook_blo/trunk/src/NetbookBLO/GlobalOptimizations.py

@@ -34 +34 @@
         self.nblo = nblo
         
-        if self.isEnabled():
+        if self.isEnabled() or self.nblo.options.force:
             self.__statut__ = "OK"
             if action == 'optimize':
@@ -41 +41 @@
                 self.restore()
             
-        self.nblo.interface.action(self.__label__, self.__statut__)
+        self.nblo.interface.action(action +": " +self.__label__, self.__statut__)
 
 
@@ -57 +57 @@
         """ This optimization is enabled ? """
         if self.__config_item__ != "":
-            if self.nblo.config.get('optimization', self.__config_item__) == "enabled":
-                return True
+            try:
+                if self.nblo.config.get('optimization', self.__config_item__) == "enabled":
+                    return True
+            except:
+                return False
         return False

python/netbook_blo/trunk/src/netbook_blo.py

@@ -32 +32 @@
 
 # Constante
-__PATH_CONFIGURATION__ = '../config/netbook_blo.conf'
+__PATH_CONFIGURATION__ = '/etc/netbook_blo/netbook_blo.conf'
 
 # pydoc
@@ -46 +46 @@
     """ Netbook Optimization """
     
+    # List of optimization's Module
+    __optimizations = ["BluetoothOptimizations.BluetoothOptimizations", \
+                       "CDROMPollingOptimizations.CDROMPollingOptimizations", \
+                       "HardDiskOptimizations.HardDiskOptimizations", \
+                       "IOOptimizations.IOOptimizations", \
+                       "NetworkOptimizations.NetworkOptimizations", \
+                       "SchedulingOptimizations.SchedulingOptimizations" ]
+
+
+
     def __init__(self,interface):
         """ Constructor """
@@ -57 +67 @@
     def optimize(self):
         """ Init optimization """
-        NetworkOptimizations.NetworkOptimizations(self)
-        BluetoothOptimizations.BluetoothOptimizations(self)
-        SchedulingOptimizations.SchedulingOptimizations(self)
-        HardDiskOptimizations.HardDiskOptimizations(self)
-        IOOptimizations.IOOptimizations(self)
-        CDROMPollingOptimizations.CDROMPollingOptimizations(self)
+        for opt in self.__optimizations:
+            exec(opt + "(self, action='optimize')")
+            
+    
+    def restore(self):
+        """ Init restoration """
+        for opt in self.__optimizations:
+            exec(opt + "(self, action='restore')")
 
 
@@ -68 +80 @@
     def loadConfiguration(self ):
         """ Load configuration file """
-        self.config = ConfigParser.ConfigParser()  
-        self.config.readfp(open(__PATH_CONFIGURATION__))
-        self.interface.log( 'Load configuration for "%s" in %s' % \
-            (self.config.get('netbook', 'model'), __PATH_CONFIGURATION__) )
+
+        # Determines the path_configuration
+        if self.options.path_configuration != "":
+            path_configuration = self.options.path_configuration
+
+        # Load configuration file
+        try:
+            self.config = ConfigParser.ConfigParser()
+            self.config.readfp(open(path_configuration))
+            self.interface.log( 'Load configuration for "%s" in %s\n' % \
+                (self.config.get('netbook', 'model'), path_configuration) )
+        except IOError:
+             self.interface.log( 'No configuration in %s' % path_configuration, force=True)
+             exit(2)
 
 
@@ -90 +112 @@
                                dest="restore",
                                help="Restore default settings")
+        self.parser.add_option("--config",
+                               action="store",
+                               dest="path_configuration",
+                               help="Use a specific configuration file",
+                               default="")
         self.parser.add_option("--force",
                                action="store_true",
                                dest="force",
                                help="Enable all optimization")
-        self.parser.add_option("--config",
-                               action="store_true",
-                               dest="path_configuration",
-                               help="Configuration file")
         (options, args) = self.parser.parse_args()
         self.options = options
@@ -130 +153 @@
     console = ConsoleInterface()
     nblo = NetbookOptimization( console )
+    
+    # Optimize
     if nblo.options.optimize:
         nblo.optimize()
+    # Restore
+    elif nblo.options.restore:
+        nblo.restore()
+    # Other
     else:
         nblo.parser.print_help()