Changeset 7119

Timestamp:

Apr 5, 2018, 2:58:50 PM (2 years ago)

Author:

Juanma

Message:

WIP on bundles support

Location:

lliurex-store/trunk/fuentes

Files:

• lliurex-store-cli/usr/share/lliurex-store/lliurex-store-cli.py (modified) (2 diffs)
• python3-lliurex-store.install/usr/share/lliurexstore/storeManager.py (modified) (4 diffs)

lliurex-store/trunk/fuentes/lliurex-store-cli/usr/share/lliurex-store/lliurex-store-cli.py

@@ -39 +39 @@
                                         for data in results[action]:
                                                 if action=='info':
+                                                        print(data)
                                                         try:
-                                                                print(color.DARKCYAN+_(u'Package')+': '+color.END + data['package'])
-                                                                print(_(u'Name')+': '+data['name'])
-                                                                print(_(u'ID')+': '+data['id'])
-                                                                print(_(u'Version')+': '+data['version'])
-                                                                print(_(u'Size')+': '+data['size'])
-                                                                print(_(u'License')+': '+data['license'])
+#                                                               print(color.DARKCYAN+_(u'Package')+': '+color.END + data['package'])
+                                                                print("%s%s: %s%s"%(color.DARKCYAN,_(u'Package'),color.END,data['package']))
+#                                                               print(_(u'Name')+': '+data['name'])
+                                                                print("%s: %s"%(_(u'Name'),data['name']))
+#                                                               print(_(u'ID')+': '+data['id'])
+                                                                print("%s: %s"%(_(u'ID'),data['id']))
+#                                                               print(_(u'Version')+': '+str(data['version']))
+                                                                print("%s: %s"%(_(u'Version'),data['version']))
+                                                                print("%s: %s"%(_(u'Releases'),', '.join(data['releases'])))
+#                                                               print(_(u'Size')+': '+data['size'])
+                                                                print("%s: %s"%(_(u'Size'),data['size']))
+#                                                               print(_(u'License')+': '+data['license'])
+                                                                print("%s: %s"%(_(u'License'),data['license']))
                                                                 listCat=[]
                                                                 for cat in data['categories']:
                                                                         listCat.append(_(cat))
-                                                                print(_(u'Categories')+': '+','.join(listCat))
+#                                                               print(_(u'Categories')+': '+','.join(listCat))
+                                                                print("%s: %s"%(_(u'Categories'),','.join(listCat)))
                                                                 msg=''
                                                                 if data['state']=='installed':
@@ -57 +66 @@
                                                                 if data['updatable']:
                                                                         msg +=_(' (updatable)')
-                                                                print(_(u'Status')+': '+msg)
-                                                                print(_(u'Summary')+': '+data['summary'])
+#                                                               print(_(u'Status')+': '+msg)
+                                                                print("%s: %s"%(_(u'Status'),msg))
+#                                                               print(_(u'Summary')+': '+data['summary'])
+                                                                print("%s: %s"%(_(u'Summary'),data['summary']))
                                                                 desc=(html2text.html2text(data['description'],"lxml"))
-                                                                print(_(u'Description')+': '+desc)
+#                                                               print(_(u'Description')+': '+desc)
+                                                                print("%s: %s"%(_(u'Description'),desc))
                                                                 pkgString=[]
                                                                 for dependency in data['depends']:
                                                                                 pkgName=dependency.split(';')[0]
                                                                                 pkgString.append(pkgName)
-                                                                print(_(u'Depends')+': '+', '.join(pkgString))
+#                                                               print(_(u'Depends')+': '+', '.join(pkgString))
+                                                                print("%s: %s"%(_(u'Depends'), ''.join(pkgString)))
                                                                 print("")
                                                         except Exception as e:

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

@@ -17 +17 @@
 class StoreManager():
         def __init__(self,*args,**kwargs):
-                self.dbg=False
                 if 'dbg' in kwargs.keys():
                         self.dbg=kwargs['dbg']
+                self.dbg=True
                 self._propagate_dbg=False
                 self.store=None
@@ -391 +391 @@
         def _load_Store(self):
                 action='load'
+                #Load appstream metada first
+                package_type='*'
+                load_function=self._execute_class_method(action,package_type,launchedby=None)
+                self.store=load_function.execute_action(action=action,store=self.store)['data']
+                #Once appstream is loaded load the appstream plugins for other package types (snap, appimage...)
                 for package_type in self.plugins_registered[action]:
-                        load_function=self._execute_class_method(action,package_type,launchedby=None)
-                        self.store=load_function.execute_action(action=action,store=self.store)['data']
+                        if package_type!='*':
+                                load_function=self._execute_class_method(action,package_type,launchedby=None)
+                                self.store=load_function.execute_action(action=action,store=self.store)['data']
         #def _load_Store
 
@@ -425 +431 @@
                 result['status']={'status':0,'msg':''}
                 for app_info in info_applist:
-                        package_type=self._check_package_type(app_info)
-                        if package_type in types_dict:
-                                types_dict[package_type].append(app_info)
-                        else:
-                                types_dict[package_type]=[app_info]
+                        available_channels=self._check_package_type(app_info)
+                        for package_type in available_channels:
+                                if package_type in types_dict:
+                                        types_dict[package_type].append(app_info)
+                                else:
+                                        types_dict[package_type]=[app_info]
                 for package_type in types_dict:
                         self._debug("Checking plugin for %s %s"%(action,package_type))
@@ -613 +620 @@
                 #Zomandos must have the subcategory "Zomando"
                 self._debug("Checking package type for app "+app_info['name'])
+                return_msg=[]
+                if app_info['component']:
+                        return_msg.append('*')
                 if "Zomando" in app_info['categories']:
-                        return_msg="zmd"
-                else:
+                        return_msg.append("zmd")
                 #Standalone installers must have an installerUrl field loaded from a bundle type=script description
-                        if app_info['bundle']!='':
-                                return_msg=app_info['bundle']
-                        elif app_info['installerUrl']!='':
-                                return_msg="sh"
-                        else:
-                                return_msg="deb"
+                if app_info['bundle']:
+                        return_msg.append('bundle')
+                if app_info['installerUrl']!='':
+                        return_msg.append("sh")
+                else:
+                        return_msg=["deb"]
                 return(return_msg)
         #def _check_package_type