From 79b048d584471d6449791df15ceb2251f37c011f Mon Sep 17 00:00:00 2001
From: serkus01 <7erkus@gmail.com>
Date: Tue, 14 Sep 2021 19:00:49 +0900
Subject: [PATCH] add  fill  tree packages und fix  discription USE #4

---
 findfsdb.py | 15 +++++++--------
 getUses.py  |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/findfsdb.py b/findfsdb.py
index 2e75a96..ba895b3 100755
--- a/findfsdb.py
+++ b/findfsdb.py
@@ -5,7 +5,7 @@ import json
 from io import StringIO  
 from utils.utils import get_list_overlays
 from GenRecovers import ScanRecoverFile
-from getUses import get_local_USE
+from getUses import get_global_USE
 from package import search
 # создаём разширеную базу пактов с предлизительно структурой
 #pkg_list ={"category": [{name: name_pkg, versions:[list_version]}]}
@@ -14,7 +14,7 @@ from package import search
 
 AliaseCategory ={"www-client":	"Браузеры",
 				 "www-server": "Сервера",
-				 'app-etitor':"Текстовые редакторы",
+				 'app-etitor':"Текстовые редакторы"
 				 "game":"Игры",
 				 "dev-lang":" Языка програмироыввние",
 				 "media-video": "Видео",
@@ -24,7 +24,7 @@ def create_db():
 	overlays = get_list_overlays()
 	recovers = ScanRecoverFile()
 	pkg_list ={}
-	listUses= get_local_USE()
+	listUses={LocalUSE=get_global_USE(),GlobalUSE = get_global_USE() }
 	port_dir =["/var/db/repos", "/usr/portage"]
 	if not os.path.exists('./pkgs.json'):
 		print("Create ramdb")
@@ -53,8 +53,7 @@ def create_db():
 								if str(d.split("/")[-2] +"/" + d.split("/")[-1]) in AliaseCategory:
 									all_pkgs.append(AliaseCategory[d])
 								else:
-									all_pkgs[str(d.split("/")[-2] +"/" + d.split("/")[-1])]= str(d.split("/")[-2] +"/" + d.split("/")[-1])
-
+									all_pkgs[str(d.split("/")[-2] +"/" + d.split("/")[-1]))]= search(str(d.split("/")[-2] +"/" + d.split("/")[-1])))
 
 							if d.split("/")[-2] not in pkg_list.keys():
 								pkg_list[str(d.split("/")[-2])] = [] 
@@ -82,9 +81,9 @@ def on_find(p_v):
 		
 		pkg_list = data.split("\n")
 		for i in pkg_list:
-			if p_v in i and not i in p:
-				print(i)
-				p.append(str(i))
+		if p_v in i and not i in p:
+			print(i)
+			p.append(str(i))
 			#ret_p = ret_p +"\t" + i
 	print("Find in template:\t" + str(len(p)))
 	
diff --git a/getUses.py b/getUses.py
index 8e2fe40..ef4d553 100644
--- a/getUses.py
+++ b/getUses.py
@@ -4,7 +4,7 @@ import os, sys
 
 def get_global_USE():
     ListUSE={}
-    path = '32wwwuse.desc'
+    path = '/usr/portage/profiles/use.desc'
     with open(path) as f:
         lines =f.read().split("\n")
         for line in lines: