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

Timestamp:

Jan 18, 2018, 1:34:53 PM (3 years ago)

Author:

Juanma

Message:

Added snap support. Minor changes

File:

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

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

@@ -3 +3 @@
 class infomanager:
         def __init__(self):
-                self.dbg=0
+                self.dbg=True
                 self.pluginInfo={'get_info':'*'}
 #               self.pluginInfo={'info':'*','get_info':'*'}
@@ -14 +14 @@
         #def __init__
 
-        def set_debug(self,dbg='1'):
-                self.dbg=int(dbg)
+        def set_debug(self,dbg=True):
+                self.dbg=dbg
                 self._debug ("Debug enabled")
         #def set__debug
 
         def _debug(self,msg=''):
-                if self.dbg==1:
+                if self.dbg:
                         print ('DEBUG Info: '+str(msg))
         #def _debug
@@ -48 +48 @@
         def _set_locale(self):
                 if locale.getdefaultlocale()[0]=="ca_ES":
-                        self.locale=['ca_ES@valencia','ca@valencia','qcv','ca','ca_ES','es_ES','es','en_US','en','C']
+                        self.locale=['ca_ES@valencia','ca@valencia','qcv','ca','ca_ES','es_ES','es','en_US','en_GB','en','C']
                 else:
                         if locale.getdefaultlocale()[0]=="es_ES":
-                                self.locale=['es_ES','es','ca_ES@valencia','ca@valencia','qcv','ca','ca_ES','en_US','en','C']
-                        else:
-                                self.locale=[locale.getlocale()[0],'en_US','en','ca_ES@valencia','ca@valencia','qcv','ca','es_ES','es','C']
+                                self.locale=['es_ES','es','ca_ES@valencia','ca@valencia','qcv','ca','ca_ES','en_US','en_GB','en','C']
+                        else:
+                                self.locale=[locale.getlocale()[0],'en_US','en_GB','en','ca_ES@valencia','ca@valencia','qcv','ca','es_ES','es','C']
         #def _set_locale
 
@@ -64 +64 @@
                         if app.get_id():
                                 appInfo['id']=app.get_id()
-                                if not appInfo['id'].endswith('desktop'):
-                                        appInfo['id']+='.desktop'
                         for localeItem in self.locale:
                                 if app.get_name(localeItem):
@@ -81 +79 @@
                                 appInfo['license']=app.get_project_license()
                         else:
+                                appInfo['license']='other/restricted'
                                 orig=app.get_origin()
                                 if orig:
                                         if '-main' in orig or '-universe' in orig:
                                                 appInfo['license']='open source'
-                                        else:
-                                                appInfo['license']='propietary/restricted'
                         for localeItem in self.locale:
                                 if app.get_comment(localeItem):
@@ -156 +153 @@
                                 if 'embed' not in appInfo['video']:
                                         appInfo['video']=appInfo['video'].replace('watch?v=','embed/')
+                        #F***g appstream returns unknown for all the possible types
+#                       if app.get_bundle_default():
+#                               appInfo['bundle']=app.get_bundle_default().get_kind()
+                        #Fix F***g appstream returns unknown for all the possible types
+                        #ID must contain bundle type as last field
                         for bundle in app.get_bundles():
                                 if bundle.get_kind()==0:
-                                #F***g appstream returns unknown for all the possible types
-                                        if bundle.get_id().endswith('AppImage'):
-                                                appInfo['appImage']=bundle.get_id()
-                                        else:
+                                        kind=bundle.get_id().split('.')[-1]
+                                        appInfo['bundle']=kind.lower()
+                                        if kind.lower=='sh':
                                                 appInfo['installerUrl']=bundle.get_id()
-                                if bundle.get_kind()==6:
-                                        appInfo['appImage']=bundle.get_id()
                         applistInfo.append(appInfo)
                         self._callback_progress()
@@ -193 +192 @@
                 'extraInfo':'',\
                 'size':'',\
-                'appImage':'',\
+                'bundle':'',\
+                'updatable':'',\
                 }
                 return(appInfo)