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

Timestamp:

Jun 16, 2017, 12:22:02 AM (4 years ago)

Author:

Juanma

Message:

loadStore manages the appimage catalogue

Location:

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

Files:

• plugins/appImageManager.py (modified) (2 diffs)
• plugins/loadStore.py (modified) (3 diffs)
• storeManager.py (modified) (1 diff)

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

@@ -18 +18 @@
                 #action=example
                 #package='*' (in this case all packages)
-                self.pluginInfo={'install':'appimage','remove':'appimage','pkginfo':'appimage','loadCatalogue':'appimage'}
+                self.pluginInfo={'install':'appimage','remove':'appimage','pkginfo':'appimage'}
                 self.result={}
                 self.result['data']={}
@@ -155 +155 @@
         #def _get_info
 
-        def _download_appImg_catalogue(self):
-                outfile='appimage.yml'
-                outdir="/usr/share/metainfo"
-                outdir="/tmp"
-                content=''
-                applist=[]
-                repolist=['https://dl.bintray.com/probono/AppImages']
-                self.descDict={}
-                for repo in repolist:
-                        self._debug(("Fetching repo %s")%(repo))
-                        applist=self._generate_applist(self._fetch_repo(repo))
-                        self._debug("Processing info...")
-                        self._th_generate_xml_catalog(applist,outdir)
-                        self._debug("Fetched repo "+repo)
-                self._debug("Setting status to 0")
-                self._set_status(0)
-                return("Repo fetched")
-
-        def _fetch_repo(self,repo):
-            with urllib.request.urlopen('https://dl.bintray.com/probono/AppImages') as f:
-                content=(f.read().decode('utf-8'))
-            return(content)
-
-        def _generate_applist(self,content):
-                garbageList=[]
-                applist=[]
-                garbageList=content.split(' ')
-                for garbageLine in garbageList:
-                        if garbageLine.endswith('AppImage"'):
-                                app=garbageLine.replace('href=":','')
-                                applist.append(app.replace('"',''))
-                return(applist)
-
-        def _get_description(self,appName):
-                desc=''
-                self._debug("Getting description from 'https://bintray.com/probono/AppImages/'"+appName)
-                try:
-                        with urllib.request.urlopen('https://bintray.com/probono/AppImages/'+appName) 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:
-                        pass
-                return(desc)
-
-        def _th_generate_xml_catalog(self,applist,outdir):
-                oldName=''
-                oldDesc=''
-                maxconnections = 10
-                semaphore = threading.BoundedSemaphore(value=maxconnections)
-                randomList = list(applist)
-                random.shuffle(randomList)
-                lenAppList=len(randomList)
-                self.progress=25
-                for app in randomList:
-                        th=threading.Thread(target=self._th_write_xml, args = (app,outdir,semaphore))
-                        th.start()
-                        self._callback(1,len(randomList))
-                while (len(threading.enumerate())>3):
-                        self._callback()
-                        time.sleep(0.5)
-
-        def _th_write_xml(self,app,outdir,semaphore):
-            semaphore.acquire()
-            lock=threading.Lock()
-            self._debug("Generating "+app+" xml")
-            nameSplitted=app.split('-')
-            name=nameSplitted[0]
-            version=nameSplitted[1]
-            arch=nameSplitted[2]
-            f=open(outdir+'/'+name+"_"+version+".appdata.xml",'w')
-            f.write('<?xml version="1.0" encoding="UTF-8"?>'+"\n")
-            f.write("<components version=\"0.10\">\n")
-            f.write("<component  type=\"desktop-application\">\n")
-            f.write("  <id>"+app.lower()+"</id>\n")
-            f.write("  <pkgname>"+app+"</pkgname>\n")
-            f.write("  <name>"+name+"</name>\n")
-            f.write("  <summary>"+name+" AppImage Bundle</summary>\n")
-            f.write("  <metadata_license>CC0-1.0</metadata_license>\n")
-            f.write("  <provides><binary>"+app+"</binary></provides>\n")
-            f.write("  <releases>\n")
-            f.write("  <release version=\""+version+"\" timestamp=\"1408573857\"></release>\n")
-            f.write("  </releases>\n")
-            f.write("  <launchable type=\"desktop-id\">"+name+".desktop</launchable>\n")
-            with lock:
-                if name in self.descDict.keys():
-                    description=self.descDict[name]
-                else:
-                    description=self._get_description(name)
-                    self.descDict.update({name:description})
-            f.write("  <description><p>This is an AppImage bundle of app "+name+". It hasn't been tested by our developers and comes from a 3rd party dev team. Please use it carefully.</p><p>"+description+"</p></description>\n")
-            f.write("  <bundle type=\"appimage\">"+app+"</bundle>\n")
-            f.write("  <keywords>\n")
-            f.write("    <keyword>"+name+"</keyword>\n")
-            f.write("    <keyword>appimage</keyword>\n")
-            f.write("  </keywords>\n")
-            f.write("  <categories>\n")
-            f.write("    <category>AppImage</category>\n")
-            f.write("    <category>GTK</category>\n")
-            f.write("  </categories>\n")
-            f.write("<icon type=\"cached\">"+name+"_"+name+".png</icon>\n")
-            f.write("</component>\n")
-            f.write("</components>\n")
-            f.close()
-            semaphore.release()

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

@@ -7 +7 @@
 import json
 import re
+import urllib
+import random
+import threading
+import time
 
 class loadstore:
@@ -59 +63 @@
                 store=self._sanitize_store(store)
                 if loadBundles:
+                        self._download_appImg_catalogue()
                         store=self.load_appImg_catalog(store)
                 self.store=store
@@ -227 +232 @@
         #def _apply_blacklist
 
+        def _download_appImg_catalogue(self):
+                CURSOR_UP='\033[F'
+                ERASE_LINE='\033[K'
+                outfile='appimage.yml'
+                outdir="/usr/share/metainfo"
+                outdir="/tmp"
+                content=''
+                applist=[]
+                progressBar="#"
+                repolist=['https://dl.bintray.com/probono/AppImages']
+                self.descDict={}
+                for repo in repolist:
+                        self._debug(("Fetching repo %s")%(repo))
+                        print ("Download Progress: "+progressBar,end="\r")
+                        progressBar=progressBar+"#"
+                        applist=self._generate_applist(self._fetch_repo(repo))
+                        print ("Download Progress: "+progressBar,end="\r")
+                        self._debug("Processing info...")
+                        self._th_generate_xml_catalog(applist,outdir,progressBar)
+                        self._debug("Fetched repo "+repo)
+                self._debug("Setting status to 0")
+                self._set_status(0)
+                return("Repo fetched")
+
+        def _fetch_repo(self,repo):
+                with urllib.request.urlopen('https://dl.bintray.com/probono/AppImages') as f:
+                        content=(f.read().decode('utf-8'))
+                return(content)
+
+        def _generate_applist(self,content):
+                garbageList=[]
+                applist=[]
+                garbageList=content.split(' ')
+                for garbageLine in garbageList:
+                        if garbageLine.endswith('AppImage"'):
+                                app=garbageLine.replace('href=":','')
+                                applist.append(app.replace('"',''))
+                return(applist)
+
+        def _get_description(self,appName):
+                desc=''
+                self._debug("Getting description from 'https://bintray.com/probono/AppImages/'"+appName)
+                try:
+                        with urllib.request.urlopen('https://bintray.com/probono/AppImages/'+appName) 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:
+                        pass
+                return(desc)
+
+        def _th_generate_xml_catalog(self,applist,outdir,progressBar=''):
+                CURSOR_UP='\033[F'
+                ERASE_LINE='\033[K'
+                oldName=''
+                oldDesc=''
+                maxconnections = 10
+                semaphore = threading.BoundedSemaphore(value=maxconnections)
+                randomList = list(applist)
+                random.shuffle(randomList)
+                lenAppList=len(randomList)
+                inc=25/lenAppList
+                for app in randomList:
+                        th=threading.Thread(target=self._th_write_xml, args = (app,outdir,semaphore,inc))
+                        th.start()
+#               while (len(threading.enumerate())>3):
+#                       self._callback()
+                        time.sleep(0.5)
+                        progressBar=self.progress
+                        print ("Download Progress: "+str(int(progressBar))+"%",end="\r")
+
+        def _th_write_xml(self,app,outdir,semaphore,inc):
+                semaphore.acquire()
+                lock=threading.Lock()
+                self._debug("Generating "+app+" xml")
+                nameSplitted=app.split('-')
+                name=nameSplitted[0]
+                version=nameSplitted[1]
+                arch=nameSplitted[2]
+                f=open(outdir+'/'+name+"_"+version+".appdata.xml",'w')
+                f.write('<?xml version="1.0" encoding="UTF-8"?>'+"\n")
+                f.write("<components version=\"0.10\">\n")
+                f.write("<component  type=\"desktop-application\">\n")
+                f.write("  <id>"+app.lower()+"</id>\n")
+                f.write("  <pkgname>"+app+"</pkgname>\n")
+                f.write("  <name>"+name+"</name>\n")
+                f.write("  <summary>"+name+" AppImage Bundle</summary>\n")
+                f.write("  <metadata_license>CC0-1.0</metadata_license>\n")
+                f.write("  <provides><binary>"+app+"</binary></provides>\n")
+                f.write("  <releases>\n")
+                f.write("  <release version=\""+version+"\" timestamp=\"1408573857\"></release>\n")
+                f.write("  </releases>\n")
+                f.write("  <launchable type=\"desktop-id\">"+name+".desktop</launchable>\n")
+                with lock:
+                        if name in self.descDict.keys():
+                                description=self.descDict[name]
+                        else:
+                                description=self._get_description(name)
+                                self.descDict.update({name:description})
+                        self.progress=self.progress+inc
+                f.write("  <description><p>This is an AppImage bundle of app "+name+". It hasn't been tested by our developers and comes from a 3rd party dev team. Please use it carefully.</p><p>"+description+"</p></description>\n")
+                f.write("  <bundle type=\"appimage\">"+app+"</bundle>\n")
+                f.write("  <keywords>\n")
+                f.write("       <keyword>"+name+"</keyword>\n")
+                f.write("       <keyword>appimage</keyword>\n")
+                f.write("  </keywords>\n")
+                f.write("  <categories>\n")
+                f.write("       <category>AppImage</category>\n")
+                f.write("       <category>GTK</category>\n")
+                f.write("  </categories>\n")
+                f.write("<icon type=\"cached\">"+name+"_"+name+".png</icon>\n")
+                f.write("</component>\n")
+                f.write("</components>\n")
+                f.close()
+                semaphore.release()

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

@@ -371 +371 @@
         def _load_Store(self):
                 action='load'
-                if self.loadBundles:
-                        function=self._execute_class_method('loadCatalogue','appimage')
-                        function.execute_action('loadCatalogue')
                 loadFunction=self._execute_class_method(action)
+                print(self.loadBundles)
                 self.store=loadFunction.execute_action(action,self.store,self.loadBundles)
         #def _load_Store