Changeset 3646 for lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr

Timestamp:

Feb 15, 2017, 6:27:03 PM (3 years ago)

Author:

Juanma

Message:

WIP on CLI

Location:

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

Files:

• plugins/debManager.py (modified) (4 diffs)
• plugins/infoManager.py (modified) (1 diff)
• plugins/loadStore.py (modified) (2 diffs)
• plugins/searchManager.py (modified) (2 diffs)
• storeManager.py (modified) (5 diffs)

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

@@ -23 +23 @@
         def _debug(self,msg=''):
                 if self.dbg==1:
-                        print ('DEBUG Deb: '+msg)
+                        print ('DEBUG Deb: '+str(msg))
         #def debug
 
@@ -60 +60 @@
                 self.partialProgress=status.get_property('percentage')
                 self.progress=self.partialProgress/self.count
-                self._debug("Progress"+str(self.partialProgress))
+#               self._debug("Progress"+str(self.partialProgress))
         #def _callback
 
@@ -67 +67 @@
                 self._debug("Installing "+app.get_id())
                 try:
-                        self.installer.install_packages(False,[app.get_id(),],None,self._callback,None)
-                        self.result.append({app.get_id():" installed succesfully"})
+                        self.installer.install_packages(True,[app.get_id(),],None,self._callback,None)
+                        self.result.append({app.get_id():0})
                 except Exception as e:
-                        self._debug(e.message)
-                        self.result.append({app.get_id():e.message})
+                        self._debug("Install error: "+str(e.code))
+                        self.result.append({app.get_id():e.code})
                 self.partialProgress=100
         #def _install_App_from_Repo
@@ -77 +77 @@
         def _remove_App(self,app):
                 try:
-                        self.installer.remove_packages(False,[app.get_id(),],True,False,None,self._callback,None)
-                        self.result.append({app.get_id():" removed succesfully"})
+                        self.installer.remove_packages(True,[app.get_id(),],True,False,None,self._callback,None)
+                        self.result.append({app.get_id():0})
                 except Exception as e:
-                        self._debug(e.message)
-                        self.result.append({app.get_id():e.message})
+                        self._debug("Remove error: " +str(e.code))
+                        self.result.append({app.get_id():e.code})
                 self.partialProgress=100
         #def _remove_App

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

@@ -82 +82 @@
                                         break
                         if app.get_categories():
-                                appInfo['categories']=str(app.get_categories())
+                                appInfo['categories']=app.get_categories()
                         if app.get_icon_default():
                                 appInfo['icon']=app.get_icon_default().get_name()

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

@@ -11 +11 @@
                 self.store=''
                 self.progress=0
+                self.error=0
         #def __init__
 
@@ -34 +35 @@
                 return (self.store)
         #def execute_action
+
+        def get_error(self)
+                return (self.error)
 
         def _load_store(self,store):

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

@@ -78 +78 @@
                                         catDict[cat]=catDict[cat]+1
                 for section in catDict:
-                        applist.append({section:catDict[section]})
+                        applist.append({str(section):catDict[section]})
                 self.applist=applist
                 return(applist)
@@ -100 +100 @@
                                                 pass
                                         setAppCategories=set(appCategories)
-                                        if list(setCategories.intersection(setAppCategories)):
+                                        if setCategories.issubset(setAppCategories):
                                                 self._debug("Found "+app.get_id())
                                                 applist.append(app)

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

@@ -27 +27 @@
                                         }
                 self.dbg=0
+                if args:
+                        self.dbg=args
                 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.registeredPlugins={}               #Dict that have the relation between plugins and actions 
                 self.registerProcessProgress={}         #Dict that stores the progress for each function/parentAction pair
-                self.__init_plugins__()                 #Function that loads the plugins
                 self.progressActions={}                 #Progress of global actions based on average progress of individual processes
                 self.result={}                          #Result of the actions
-                self.execute_action('load')             #Function that launches the actions
                 self.lock=threading.Lock()              #locker for functions related to threads (get_progress, is_action_running...)
-#               self.log
+                self.main()
         #def __init__
+
+        def main(self):
+                self._define_functions_for_threads()    #Function that loads the dictionary self.threads
+                self.__init_plugins__()                 #Function that loads the plugins
+                self.execute_action('load')             #Initial load of the store
+        #def main
 
         ####
@@ -148 +153 @@
                 if action in self.registeredPlugins:
                         self._debug("Plugin for "+action+": "+self.registeredPlugins[action][parms])
-#                       exeFunction=eval(self.pluginMod+'.'+self.registeredPlugins[action][parms]+"()")
                         exeFunction=eval(self.registeredPlugins[action][parms]+"()")
+                        if self.dbg:
+                                exeFunction.set_debug(1)
                         self._registerProcessProgress(action,exeFunction,launchedby)
                 else:
@@ -211 +217 @@
         def _registerProcessProgress(self,action,function,parentAction=None):
                 if action in self.registerProcessProgress.keys():
-                        self._debug("Appended process for action :"+action +" and function: "+str(function))
+                        self._debug("Appended process for action: "+action +" and function: "+str(function))
                         self.registerProcessProgress[action].append(function)
                 else:
-                        self._debug("Registered process for action :"+action+" and function: "+str(function))
+                        self._debug("Registered process for action: "+action+" and function: "+str(function))
                         self.registerProcessProgress[action]=[function]
                 if parentAction:
@@ -370 +376 @@
                 if action=='list_sections':
                         searchItem=''
-                if (searchItem in self.registeredPlugins[action]):
-                        self._debug("Plugin for search "+ searchItem +": "+self.registeredPlugins[action][searchItem])
-                        finder=self.registeredPlugins[action][searchItem]
-                else:
-                        self._debug("Plugin for generic search: "+self.registeredPlugins[action]['*'])
-                        finder=self.registeredPlugins[action][('*')]
-                searchFunction=eval(finder+"()")
                 if not launchedby:
                         launchedby=action
-                self._registerProcessProgress(action,searchFunction,launchedby)
+
+                searchFunction=self._execute_class_method(action,'*',launchedby)
                 aux_applist=searchFunction.execute_action(self.store,action,searchItem)
-                #1.- Get appstream metadata (faster)
-                partialAction='info'
-                applist=self._get_App_Info(aux_applist,launchedby)
-                self._debug("Add result for "+partialAction)
-                self.result[partialAction]=applist
-                #2.- Get rest of metadata (slower)
-                partialAction='pkginfo'
-                applist=self._get_Extended_App_Info(applist,launchedby,fullsearch)
-                realAction=action
-                if launchedby:
-                        realAction=launchedby
-                        self._debug("Assigned results of "+action+" to "+realAction)
-                if (len(applist)):
-                        self.result[realAction]=applist
-                        return_msg=True
-                else:
-                        notfound=''
-                        for item in searchItem:
-                                notfound=' '.join(searchItem)
-                        self.result[realAction]=[{notfound:" not found"}]
+                if len(aux_applist):
+                        #1.- Get appstream metadata (faster)
+                        partialAction='info'
+                        applist=self._get_App_Info(aux_applist,launchedby)
+                        self._debug("Add result for "+partialAction)
+                        self.result[partialAction]=applist
+                        #2.- Get rest of metadata (slower)
+                        partialAction='pkginfo'
+                        applist=self._get_Extended_App_Info(applist,launchedby,fullsearch)
+                        realAction=action
+                        if launchedby:
+                                realAction=launchedby
+                                self._debug("Assigned results of "+action+" to "+realAction)
+                        if (len(applist)):
+                                self.result[realAction]=applist
+                                return_msg=True
+                        else:
+                                notfound=''
+                                self.result[realAction]=[{searchItem:2}]
+                                return_msg=False
+                else:
+                        self.result[launchedby]=[{searchItem:1}]
                         return_msg=False
                 return(return_msg)
@@ -424 +426 @@
                                 if (action=='install' and appInfo['status']=='installed') or (action=='remove' and appInfo['status']=='available'):
                                         if action=='remove':
-                                                self.result[action]=[{appInfo['package']:"Package not installed"}]
+                                                self.result[action]=[{appInfo['package']:3}]
                                         else:
-                                                self.result[action]=[{appInfo['package']:"Package already installed"}]
+                                                self.result[action]=[{appInfo['package']:4}]
                                         return_msg=False
                                         typeDict={}