Changeset 8187

Timestamp:

Oct 25, 2018, 9:35:01 AM (2 years ago)

Author:

hectorgh

Message:

search related by threads

Location:

lliurex-store/trunk/fuentes/lliurex-store-gui/usr/share/lliurex-store/lliurex-store-gui

Files:

• DetailsBox.py (modified) (6 diffs)
• LliurexStoreManager.py (modified) (2 diffs)
• MainWindow.py (modified) (1 diff)

lliurex-store/trunk/fuentes/lliurex-store-gui/usr/share/lliurex-store/lliurex-store-gui/DetailsBox.py

@@ -16 +16 @@
 import os
 import html2text
+import random
+import copy
 
 import gettext
@@ -42 +44 @@
                 self.full_info_box=Gtk.HBox()
                 self.pack_start(self.full_info_box,True,True,5)
+                
+                self.related_aborted=False
+                self.current_id=None
                 
                 # ####### LEFT SIDE ######
@@ -263 +268 @@
         def set_package_info(self,pkg):
                 
+                self.current_id=random.random()
+                
                 info={}
                 
@@ -363 +370 @@
                 for p in self.related_box.get_children():
                         self.related_box.remove(p)
-                        
+                
+                categories=copy.deepcopy(pkg["categories"])
+                
+                self.related=None
+                
+                self.related_thread=threading.Thread(target=self.search_related_packages_from_categories_thread,args=(pkg["package"],categories,self.current_id))
+                self.related_thread.daemon=True
+                self.related_thread.start()
+                GLib.timeout_add(500,self.related_pkg_listener,self.current_id)
+                
+                '''
                 for p in pkg["related_packages"]:
                         
@@ -402 +419 @@
                 self.related_sw.get_hadjustment().set_value(0)
                 self.related_box.show_all()
+                '''
                 
                 for x in self.screenshots_box.get_children():
@@ -408 +426 @@
                 
         #def set_values
+        
+        
+        def search_related_packages_from_categories_thread(self,pkg,categories,id):
+
+                self.related=self.core.store.get_random_packages_from_categories(pkg,categories)
+                
+        #def search_related_packages_from_categories_thread
+        
+        def related_pkg_listener(self,id):
+                
+                if id!=self.current_id:
+                        return False
+                        
+                if self.related_thread.is_alive():
+                        return True
+                        
+                if self.related!=None:
+                        
+                        
+                        for p in self.related["related_packages"]:
+                                
+                                image=Screenshot.ScreenshotNeo()
+
+                                i={}
+                                i["image_id"]=p["package"]+"_banner_small"
+                                i["x"]=self.banner_small
+                                i["y"]=self.banner_small
+                                i["name"]=p["package"].capitalize()
+                                i["package"]=p["package"]
+                                i["icon"]=p["icon"]
+                                i["component"]=p["component"]
+
+                                if p["banner"]!=None:
+                                        i["image_url"]=p["banner"]
+                                        i["custom_frame"]=False
+                                else:
+                                        i["image_path"]=self.core.resources.get_icon(p)
+                                        i["custom_frame"]=True
+                                        
+                                if not i["custom_frame"]:
+                                        image.download_image(i)
+                                else:
+                                        i["force_text"]=True
+                                        image.create_banner_from_file(i)
+                                
+                                b=Gtk.Button()
+                                b.add(image)
+                                b.set_size_request(self.banner_small,self.banner_small)
+                                b.set_margin_top(10)
+                                b.connect("clicked",self.related_app_clicked,p)
+                                b.set_name("RELATED_BUTTON")
+                                b.set_valign(Gtk.Align.CENTER)
+                                b.set_tooltip_text(p["name"])
+                                self.related_box.pack_start(b,False,False,3)
+                        
+                        self.related_sw.get_hadjustment().set_value(0)
+                        self.related_box.show_all()                     
+                        
+                        
+                return False
+                        
+        #def related_pkg_listener
         
         

lliurex-store/trunk/fuentes/lliurex-store-gui/usr/share/lliurex-store/lliurex-store-gui/LliurexStoreManager.py

@@ -84 +84 @@
                                         categories.remove(item)                 
                 
-                
+                        '''
                         if len(categories)>0:
 
@@ -103 +103 @@
                                 p.fix_info()
                         
+                        '''
+                        
                         return p
                 
         #def get_info
+        
+        
+        def get_random_packages_from_categories(self,pkg_id,categories):
+                
+                for item in self.core.categories_manager.categories:
+                        if item in categories and len(categories) > 1:
+                                categories.remove(item)
+                
+                for item in self.core.categories_manager.banned_categories:
+                        if item in categories and len(categories) > 1:
+                                categories.remove(item) 
+                
+                random_id=int(random.random()*len(categories))
+                                
+                random_category=categories[random_id]
+                pkgs,categories=self.get_package_list_from_category(random_category)
+                
+                p=Package.Package({})
+                p.fix_info()
+                                
+                if len(pkgs) >=10:
+                        samples=10
+                else:
+                        samples=len(pkgs)
+                                
+                for item in random.sample(pkgs,samples):
+                        if item["package"]!=pkg_id:
+                                p["related_packages"].append(item)
+                                        
+                p.fix_info()
+                
+                return p
+                
+        #def get_random_packages_from_categories
         
         

lliurex-store/trunk/fuentes/lliurex-store-gui/usr/share/lliurex-store/lliurex-store-gui/MainWindow.py

@@ -9 +9 @@
 import multiprocessing
 import time
+import copy
 
 import gettext