Changeset 3144 for lliurex-store/trunk

Timestamp:

Dec 21, 2016, 3:47:38 PM (4 years ago)

Author:

Juanma

Message:

wip on yml

Location:

lliurex-store/trunk/fuentes/lliurex-appstore.install/usr/bin

Files:

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

lliurex-store/trunk/fuentes/lliurex-appstore.install/usr/bin/plugins/infoManager.py

@@ -114 +114 @@
                                 if 'embed' not in appInfo['video']:
                                         appInfo['video']=appInfo['video'].replace('watch?v=','embed/')
+                        print(app.get_bundles())
+                        for bundle in app.get_bundles():
+                                print("3")
+                                if bundle.get_kind()==0:
+                                        appInfo['installerUrl']=bundle.get_id()
                         applistInfo.append(appInfo)
                         self._callback_progress()

lliurex-store/trunk/fuentes/lliurex-appstore.install/usr/bin/plugins/loadStore.py

@@ -7 +7 @@
 class loadstore:
         def __init__(self):
-                self.dbg=0
+                self.dbg=1
                 self.pluginInfo={'load':'*'}
                 self.store=''
@@ -20 +20 @@
         def _debug(self,msg=''):
                 if self.dbg==1:
-                        print ('_debug Load: '+msg)
+                        print ('DEBUG Load: '+msg)
         #def _debug
 
@@ -41 +41 @@
                 store.load(appstream.StoreLoadFlags.APP_INFO_USER)
                 store.load(appstream.StoreLoadFlags.DESKTOP)
-                lliurex_dir="/usr/share/app-info/xmls"
+                lliurex_dir="/usr/share/app-info/xmls2"
+                store.set_origin('lliurex')
                 if os.path.exists(lliurex_dir):
                         for lliurex in os.listdir(lliurex_dir):
-                                if lliurex.endswith('.xml'):
+                                #                               if lliurex.endswith('.yml'):
+                                if lliurex.endswith('.xml') or lliurex.endswith('.yml'):
                                         storePath=Gio.File.new_for_path(lliurex_dir+'/'+lliurex)
                                         self._debug("Adding file "+lliurex_dir+'/'+lliurex)

lliurex-store/trunk/fuentes/lliurex-appstore.install/usr/bin/plugins/searchManager.py

@@ -1 +1 @@
 import locale
+import gi
+gi.require_version('AppStreamGlib', '1.0')
+from gi.repository import AppStreamGlib as appstream
 
 class searchmanager:
@@ -29 +32 @@
 
         def execute_action(self,appstreamStore,action,tokens):
+                if len(tokens.split(' '))>1 or action=='list':
+                        self._debug("Tokenizing search items")
+                        tokens=appstream.utils_search_tokenize(tokens)
+                else:
+                        tokens=[tokens]
                 self.store=appstreamStore
                 if action=='list':

lliurex-store/trunk/fuentes/lliurex-appstore.install/usr/bin/storeManager.py

@@ -378 +378 @@
                         finder=self.registeredPlugins[action][('*')]
                 #Tokenize the search if there're multiple items
-                if len(searchItem.split(' '))>1 or action=='list':
-                        self._debug("Tokenizing search items")
-                        searchItem=appstream.utils_search_tokenize(searchItem)
-                else:
-                        searchItem=[searchItem]
+#               if len(searchItem.split(' '))>1 or action=='list':
+#                       self._debug("Tokenizing search items")
+#                       searchItem=appstream.utils_search_tokenize(searchItem)
+#               else:
+#                       searchItem=[searchItem]
 #               searchFunction=eval(finder+"()")
                 searchFunction=eval(self.pluginMod+'.'+finder+"()")