fix search packages

GenRecovers.py

@@ -22,7 +22,10 @@ def GenRecoversFun(Reclist):
             cat = r.replace("[", "") and r.replace("]", "")
             result[r.replace("[", "") and r.replace("]", "")]= []
         else:
-            result[cat].append(search(r))  
+            try:
+                result[cat].append(search(r))
+            except Exception as e:
+                print(e)
     return result
 
 

package.py

@@ -12,62 +12,59 @@ from utils.utils import sort_inatll_pkg
 #ПЛАН:
 #    
 # API PORTAGE IN SEARCH
-class Package():
-    def __init__(self): 
-        self.Cat =[]
-        self.pkg = {}
-        self.Category =""
-        self.Name = ""
-        self.version =""
-        self.USE =""
-        self.Description = ""
-        self.Home_page =""
-        self.repository = ""
 
-    def search(self, r_p):
-        try:
-            pametrs = ["HOMEPAGE", "IUSE","DESCRIPTION", "repository", "LICENSE"]
-            #print(r_p)
-            p_list = portge.xmatch('match-all', r_p)
-            m_list = portge.xmatch('match-visible', r_p)
-            #print(m_list)
+
+def search(r_p):
+    Cat =[]
+    pkg = {}
+    Category =""
+    Name = ""
+    version =""
+    USE =""
+    Description = ""
+    Home_page =""
+    repository = ""
+    try:
+        pametrs = ["HOMEPAGE", "IUSE","DESCRIPTION", "repository", "LICENSE"]
+        #print(r_p)
+        p_list = portge.xmatch('match-all', r_p)
+        m_list = portge.xmatch('match-visible', r_p)
+        #print(m_list)
             
-            #print(len(p_list))
-            if len(p_list) != 0:
-                for l in p_list:
-                    params = portge.aux_get(l, pametrs)               
-                    if str(self.Cat) in self.Category and str(l).split('/')[1].split('-')[0] in self.Name:
-                        self.version = self.version + "    " + str(l.replace(l.split("/")[0] + "/"+ r_p, ""))
-                        if not l in m_list:
-                           self.version = str(self.version) +"[M]"
-                        else:
-                            self.version = str(self.version) +"[U]"
-                        #version + "    " + str(l).split('/')[1].split('-')[:-1]
+        #print(len(p_list))
+        if len(p_list) != 0:
+            for l in p_list:
+                params = portge.aux_get(l, pametrs)               
+                if str(Cat) in Category and str(l).split('/')[1].split('-')[0] in Name:
+                    version = version + "    " + str(l.replace(l.split("/")[0] + "/"+ r_p, ""))
+                    if not l in m_list:
+                        version = str(version) +"[M]"
                     else:
-                        self.Category= str(self.Cat)
-                        #Name =str(l).split('/')[1].split('-')[0]
+                        version = str(version) +"[U]"
+                        #version + "    " + str(l).split('/')[1].split('-')[:-1]
+                else:
+                    Category= str(Cat)
+                    #Name =str(l).split('/')[1].split('-')[0]
                         
-
-                        self.Name = l.split("/")[0] +"/" + r_p
-                        self.version = str(l.replace(l.split("/")[0] + "/"+r_p, ""))
-                        if not l in m_list:
-                            self.version = str(self.version) + "[M]"
-                        else:
-                            self.version = str(self.version) +"[U]"
-
-                        self.USE = params[1]
-                        self.Description = params[2]
-                        self.Home_page = params[0]
-                        self.repository = params[3]
+                    Name = l.split("/")[0] +"/" + r_p
+                    version = str(l.replace(l.split("/")[0] + "/"+r_p, ""))
+                if not l in m_list:
+                    version = str(version) + "[M]"
+                else:
+                    version = str(version) +"[U]"
+                    USE = params[1]
+                    Description = params[2]
+                    Home_page = params[0]
+                    repository = params[3]
             else:
-                self.Name = "Package is not Found" 
+                Name = "Package is not Found" 
 
             #print(Category + "\n" + Name + "\n" + version +"\n" + USE + "\n" + Description + "\n" + Home_page  +"\n") 
             #p_list = str(Category + "\n" + Name + "\n" + version +"\n" + USE + "\n" + Description + "\n" + Home_page  +"\n")
-        except Exception as e:
-            print(str(e))
-            p_list = " ERROR IN Package "
+    except Exception as e:
+        print(str(e))
+        p_list = " ERROR IN Package "
             
-        self.pkg = {"Category": self.Category, "Name": self.Name,"version": self.version.split("    "), "USE":self.USE.split(" "), "Description": self.Description, "Home_page":self.Home_page, 'repo': str(self.repository) }
-        print(self.pkg)
-        return self.pkg
+    pkg = {"Category": Category, "Name": Name,"version": version.split("    "), "USE":USE.split(" "), "Description": Description, "Home_page":Home_page, 'repo': str(repository) }
+    print(pkg)
+    return pkg

recovers.txt

@@ -1,42 +1,47 @@
 [net-im]
 element-desktop-bin
 telegram-desktop-bin
-zoom
+net-im/zoom
 pidgin
 teams
 slack
 [Музыка]
 audacity
 clementine
-mixx
+mixxx
 lmms
 mpd
 [Видео]
 obs-studio
 kdenlive
 mplayer
-vlc
-mplayer
-[Web-Серверв]
+smplayer
+[web-серверв]
 nginx
 apache
 [dev-util]
 pycharm-community
-[Графика]
+[графика]
 gimp
 blender
+inkcscape
+okular
 [Игры]
 steam-launcher
+app-xemacs/games
+[Офис]
+app-office/wps-office
+app-office/libreoffice
 [Браузеры]
 firefox-bin
 chromium
-falkpon
+falkon
 links
 vivaldi
 netsurf
-[app-utils]
+[Разработчикам]
 vim
 nano
 vscode
 jedit
-gedit
+gedit