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

Timestamp:

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

Author:

Juanma

Message:

Removed text messages from loadstore class

File:

• lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/plugins/loadStore.py (modified) (10 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)