diff --git a/core/route.py b/core/route.py index 51cc6bc..1d7d596 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 = [] diff --git a/utils/package.py b/utils/package.py index 21ecdc2..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,6 +20,7 @@ def search(r_p): Description = "" Home_page = "" repository = "" + PortEnv = PortageConfig.run() try: parametrs = ["HOMEPAGE", "IUSE","DESCRIPTION", "repository", "LICENSE"] #print(r_p) @@ -64,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 diff --git a/utils/parsePortage.py b/utils/parsePortage.py index caefe8e..f692bcb 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): + 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() diff --git a/utils/utils.py b/utils/utils.py index f66ece3..456ab0f 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():