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

Timestamp:

Jul 16, 2018, 12:53:25 PM (3 years ago)

Author:

Juanma

Message:

Availabe snaps are loaded from available sections

File:

• lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/plugins/appImageManager.py (modified) (10 diffs)

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

@@ -33 +33 @@
                 self.bundle_types=['appimg']
                 self.appimage_dir=os.getenv("HOME")+"/.local/bin"
+                #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={'appimagehub':{'type':'json','url':'https://appimage.github.io/feed.json','url_info':''}}
-                #Appimages not stored in a repo must be listed in this file, providing at least the download url
+                #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.locale=['ca_ES@valencia','ca@valencia','qcv','ca','ca_ES','es_ES','es','en_US','en_GB','en','C']
@@ -225 +228 @@
                         all_apps.extend(applist)
                 return True
-        #def _get_bundles_catalogue
 
         def _get_external_catalogue(self):
@@ -256 +258 @@
                                         appinfo['keywords']=app_info['keywords']
                                 if 'version' in app_info.keys():
-                                        appinfo['version']=app_info['version']
+                                        appinfo['reywords']=app_info['keywords']
                                 self._debug("Fetching external appimage %s"%app_info['url'])
                                 appinfo['bundle']='appimage'
@@ -269 +271 @@
 #               self._clean_bundle_catalogue(all_apps,outdir)
                 return(True)
-        #def _get_external_catalogue
+        #def _get_bundles_catalogue
         
         def _fetch_repo(self,repo):
@@ -311 +313 @@
 
         def load_json_appinfo(self,appimage):
+                self._debug(appimage)
                 appinfo=self._init_appinfo()
                 appinfo['name']=appimage['name']
@@ -318 +321 @@
                 appinfo['summary']=''
                 if 'description' in appimage.keys():
-                        if type(appinfo['description'])==type({}):
+                        if type(appimage['description'])==type({}):
                                 for lang in appinfo['description'].keys():
                                         appinfo['description'].update({lang:appimage['description'][lang]})
@@ -373 +376 @@
                 sw_new=False
                 app=appstream.App()
-                app_orig=self.store.get_app_by_pkgname(appinfo['package'].lower())
+                app_orig=self.store.get_app_by_pkgname(appinfo['name'].lower())
                 if not app_orig:
-                        app_orig=self.store.get_app_by_id(appinfo['package'].lower()+".desktop")
+                        app_orig=self.store.get_app_by_id(appinfo['name'].lower()+".desktop")
                 if app_orig:
                         self._debug("Extending app %s"%appinfo['package'])
@@ -418 +421 @@
                         if not appinfo['name'].endswith('.appimage'):
                                 app.set_name("C",appinfo['name']+".appimage")
-                        for lang,desc in appinfo['description'].items():
-                                description="This is an AppImage bundle of app %s. It hasn't been tested by our developers and comes from a 3rd party dev team. Please use it carefully.\n%s"%(appinfo['name'],desc)
+                        if appinfo['description']:
+                                for lang,desc in appinfo['description'].items():
+                                        description="This is an AppImage bundle of app %s. It hasn't been tested by our developers and comes from a 3rd party dev team. Please use it carefully.\n%s"%(appinfo['name'],desc)
+                                        summary=' '.join(list(description.split(' ')[:8]))
+                                        app.set_description(lang,description)
+                                        app.set_comment(lang,summary)
+                        else:
+                                description="This is an AppImage bundle of app %s. It hasn't been tested by our developers and comes from a 3rd party dev team. Please use it carefully"%(appinfo['name'])
                                 summary=' '.join(list(description.split(' ')[:8]))
-                                if len(description.split(' '))>8:
-                                        summary+="... "
-                                app.set_description(lang,description)
-                                app.set_comment(lang,summary)
+                                app.set_description("C",description)
+                                app.set_comment("C",summary)
+
                         if 'categories' in appinfo.keys():
                                 for category in appinfo['categories']:
@@ -596 +604 @@
                                 releases_page=""
                                 url_source="opensuse"
+#                               app_info['installerUrl']=app_info['installerUrl']+"/download"
 
                         if url_source or releases_page:
@@ -609 +618 @@
                                                         package_name=package_data.findAll('strong', attrs={ "class" : "pl-1"})
                                                 package_link=package_data['href']
-                                                package_link=releases_page+package_link
-                                                releases.append(package_link)
-                                                self._debug("Link: %s"%package_link)
+                                                if releases_page or url_source:
+                                                        package_link=releases_page+package_link
+                                                        releases.append(package_link)
+                                                        self._debug("Link: %s"%package_link)
                         else:
                                 releases=[app_info['installerUrl']]