Changeset 3286 for lliurex-store/trunk

Timestamp:

Jan 12, 2017, 2:26:55 PM (4 years ago)

Author:

Juanma

Message:

wip on packaging

File:

• lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/storeManager.py (modified) (4 diffs)

lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/storeManager.py

@@ -4 +4 @@
 import threading
 import syslog
-#Load the plugin dir
-#pluginDir='/home/lliurex/lliurex-store/trunk/fuentes/lliurex-appstore.install/usr/share/lliurex-store/plugins' #Path to the dir that stores the plugins
-#pluginDir='/usr/share/lliurex-store/plugins' #Path to the dir that stores the plugins
-#oldpwd=os.getcwd()
-#os.chdir(pluginDir)
-#exec ('import ' + os.path.basename(pluginDir))         #DON'T CHANGE!!!
-#os.chdir(oldpwd)
-#del (oldpwd)
+import pkgutil
 import lliurexstore.plugins as plugins
-from plugins import *
 ######
 #Ver. 1.0 of storeManager.py
@@ -34 +26 @@
                                         'remove':['search','info','pkginfo','remove']
                                         }
-                self.dbg=0
+                self.dbg=1
                 self.threads={}                         #Dict that stores the functions that must execute each action
                 self.threadsProgress={}                 #"" "" "" the progress for each launched thread
                 self.threadsRunning={}                  #"" "" "" the running threads
                 self._define_functions_for_threads()    #Function that loads the dictionary self.threads
-                self.pluginDir='/usr/share/lliurex-store/plugins' #Path to the dir that stores the plugins
-                #self.pluginDir='/home/lliurex/lliurex-store/trunk/fuentes/lliurex-appstore.install/usr/share/lliurex-store/plugins' #Path to the dir that stores the plugins
-                self.pluginMod=os.path.basename(self.pluginDir) #DON'T CHANGE!!!        
                 self.registeredPlugins={}               #Dict that have the relation between plugins and actions 
                 self.registerProcessProgress={}         #Dict that stores the progress for each function/parentAction pair
@@ -56 +45 @@
         ####
         def __init_plugins__(self):
-#               os.chdir(self.pluginDir)
-#               for mod in os.listdir():
-#                       if not mod.startswith('_'):
-#                               modName=mod.split('.')[0]
-#                               strImport='from plugins.'+modName+' import *'
-#                               try:
-#                                       exec (strImport)
-#                               except Exception as e:
-#                                       print(str(e))
-#               from plugins import *
+                package=plugins
+                for importer, mod, ispkg in pkgutil.walk_packages(path=package.__path__, prefix=package.__name__+'.',onerror=lambda x: None):
+                        strImport='from '+mod+' import *'
+                        try:
+                                self.debug("Importing "+str(mod))
+                                exec (strImport)
+                        except Exception as e:
+                                print(str(e))
+
                 for mod in (sys.modules.keys()):
                         if 'plugins.' in mod:
@@ -71 +59 @@
                                 pluginNameUp=mod.split('.')[-1]
                                 pluginName=pluginNameUp.lower()
+                                self._debug("Initializing "+str(pluginName))
                                 try:
-                                        loadedClass=eval(mod+'.'+pluginName)()
+                                        loadedClass=eval(pluginName)()
                                         definedActions=loadedClass.register()
                                 except Exception as e: