Changeset 7137

Timestamp:

Apr 12, 2018, 2:55:55 PM (3 years ago)

Author:

Juanma

Message:

WIP on releases

Location:

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

Files:

• plugins/appImageManager.py (modified) (7 diffs)
• plugins/infoManager.py (modified) (2 diffs)
• plugins/searchManager.py (modified) (1 diff)
• storeManager.py (modified) (3 diffs)

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

@@ -75 +75 @@
                         self._chk_installDir()
                         if action=='load':
-                                self.result['data']=self._load_appimage_store(self.store)
+                                self.result['data']=self._load_appimage_store()
                         else:
                                 for app_info in applist:
@@ -167 +167 @@
         #def _remove_appimage
 
-        def _load_appimage_store(self,store):
+        def _load_appimage_store(self,store=None):
                 self._get_bundles_catalogue()
                 if os.path.exists(self.bundles_dir):
@@ -333 +333 @@
         #def load_json_appinfo
 
-        def _get_releases_from_json(self,appimage):
-                releases=[]
-                if appimage['links']:
-                        for link in appimage['links']:
-                                if 'type' in link.keys():
-                                        if link['type']=='Download':
-                                                self._debug("Info url: %s"%link['url'])
-                                                try:
-                                                        sw_git=False
-                                                        with urllib.request.urlopen(link['url']) as f:
-                                                                if 'github' in link['url']:
-                                                                        sw_git=True
-                                                                content=(f.read().decode('utf-8'))
-                                                                soup=BeautifulSoup(content,"html.parser")
-                                                                package_a=soup.findAll('a', attrs={ "href" : re.compile(r'.*[aA]pp[iI]mage$')})
-                                                                for package_data in package_a:
-                                                                        package_name=package_data.findAll('strong', attrs={ "class" : "pl-1"})
-                                                                        package_link=package_data['href']
-                                                                        if sw_git:
-                                                                                package_link="https://github.com"+package_link
-                                                                                releases.append(package_link)
-                                                                                self._debug("Link: %s"%package_link)
-                                                except Exception as e:
-                                                        print(e)
-                return releases
-        #def _get_releases_from_json
-
         def _th_generate_xml_catalog(self,applist,outdir,info_url,repo,repo_name):
                 maxconnections = 10
@@ -402 +375 @@
         def _write_xml_file(self,appinfo,repo_info,lock):
                 #Search in local store for the app
+                sw_new=False
                 app=self.store.get_app_by_pkgname(appinfo['package'].lower())
                 if not app:
                         self._debug("Searching for %s"%appinfo['package'])
                         app=self.store.get_app_by_id(appinfo['package'].lower()+".desktop")
-                sw_new=False
                 if not app:
                         self._debug("Generating new %s"%appinfo['package'])
@@ -421 +394 @@
                 app.add_keyword("C","appimage")
                 app.add_category("appimage")
+                app.add_pkgname(appinfo['package'].lower()+".appimage")
+                app.add_url(appstream.UrlKind.UNKNOWN,appinfo['homepage'])
                 if sw_new:
                         app.set_name("C",appinfo['name'])
 #               app.add_pkgname(pkg.get_name()+'.snap')
-                        app.add_pkgname(appinfo['package'])
+                        app.add_pkgname(appinfo['package'].lower()+".appimage")
 #               release=appstream.Release()
 #               release.set_version(pkg.get_version())
 #               app.add_release(release)
-                        app.set_id("appimagehub.%s"%appinfo['name']+'.appimage')
+                        app.set_id("appimagehub.%s"%appinfo['name'].lower()+'.appimage')
 #               app.set_id(pkg.get_name()+'.snap')
                         app.set_id_kind=appstream.IdKind.DESKTOP
@@ -646 +621 @@
         
         def _get_info(self,app_info):
+                app_info=self._get_releases(app_info)
                 app_info['state']='available'
                 if os.path.isfile(self.appimage_dir+'/'+app_info['package']):
@@ -663 +639 @@
         #def _get_info
 
+        def _get_releases(self,app_info):
+                releases=[]
+                if app_info['installerUrl']:
+                        self._debug("Info url: %s"%app_info['installerUrl'])
+                        try:
+                                sw_git=False
+                                if 'github' in app_info['installerUrl']:
+                                        sw_git=True
+#                                       app_info['installerUrl']=app_info['installerUrl']+"/download"
+
+                                with urllib.request.urlopen(app_info['installerUrl']) as f:
+                                        content=(f.read().decode('utf-8'))
+                                        soup=BeautifulSoup(content,"html.parser")
+                                        package_a=soup.findAll('a', attrs={ "href" : re.compile(r'.*\.[aA]pp[iI]mage$')})
+                                        for package_data in package_a:
+                                                package_name=package_data.findAll('strong', attrs={ "class" : "pl-1"})
+                                                package_link=package_data['href']
+                                                if sw_git:
+                                                        package_link="https://github.com"+package_link
+                                                        releases.append(package_link)
+                                                        self._debug("Link: %s"%package_link)
+                        except Exception as e:
+                                print(e)
+                app_info['releases']=releases
+                return app_info
+        #def _get_releases
+        
+        def _get_releases_from_json(self,appimage):
+                releases=[]
+                if appimage['links']:
+                        for link in appimage['links']:
+                                if 'type' in link.keys():
+                                        if link['type']=='Download':
+                                                self._debug("Info url: %s"%link['url'])
+                                                try:
+                                                        sw_git=False
+                                                        with urllib.request.urlopen(link['url']) as f:
+                                                                if 'github' in link['url']:
+                                                                        sw_git=True
+                                                                content=(f.read().decode('utf-8'))
+                                                                soup=BeautifulSoup(content,"html.parser")
+                                                                package_a=soup.findAll('a', attrs={ "href" : re.compile(r'.*[aA]pp[iI]mage$')})
+                                                                for package_data in package_a:
+                                                                        package_name=package_data.findAll('strong', attrs={ "class" : "pl-1"})
+                                                                        package_link=package_data['href']
+                                                                        if sw_git:
+                                                                                package_link="https://github.com"+package_link
+                                                                                releases.append(package_link)
+                                                                                self._debug("Link: %s"%package_link)
+                                                except Exception as e:
+                                                        print(e)
+                return releases
+        #def _get_releases_from_json
+

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

@@ -75 +75 @@
                         if app.get_pkgname_default():
                                 appInfo['package']=app.get_pkgname_default()
+                        if len(app.get_pkgnames())>1:
+                                appInfo['packages']=app.get_pkgnames()
                         if app.get_project_license():
                                 appInfo['license']=app.get_project_license()
@@ -138 +140 @@
                                 appInfo["screenshots"]=screenshots_list
                         #The values are the values of appstream.UrlKind. 1=HOMEPAGE, 0=UNKNOWN
+                        self._debug(app.get_url_item(0))
                         if app.get_url_item(1):
                                 appInfo['homepage']=app.get_url_item(1).strip()

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

@@ -183 +183 @@
                 #4.- Try exact match by pkgname
                         app=self.store.get_app_by_pkgname(app_name)
+                if not app:
+                        app=self.store.get_app_by_id_ignore_prefix(app_name)
                 self._debug("App found %s"%app)
                 return(app)
 
         def _get_apps_by_match(self,tokens,applist=[]):
-                #Add items witch match >= self.precision
+                #Add items with match >= self.precision
                 self._debug("Searching app by fuzzy match")
                 if not applist:

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

@@ -22 +22 @@
                 self._propagate_dbg=False
                 self.store=None
+                self.stores={}
                 self.related_actions={
                                         'load':['load'],
@@ -430 +431 @@
                 result['data']=[]
                 result['status']={'status':0,'msg':''}
+                processed=[]
                 for app_info in info_applist:
                         if channel:
@@ -436 +438 @@
                                 available_channels=self._check_package_type(app_info)
                                 for package_type in available_channels:
+                                        if app_info['component']!='':
+                                                if app_info['package'] in processed:
+                                                        continue
+#                                               processed.append(app_info['package'])
+
                                         if package_type in types_dict:
                                                 types_dict[package_type].append(app_info)