Changeset 3827 for lliurex-store/trunk

Timestamp:

Mar 7, 2017, 1:07:33 PM (4 years ago)

Author:

Juanma

Message:

Refactorized is_action_running function

Location:

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

Files:

• plugins/searchManager.py (modified) (4 diffs)
• storeManager.py (modified) (1 diff)

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

@@ -34 +34 @@
                 return(self.pluginInfo)
 
-        def execute_action(self,appstreamStore,action,tokens):
+        def execute_action(self,appstreamStore,action,tokens,exact_match_for_search=False):
                 if not type(tokens) is str:
                         tokens=''
@@ -50 +50 @@
                         self._list_sections()
                 if (action=='search' or action=='info'):
-                        self._search_app(tokens)
+                        self._search_app(tokens,exact_match_for_search)
                 self.progress=100
                 return(self.result)
@@ -60 +60 @@
                 self.precision=precision
 
-        def _search_app(self,tokens):
-                self._debug("Searching app "+str(tokens))
+        def _search_app(self,tokens,exact_match):
+                self._debug("Searching app "+str(tokens)+ "with exact_match="+str(exact_match))
                 applist=[]
                 app=None
@@ -70 +70 @@
                         applist.append(app)
                         self._debug("App direct match found: "+app.get_id())
-#               else:
-#               for app in self._get_apps_by_match(tokens):
-#                       applist.append(app)
-                applist=self._get_apps_by_match(tokens,applist)
+                if not exact_match:
+                        applist=self._get_apps_by_match(tokens,applist)
                 if len(applist):
                         self._set_status(0)

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

@@ -418 +418 @@
 
                 searchFunction=self._execute_class_method(action,'*',launchedby)
-                aux_result=searchFunction.execute_action(self.store,action,searchItem)
+                if (launchedby=="install" or launchedby=='remove'):
+                        #Last boolean parameter sets the exact_match_for_search attribute
+                        aux_result=searchFunction.execute_action(self.store,action,searchItem,True)
+                else:
+                        aux_result=searchFunction.execute_action(self.store,action,searchItem,False)
                 aux_applist=aux_result['data']
                 status=aux_result['status']