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

Timestamp:

Mar 16, 2018, 1:21:09 PM (2 years ago)

Author:

Juanma

Message:

Fixed snap channels

File:

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

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

@@ -15 +15 @@
         
         def __init__(self):
-                self.dbg=False
+                self.dbg=True
                 self.progress=0
                 self.partial_progress=0
                 self.plugin_actions={'install':'snap','remove':'snap','pkginfo':'snap','load':'snap'}
-                self.cache_dir="/var/lib/lliurexstore/bundles/cache"
+                self.cache_dir=os.getenv("HOME")+"/.cache/lliurex-store"
                 self.icons_folder=self.cache_dir+"/icons"
+                self.images_folder=self.cache_dir+"/images"
                 self.result={}
                 self.result['data']={}
@@ -114 +115 @@
                 bundle=appstream.Bundle()
                 app=appstream.App()
+                icon=appstream.Icon()
+                screenshot=appstream.Screenshot()
                 #F*****g appstream have kinds undefined but kind_from_string works... wtf?
 #               bundle.set_kind(appstream.BundleKind.SNAP)
@@ -136 +139 @@
 
                 if pkg.get_icon():
-                        app.set_icon_path(pkg.get_icon())
+                        if self.icon_cache_enabled:
+                                icon.set_kind(appstream.IconKind.LOCAL)
+                                icon.set_name(self._download_file(pkg.get_icon(),pkg.get_name()))
+                        else:
+                                icon.set_kind(appstream.IconKind.REMOTE)
+                                icon.set_name(pkg.get_icon())
+                        app.add_icon(icon)
+
+                if pkg.get_license():
+                        app.set_project_license(pkg.get_license())
+
+#               if pkg.get_screenshots():
+#                       img=appstream.Image()
+#                       screenshot_list=[]
+#                               for screen in pkg.get_screenshots():
+#                                       screenshot_list.append(screen.get_url())
+
+#                               app_info["screenshots"]=screenshot_list
                 return(app)
 
@@ -167 +187 @@
                 self._debug("Searching %s"%tokens)
                 pkg=None
+                pkgs=None
                 try:
                         pkgs=self.snap_client.find_sync(Snapd.FindFlags.MATCH_NAME,tokens,None,None)
@@ -176 +197 @@
                         if pkg.get_channel()=='stable':
                                 stable_pkgs.append(pkg)
+                        else:
+                                self._debug(pkg.get_channel())
                 self._debug("Done")
                 return(stable_pkgs)
@@ -206 +229 @@
                 #switch to launch async method when running under a gui
                 #For an unknown reason request will block when sync mode under a gui and async blocks when on cli (really funny)
-                if self.cli_mode:
-                        pkgs=self._search_snap(app_info['name'])
-                else:
-                        pkgs=self._search_snap_async(app_info['name'])
+                self._debug("Getting info for %s"%app_info)
+                pkg=None
+                try:
+                        pkg=self.snap_client.list_one_sync(app_info['name'])
+                        app_info['state']='installed'
+                        pkgs=[pkg]
+                except:
+                        app_info['state']='available'
+                        if self.cli_mode:
+                                pkgs=self._search_snap(app_info['name'])
+                        else:
+                                pkgs=self._search_snap_async(app_info['name'])
+                        self._debug("Getting extended info for %s %s"%(app_info['name'],pkgs))
                 if type(pkgs)==type([]):
                         for pkg in pkgs:
+                                self._debug("Getting extended info for %s"%app_info['name'])
                                 if pkg.get_download_size():
                                         app_info['size']=str(pkg.get_download_size())
                                 else:
                                         app_info['size']=str(pkg.get_installed_size())
-                                if pkg.get_icon():
-                                        if self.icon_cache_enabled:
-                                                app_info['icon']=self._download_file(pkg.get_icon(),app_info['name'])
-                                        else:
-                                                app_info['icon']=pkg.get_icon()
-                                if pkg.get_status():
-                                        #Not working on xenial
-#                                       if pkg.get_status()==Snapd.SnapStatus.INSTALLED or pkg.get_status()==3:
-#                                               app_info['state']='installed'
-                                        try:
-                                                self.snap_client.list_one_sync(pkg.get_name())
-                                                app_info['state']='installed'
-                                        except:
-                                                app_info['state']='available'
-                                if pkg.get_screenshots():
-                                        screenshot_list=[]
-                                        for screen in pkg.get_screenshots():
-                                                screenshot_list.append(screen.get_url())
-                                        app_info["screenshots"]=screenshot_list
-                                #Method not working in xenial, license default type assigned in infoManager
-#                               if pkg.get_license():
-#                                       app_info["license"]=pkg.get_license()
                                 break
                 else: