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

Timestamp:

Dec 22, 2017, 2:07:25 PM (2 years ago)

Author:

Juanma

Message:

Removed text messages from loadstore class

Location:

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

Files:

• plugins/loadStore.py (modified) (10 diffs)
• plugins/searchManager.py (modified) (1 diff)
• storeManager.py (modified) (9 diffs)

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

@@ -14 +14 @@
 import gettext
 from bs4 import BeautifulSoup
-gettext.textdomain('python3-lliurex-store')
-_=gettext.gettext
 
 class loadstore:
         def __init__(self):
                 self.dbg=0
-                self.pluginInfo={'load':'*'}
+                self.pluginInfo={'load':'*','load_bundles':'*'}
                 self.store=''
                 self.progress=0
@@ -50 +48 @@
                         self.store=appstream.Store()
                 if action=='load':
-                        self._load_store(self.store,loadBundles)
-#               self.progress=100
+                        self._load_store(self.store)
+                if action=='load_bundles':
+                        self._load_store(self.store,loadBundles=True)
+                self.progress=100
                 return (self.store)
         #def execute_action
@@ -93 +93 @@
         def _generic_file_load(self,filesDir,store):
                 iconPath='/usr/share/icons/hicolor/128x128'
+                files=os.listdir(filesDir)
                 for appFile in os.listdir(filesDir):
                         if appFile.endswith('appdata.xml'):
@@ -147 +148 @@
                                 app.set_priority(0)
                                 if app.get_id_filename() in lliurexApps.keys():
-#                                       app.set_merge_kind(appstream.AppMergeKind.APPEND)
                                         self._debug("Mergin app "+str(app.get_id())+" as is in Lliurex")
-#                                       app.set_id(lliurexApps[app.get_id_filename()])
                                         lliurexApps[app.get_id_filename()].subsume_full(app,appstream.AppSubsumeFlags.BOTH_WAYS)
                                         store.remove_app(app)
@@ -219 +218 @@
                                         self._debug("Blacklisted app: "+blApp)
                                         resultRe=re.search('([^a-zA-Z0-9_-])',blApp)
-#                                       if blApp[-1]!='*':
                                         if resultRe:
                                                 if blApp[0]=='*':
@@ -238 +236 @@
                                                         resultRe=re.search(blApp,app.get_id())
                                                         if resultRe:
-#                                                       if blApp.lower() in app.get_id_filename().lower():
                                                                 store.remove_app(app)
                                                                 self._debug("Removed "+str(app.get_id()) +" as matches with "+blApp)
@@ -268 +265 @@
                                 for repo in repoTypeList:
                                         self._debug(("Fetching repo %s")%(repo))
-                                        print (_("Fetching %s catalogue: "+progressBar)%repoType,end="\r")
-                                        progressBar=progressBar+"#"
-                                        print (_("Fetching %s catalogue: "+progressBar)%repoType,end="\r")
+#                                       print (("Fetching %s catalogue: "+progressBar)%repoType,end="\r")
+#                                       progressBar=progressBar+"#"
+#                                       print (("Fetching %s catalogue: "+progressBar)%repoType,end="\r")
                                         applist=self._generate_applist(self._fetch_repo(repo))
-                                        progressBar=progressBar+"##"
-                                        print (_("Fetching %s catalogue: "+progressBar)%repoType,end="\r")
+#                                       progressBar=progressBar+"##"
+#                                       print (("Fetching %s catalogue: "+progressBar)%repoType,end="\r")
                                         self._debug("Processing info...")
                                         self._th_generate_xml_catalog(applist,outdir,infoPage,repoType,progressBar)
                                         self._debug("Fetched repo "+repo)
-                                        print (_("Removing old entries..."))
+#                                       print (("Removing old entries..."))
                                         self._clean_bundle_catalogue(applist,outdir)
                         else:
@@ -318 +315 @@
                 lenAppList=len(randomList)
                 inc=30/lenAppList
-                print (CURSOR_UP)
+#               print (CURSOR_UP)
                 for app in randomList:
                         th=threading.Thread(target=self._th_write_xml, args = (app,outdir,infoPage,semaphore,inc))
@@ -327 +324 @@
                                 progressBar='#'+progressBar
 #                       print (CURSOR_UP)
-                        print (_("Fetching %s catalogue: "+progressBar)%repoType,end="\r")
+#                       print (("Fetching %s catalogue: "+progressBar)%repoType,end="\r")
                 os.system('setterm -cursor on')
                 print('')
@@ -338 +335 @@
                 version=nameSplitted[1]
                 arch=nameSplitted[2]
-#               filename=outdir+name+"_"+version+".appdata.xml"
                 filename=outdir+app.lower().replace('appimage',"appdata.xml")
                 self._debug("checking if we need to download "+filename)

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

@@ -55 +55 @@
                 self.result['status']={'status':-1,'msg':''}
                 self.result['data']=[]
-                if action=='list':
-                        self._list_category(tokens)
-                if action=='list_sections':
-                        self._list_sections()
-                if (action=='search' or action=='info'):
-                        self._search_app(tokens,exact_match_for_search)
+                if self.store:
+                        if action=='list':
+                                self._list_category(tokens)
+                        if action=='list_sections':
+                                self._list_sections()
+                        if (action=='search' or action=='info'):
+                                self._search_app(tokens,exact_match_for_search)
                 self.progress=100
                 return(self.result)

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

@@ -17 +17 @@
 class StoreManager:
         def __init__(self,args=()):
-                #               self.store=appstream.Store()
+                self.dbg=0
+                self._propagate_dbg=0
                 self.store=None
                 self.relatedActions={
@@ -29 +30 @@
                                         }
                 self.loadBundles=False
-                self.dbg=0
-                self._propagate_dbg=0
                 if args:
                         if args[0]==1:
@@ -51 +50 @@
                 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
+                self._debug("Load bundles %s"%self.loadBundles)
+                if self.loadBundles:
+                        self.execute_action('load_bundles')             #Initial load of the store
+                else:
+                        self.execute_action('load')             #Initial load of the store
         #def main
 
@@ -108 +111 @@
         def _define_functions_for_threads(self):
                 self.threads['load']="threading.Thread(target=self._load_Store)"
+                self.threads['load_bundles']="threading.Thread(target=self._load_Store)"
                 self.threads['get_info']="threading.Thread(target=self._get_App_Info,args=[args])"
                 self.threads['pkginfo']="threading.Thread(target=self._get_Extended_App_Info,args=[args])"
@@ -128 +132 @@
                 if self.is_action_running('load'):
                         self._join_action('load')
+                if self.is_action_running('load_bundles'):
+                        self._join_action('load_bundles')
                 sw_withoutStatus=False
                 if action not in self.threads.keys():
@@ -218 +224 @@
                                                                         status=True
                                                                         break
-#                       self._debug(action+" running: "+str(status))
                 return(status)
         #def is_action_running
@@ -280 +285 @@
                                 for action in actionList:
                                         if parentAction in self.threadsProgress.keys():
-#                                               self._debug(str(len(self.threadsProgress[parentAction]))+" Threads for action "+parentAction+": "+str(self.threadsProgress[parentAction]))
                                                 acumProgress=0
                                                 for threadfunction,function in self.threadsProgress[parentAction].items():
-#                                                       function=self.threadsProgress[parentAction][threadfunction]
-#                                                       self._debug(str(function)+" "+ str(threadfunction) + " "+parentAction)
                                                         acumProgress=acumProgress+function.progress
-#                                                       self._debug("Acum for process "+parentAction+": "+str(acumProgress))
         
                                                 count=len(self.relatedActions[parentAction])
-#                                               self._debug("Assign result for action" +action)
                                                 self.progressActions[parentAction]=round(acumProgress/count,0)
                                                 progress[parentAction]=self.progressActions[parentAction]
@@ -295 +295 @@
                                 #put a 100% just in case
                                 if parentAction in self.progressActions.keys():
-#                                       if self.progressActions[parentAction]:
-#                                               self.progressActions[parentAction]=100
                                         self.progressActions[parentAction]=100
                 self.lock.release()
-#               self._debug("Progress :"+str(progress))
                 return(self.progressActions)
         #def get_progress
@@ -363 +360 @@
         #def get_status
 
-        def load_bundles(self):
-                self.loadBundles=True
-                self._load_Store()
-
         ####
         #Loads the store
         ####
         def _load_Store(self):
-                action='load'
-                loadFunction=self._execute_class_method(action)
+                if self.loadBundles:
+                        action='load_bundles'
+                else:
+                        action='load'
+                loadFunction=self._execute_class_method(action,None,None)
                 self.store=loadFunction.execute_action(action,self.store,self.loadBundles)
         #def _load_Store