From 77903772d7442dfbcdf661ee746965fd9d2dcc4f Mon Sep 17 00:00:00 2001 From: serkus <7erkus@gmail.com> Date: Sun, 6 Feb 2022 10:39:46 +0900 Subject: [PATCH 1/5] push add 5.02.2022 --- utils/utils.py | 1 - 1 file changed, 1 deletion(-) diff --git a/utils/utils.py b/utils/utils.py index 8a2a7fa..01a62f8 100755 --- a/utils/utils.py +++ b/utils/utils.py @@ -198,7 +198,6 @@ def ScanTreePortage(): #str(d.split("/")[-2] +"/" + d.split("/")[-1]) ListTree.append(pkg_name) #d, ListTree, f for in os.walk('/usr/portage') and d, ListTree, f for in os.walk("/var/db/repos") - return ListTree def scan_config_portage(): From f94369c6507b0653a8236e6cfc6101bb939167a0 Mon Sep 17 00:00:00 2001 From: serkus <7erkus@gmail.com> Date: Sun, 6 Feb 2022 10:52:19 +0900 Subject: [PATCH 2/5] fix env Portage --- utils/package.py | 1 + utils/parsePortage.py | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/utils/package.py b/utils/package.py index 21ecdc2..fd9aac4 100644 --- a/utils/package.py +++ b/utils/package.py @@ -19,6 +19,7 @@ def search(r_p): Description = "" Home_page = "" repository = "" + PortEnv = try: parametrs = ["HOMEPAGE", "IUSE","DESCRIPTION", "repository", "LICENSE"] #print(r_p) diff --git a/utils/parsePortage.py b/utils/parsePortage.py index caefe8e..0d52083 100644 --- a/utils/parsePortage.py +++ b/utils/parsePortage.py @@ -8,6 +8,8 @@ class PortageConfig(): self.TargetParse =['USE', 'USE_EXPAN', 'VIDEO_CARDS', 'ACCEPT_CHOSTS', 'ACCEPT_LICENSE','CCACHE_DIR', 'CCACHE_SIZE', 'EMERGE_DEFAULT_OPTS', 'CFLAGS', 'CXXFLAGS', 'MAKEOPTS'] self.MakeConfig={} + self.EnvPortaga ={} + super().__init__(self.run()) def getLines(self, filename): if os.path.exists(filename): with open (filename, 'r') as f: @@ -37,7 +39,7 @@ class PortageConfig(): elif StateBox == 'Null' and line.endswith('"'): #line.replace('"', "") self.MakeConfig[line.split('=')[0]] = line.split('="')[1].split(" ") - + self.EnvPortaga['make.conf'] = self.MakeConfig print(self.MakeConfig) def templParse(self, parm, res=false): @@ -49,6 +51,8 @@ class PortageConfig(): if res: print(self.MakeConfig[parm]) return self.MakeConfig[parm] + + self.EnvPortaga[pam] = self.MakeConfig[parm] def parsePackageUse(self): self.templParse('package.use') @@ -62,6 +66,13 @@ class PortageConfig(): def parsePackageKeywords(self): self.templParse('package.accept_keywords') + def run(): + self.parseMakeConf() + templParse('package.use', res=True) + templParse('package.mask', res=True) + templParse('package.unmask', res=True) + templParse('package.accept_keywords', res=True) + if __name__ == '__main__': Test = PortageConfig() From e6496a87ffcdf910030d9e1fb1626089adfd7d1d Mon Sep 17 00:00:00 2001 From: serkus <7erkus@gmail.com> Date: Sun, 6 Feb 2022 10:55:19 +0900 Subject: [PATCH 3/5] fix parse EnvPortage --- utils/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/utils/package.py b/utils/package.py index fd9aac4..23d1129 100644 --- a/utils/package.py +++ b/utils/package.py @@ -3,6 +3,7 @@ import json import portage portage.root +from parsePackage import PortageConfig portge = portage.db[portage.root]["porttree"].dbapi #from utils.utils import sort_install_pkg #ПЛАН: @@ -19,7 +20,7 @@ def search(r_p): Description = "" Home_page = "" repository = "" - PortEnv = + PortEnv = PortageConfig.run() try: parametrs = ["HOMEPAGE", "IUSE","DESCRIPTION", "repository", "LICENSE"] #print(r_p) @@ -65,6 +66,6 @@ def search(r_p): print(str(e)) p_list = " ERROR IN Package " - pkg = {"Category": Category, "Name": Name, "version": version.split(" "), "USE": USE.split(" "), "Description": Description, "Home_page": Home_page, 'repo': str(repository) } + pkg = {"Category": Category, "Name": Name, "version": version.split(" "), "USE": USE.split(" "), "Description": Description, "Home_page": Home_page, 'repo': str(repository), 'EnvPortage': PortEnv } print(pkg) return pkg From 0af7b1515decb12bf6f9f451dd34e3b4050aafe7 Mon Sep 17 00:00:00 2001 From: serkus <7erkus@gmail.com> Date: Sun, 6 Feb 2022 10:57:58 +0900 Subject: [PATCH 4/5] add metod setRoutes in Rotes --- core/route.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/route.py b/core/route.py index 4b7a2c8..4146e28 100644 --- a/core/route.py +++ b/core/route.py @@ -24,7 +24,8 @@ class Router(): return handler() else: return 1 - + def setRoutes(self): + pass class RouterOld(BaseHTTPRequestHandler): # def __init__(self): # self.P_list = [] From 97b40872a92af28932806b5d382f24120ddb5868 Mon Sep 17 00:00:00 2001 From: serkus <7erkus@gmail.com> Date: Sun, 6 Feb 2022 12:42:04 +0900 Subject: [PATCH 5/5] fix env Portage #2 --- utils/parsePortage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/parsePortage.py b/utils/parsePortage.py index 0d52083..f692bcb 100644 --- a/utils/parsePortage.py +++ b/utils/parsePortage.py @@ -66,7 +66,7 @@ class PortageConfig(): def parsePackageKeywords(self): self.templParse('package.accept_keywords') - def run(): + def run(self): self.parseMakeConf() templParse('package.use', res=True) templParse('package.mask', res=True)