Changeset 7092 for lliurex-store/trunk/fuentes/python3-lliurex-store.install

Timestamp:

Mar 21, 2018, 6:13:59 PM (22 months ago)

Author:

Juanma

Message:

Gui supports full path for local icons * Added icons to appimages and snaps

Location:

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

Files:

• appImageManager.py (modified) (6 diffs)
• infoManager.py (modified) (1 diff)
• snapManager.py (modified) (1 diff)

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

@@ -27 +27 @@
                 self.result['status']={}
                 self.conf_dir=os.getenv("HOME")+"/.cache/lliurex-store"
+                self.icons_dir=self.conf_dir+"/icons"
                 self.bundles_dir=self.conf_dir+"/bundles"
                 self.bundle_types=['appimg']
-                self.appimage_dir=self.conf_dir+"/appimg"
+                self.appimage_dir=os.getenv("HOME")+"/.lliurex-store/appimg"
                 #To get the description of an app we must go to a specific url defined in url_info.
                 #$(appname) we'll be replaced with the appname so the url matches the right one.
                 #If other site has other url naming convention it'll be mandatory to define it with the appropiate replacements
                 self.repos={'probono':{'url':'https://dl.bintray.com/probono/AppImages', 'url_info':'https://bintray.com/probono/AppImages/$(appname)'}}
-                #Appimges not stored in a repo must be listed here, providing the download url and the info url (if there's any)
+                #Appimges not stored in a repo must be listed in this file, providing the download url and the info url (if there's any)
                 self.external_appimages="/usr/share/lliurex-store/files/external_appimages.json"
                 self.disabled=False
@@ -361 +362 @@
                                 try:
                                         if name in self.descriptions_dict.keys():
-                                                description=self.descriptions_dict[name]
+                                                (description,icon)=self.descriptions_dict[name]
                                         else:
-                                                description=self._get_description(name,info_url,repo_name)
-                                                self.descriptions_dict.update({name:description})
+                                                (description,icon)=self._get_description_icon(name,info_url,repo_name)
+                                                self.descriptions_dict.update({name:[description,icon]})
                                 except:
                                         description=''
+                                        icon=''
                         summary=' '.join(list(description.split(' ')[:8]))
                         description="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.\n"+description
@@ -383 +385 @@
 #                       f.write("       <category>GTK</category>\n")
                         f.write("  </categories>\n")
-                        f.write("<icon type=\"cached\">"+name+"_"+name+".png</icon>\n")
+#                       f.write("<icon type=\"cached\">"+name+"_"+name+".png</icon>\n")
+                        f.write("<icon type=\"local\">"+icon+"</icon>\n")
                         f.write("</component>\n")
                         f.write("</components>\n")
@@ -389 +392 @@
         #def _write_xml_file
 
-        def _get_description(self,app_name,info_url,repo_name):
+        def _get_description_icon(self,app_name,info_url,repo_name):
                 desc=''
-                if '$(appname)' in info_url:
-                        info_url=info_url.replace('$(appname)',app_name)
+                icon=''
                 if info_url:
+                        if '$(appname)' in info_url:
+                                info_url=info_url.replace('$(appname)',app_name)
                         self._debug("Getting description from repo/app %s - %s "%(repo_name,info_url))
                         try:
@@ -401 +405 @@
                                                 soup=BeautifulSoup(content,"html.parser")
                                                 description_div=soup.findAll('div', attrs={ "class" : "description-text"})
+                                                icon_div=soup.findAll('div', attrs={ "class" : "avatar-icon avatar-large description-icon "})
                                 if len(description_div)>0:
                                         desc=description_div[0].text
                                         desc=desc.replace(':','.')
                                         desc=desc.replace('&','&amp;')
+                                if len(icon_div)>0:
+                                        icon_str=str(icon_div[0])
+                                        icon=icon_str.split(' ')[9]
+                                        icon=icon.lstrip('url(')
+                                        if icon.startswith('http'):
+                                                icon=icon.rstrip(');"></div>')
+                                                icon=self._download_file(icon,app_name)
+                                        print("Icon: %s"%icon)
                         except Exception as e:
                                 print("Can't get description from "+info_url)
                                 print(str(e))
                                 pass
-                return(desc)
+                return([desc,icon])
         #def _get_description
 
@@ -425 +438 @@
         #def _clean_bunlde_catalogue
 
+        def _download_file(self,url,app_name):
+#               target_file=self.icons_folder+'/'+app_name+".png"
+                target_file=self.icons_dir+'/'+app_name+".png"
+                if not os.path.isfile(target_file):
+#                       shutil.copy("/usr/share/icons/hicolor/128x128/apps/lliurex-store.png",target_file)
+#                       if not os.fork():
+                        if not os.path.isfile(target_file):
+                                self._debug("Downloading %s to %s"%(url,target_file))
+                                try:
+                                        with urllib.request.urlopen(url) as response, open(target_file, 'wb') as out_file:
+                                                bf=16*1024
+                                                acumbf=0
+                                                file_size=int(response.info()['Content-Length'])
+                                                while True:
+                                                        if acumbf>=file_size:
+                                                            break
+                                                        shutil.copyfileobj(response, out_file,bf)
+                                                        acumbf=acumbf+bf
+                                        st = os.stat(target_file)
+                                except Exception as e:
+                                        self._debug("Unable to download %s"%url)
+                                        self._debug("Reason: %s"%e)
+                                        target_file=url
+#                               os._exit(0)
+                return(target_file)
+        #def _download_file

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

@@ -94 +94 @@
                                 appInfo['categories']=app.get_categories()
                         if app.get_icon_default():
-                                appInfo['icon']=app.get_icon_default().get_name()
+                                if app.get_icon_default().get_filename():
+                                        appInfo['icon']=app.get_icon_default().get_filename()
+                                else:
+                                        appInfo['icon']=app.get_icon_default().get_name()
                                 if appInfo['icon']==None:
                                         icons=app.get_icons()

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

@@ -234 +234 @@
                                         self._debug("Unable to download %s"%url)
                                         self._debug("Reason: %s"%e)
+                                        target_file=''
 #                               os._exit(0)
                 return(target_file)