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

Timestamp:

Jun 19, 2017, 10:06:53 AM (3 years ago)

Author:

Juanma

Message:

minor changes in loadstore

Location:

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

Files:

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

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

@@ -277 +277 @@
                                         self._th_generate_xml_catalog(applist,outdir,infoPage,repoType,progressBar)
                                         self._debug("Fetched repo "+repo)
+                                        print (_("Removing old entries..."))
+                                        self._clean_bundle_catalogue(applist,outdir)
                         else:
                                 print("permission denied")
@@ -304 +306 @@
                                 applist.append(app.replace('"',''))
                 return(applist)
-
-        def _get_description(self,appName,infoPage):
-                desc=''
-                if '$(appname)' in infoPage:
-                        infoPage=infoPage.replace('$(appname)',appName)
-                self._debug("Getting description from "+infoPage)
-                try:
-                        with urllib.request.urlopen(infoPage) as f:
-                                content=(f.read().decode('utf-8'))
-                                soup=BeautifulSoup(content,"html.parser")
-                                descDiv=soup.findAll('div', attrs={ "class" : "description-text"})
-                        if len(descDiv)>0:
-                                desc=descDiv[0].text
-                                desc=desc.replace(':','.')
-                                desc=desc.replace('&','&')
-                except Exception as e:
-                        print("Can't get description from "+infoPage)
-                        print(str(e))
-                        pass
-                return(desc)
 
         def _th_generate_xml_catalog(self,applist,outdir,infoPage,repoType,progressBar=''):
@@ -356 +338 @@
                 version=nameSplitted[1]
                 arch=nameSplitted[2]
-                filename=outdir+name+"_"+version+".appdata.xml"
+#               filename=outdir+name+"_"+version+".appdata.xml"
+                filename=outdir+app.lower().replace('appimage',"appdata.xml")
                 self._debug("checking if we need to download "+filename)
                 if not os.path.isfile(filename):
@@ -401 +384 @@
                         self.progress=self.progress+inc
                 semaphore.release()
+        
+        def _get_description(self,appName,infoPage):
+                desc=''
+                if '$(appname)' in infoPage:
+                        infoPage=infoPage.replace('$(appname)',appName)
+                self._debug("Getting description from "+infoPage)
+                try:
+                        with urllib.request.urlopen(infoPage) as f:
+                                content=(f.read().decode('utf-8'))
+                                soup=BeautifulSoup(content,"html.parser")
+                                descDiv=soup.findAll('div', attrs={ "class" : "description-text"})
+                        if len(descDiv)>0:
+                                desc=descDiv[0].text
+                                desc=desc.replace(':','.')
+                                desc=desc.replace('&','&')
+                except Exception as e:
+                        print("Can't get description from "+infoPage)
+                        print(str(e))
+                        pass
+                return(desc)
+
+        def _clean_bundle_catalogue(self,applist,outdir):
+                xmlList=[]
+                applist=[item.lower() for item in applist]
+                for xmlFile in os.listdir(outdir):
+                        if xmlFile.endswith('appdata.xml'):
+                                xmlList.append(xmlFile.lower().replace('appdata.xml','appimage'))
+        
+                if xmlList:
+                        discardList=list(set(xmlList).difference(applist))
+                        for discardFile in discardList:
+                                os.remove(outdir+'/'+discardFile.replace('appimage','appdata.xml'))
+        #def _clean_appImg_repo
+

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

@@ -419 +419 @@
                                 self._debug("Retrieving info for "+str(typeDict[package_type]))
                                 pkgInfoFunction=self._execute_class_method(action,package_type,launchedby)
-                                result.update(pkgInfoFunction.execute_action(action,typeDict[package_type]))
-#                               result['data'].extend(pkgInfoFunction.execute_action(action,typeDict[package_type])['data'])
+#                               result.update(pkgInfoFunction.execute_action(action,typeDict[package_type]))
+                                result['data'].extend(pkgInfoFunction.execute_action(action,typeDict[package_type])['data'])
 #                               result['status']=pkgInfoFunction.execute_action(action,typeDict[package_type])['status']
 #                               result=pkgInfoFunction.execute_action(action,typeDict[package_type])