From 62dfdd2ad3f1ccd21b9bd9f46ef2496c126cc0d0 Mon Sep 17 00:00:00 2001
From: serkus01 <7erkus@gmail.com>
Date: Mon, 24 Jan 2022 07:16:17 +0900
Subject: [PATCH] fix make.conf #3

---
 config.json                            |   2 +-
 utils/__pycache__/utils.cpython-39.pyc | Bin 4640 -> 5009 bytes
 utils/parsePortage.py                  |  25 ++++++++++++-------------
 utils/utils.py                         |  18 +++++++-----------
 4 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/config.json b/config.json
index 8692b1f..304825f 100644
--- a/config.json
+++ b/config.json
@@ -5,6 +5,6 @@
     "THEME": "default"
     },
     "Portage":{
-        "make.conf":"/etc/portge/make.conf/custom"
+        "make.conf":"/etc/portage/make.conf/custom"
     }
 }
\ No newline at end of file
diff --git a/utils/__pycache__/utils.cpython-39.pyc b/utils/__pycache__/utils.cpython-39.pyc
index 1f79ed6e0e2f6ebd5f53cc2d76e617e78df4ebc5..a71f7733f73906760525152d4cc31115bd926bf6 100644
GIT binary patch
delta 2086
zcmb7FPiz!b7=PcJnVs1`v|Fq!#X=WsS_W2Ho1lUf0<6?(Q>%~=CSo)0OqZ4Y`({d@
znPEw)UW`ifqTyn)y(w}q(ZrCLc;lvt*ExIfK)iXtgMQy^Tb4hXIFtFk_rCXi?|uKL
zGrBh3XK&k<V)*><>plC<Gi!ar@a@{cYp{3imN_)y<Ue564o5k|%zajJanWA(8)9+M
zTKjEb7*NRM5pQ^rUUq$Vx#E1yL;|TIAs65@81i~@P<{i~K$QphfniH)+QP0yuoS7)
zO5NSyB>`PF`8Z_dO+J&O6HE}v_@FJ&<)1tc1K;J8j5_)>k#`W}2zDZ@X!)gv$p21S
z-G{sYIisHfOMa{$%&No`pGTI8w7jeDO=M`w<vqPRY8j2ouBh5qJuCfYcQ#k?d`npt
z)rc?EBXBJl8dKRv@0C9p`D`B@)HR!Cy8Oeq0aIxEZ5Wf!r3%MKksN8BFDlJQ@$Isy
zMygwNYnE22qZcfrbg@!(gj*NH*?SZ%56hdW-HF3EErI-!?>s@)I1D2K^D(apmVTvH
zb!^{$L^d*zKJ~uWs9!-Dk0US;N917oI(p{w^!V{Hq=+=ZFhZm{%eAJdS!%N(eDMmB
zEX}{@*4#)fHR?;^F;o9aKMN=2Nan)iF_H&iDi4kmyOCz{uG9&f_o^pvXYx>#KWAp9
zNYvECBT+g@0!7*a@tE-GZKLg1aj%5m)<eOisGh>l`vnuB!b0Xi2tHe7A$NGF_|V~j
zvJORd11{WpM+wzX3ll*iUf&G$mB~QwD30R5I`62Cx(*I=v=8|ZE3ymO&<G$fa?DY4
zENnw-{v4|pROV|}KLr*hfvpVsi6FTOz|OJr7^E<HEm==>$4NHHP@G+c8z53;7O+6=
zD8c4c3A{=lV$)BgZb;qjm1(1X8$v^@qx-1armkcIuFwX@_=K;cI;}#l=>L&?l9Hs3
zXczv&h9_D<YCdo;srBzlJ<QiCw1xvp`Q*HK3ZuJ{nYb*k_l>lv+A+hZE-eKs*GxwJ
zXG(VctZ>~0%wfCicJpd4azwgtn^n8yiv73}BLs057^fMPf|;`P+4(bPPt46(M)Oj6
zv2NE~D}|?R9u{|zL&QIUFd`;tN@Zd3W?d9$)!Pd4{kz%+kjS_SDkSjR0V&{o4{TTa
zV2_f5T`&ws`AazNg8fj?#2d){P+F6XRJw6mlfDi(yv#AR$s@|V7)09r%*3)MCa7-7
zX3_!sf>Er9G4Jh0!|&A!_rxs1_xNo#g<1J-|8DqE2K}S$FT#Y+IuKxXVb*_yRicMR
zm<+h1zKC@cB#~MVQ$7!LN6WDwm1C>$+3R6CNOzQV*3GU!^EC{j>S*1>UWHBGX)KtB
zcc@$(rsBJ*0Bg63&ol3<Ne1zI9<fzy9ctwRKzog@y<(26AlHZ?g4YltNQoI7&BTM4
zce~LZVxgc%3btW0V<pis-l9OqM2S<_*(&7-W-VS6mRdZFjnv``OR@K29<dehINlat
zsy^Nd?`3y7ckl|2Iw=DKW4-wrFvtz0Y{v+{po+I}AN%A{9K_26(?rO{N~3~Ty|@`$
z3H<w1EAI)4eWW+-(j|(lB3lC!PM*XJf-J!R!4v`gC&Uqgt^O&fQO0Q%M?Jp2CmrH+
b)sZDKrfUsnx#}KMaOLIY-vfDNpP~H&S&6Z3

delta 1710
zcmZ`)&2QX96rVS?*WS%0<cp>WNxG$5QYTRwg4$9kq6!VIfG7#HQm93>GO@EY-LH(j
zRT9|^QmDiQK{{t(!>J%{RN{iT(gWfTm>V~W5I2Ox0rB3tO-mwd?ay!Cym|BH_uiY`
z9cvZ4+|JG%!{_snU)%>nyIsR@Z+GH09NYcc?$NF=yP&eAlG}{xqEu45zb_AKXl!%E
z>!C8se&ja;?<*!O)Cx<!1D7Btzks`tku!XJSQ!mhxK#yfO0NVp|B)RTXXOSTgFe~f
zmj`II4Wgs%WFNBfA6|g|Z;xqty?B(=g9Jka&mn9Xg|)gUJOq^ghJw)Kl6eu7l;%Wt
zhK$<&@+5W2pUvZ$E)sS5r&%c~tA5KD6?ZdqI+jvtAqXR-HAO}7wVDE7$vf6e_rZPT
zk5-|(ha9CxCMhfbvOb0L@}ulGFfPyJCNG>qwKBp;1P!G{ZrRqA?pOS(GJ+bi;8?3S
zf{G{nnjp)kUD0q>wsIpdD}Tt@XHse$bE8`E+{is(sw~vcydTzU8@Mp!2n@uW9Pao4
ziTJEz?7}!X>?9~4DBWvT8@8eJMqNbW5~>^{y5U!SrLWd&YvRz!wEPKJkYoAl)0b&I
z2wQvNP8>&_&C^wHqWpAt@_xPmi<sYj`7r;|3@x_}aUd}Zv}lp0Kpb+g*je0O!nsxa
z?LS$RD5n?k7ygP6u!MP#fX5Rau@=O959ZnRpWf9HEzuJrHgNQPlG&P$GcE3E9_;a!
z=IMLjG0(We2N}+HCuR(>Ilw%9fF-a#zrt#hI*YdT%@2Vk7O<`U$cU{S0Jg%eF%NaO
zty(VqPP1u-%h@du_sT40vDV@-f3#5sH!=s=?EmNoSt}Fa=8uD+AaR62de+ChXAd`A
zFRmYn88%~fQ5=!wXI|J&n@~`3IvSR*ZKcGXM1?Yi->A5&zL><3I6=^^{0Wk%9_*}R
zzP@<n>fFMDV>ND;OEtIZr`>XfY|av#BcO6{c%vp}XhgNx296~^(LGcgMFrzJ(Ay6d
za6SsXdKZjp77W45pm&L@^0)30cp$Bw;`WzGrkx;U1S!9Z2{IEa$woZVVsi(GTVzc?
z#}XcA(V~{*B0V-eV}QlE0k#95ypeRo9W7%IIrGp<Y|u)Sjg;dZcx*e%4$c7EUct2K
z`0i-P>GF##yg$vL{a!;{UtXVDFT{X6TZ>`<Pqvjm-3-NPY8AKa3nE<%6TFR}ASd3!
zuWde|zRk1Ju<z3zd7g|Z3wGYgdP{)_OQK$nREByjC@TmY?g?y4>};fY&9S^dv`xf+
z6XEc+%HiHD^&Z{+4!wu%JRtvRCI~IeM;_6FUN{A3b>UDHns}8WqSg`fq&U)!9V6Zh
z)B7QV_g^J=Pv|(SI-5~Y38xzF>P<SofjZ||yl|%cNcjHLYj~l_KYE8tMe;}gBBGC=
tpWr;fEWsSXexD0!XmOQ*LV8kDsYKnatl4VaYgYVMi1Bb#*7^!?@?U9~Y<mCz

diff --git a/utils/parsePortage.py b/utils/parsePortage.py
index 9a31311..3729fdd 100644
--- a/utils/parsePortage.py
+++ b/utils/parsePortage.py
@@ -15,20 +15,20 @@ class PortageConfig():
 
     def parseMakeConf(self):
         StateBox = 'Null'
-        Lines = self.getlines(self.Config.Portage['make.conf'])
+        Lines = self.getLines(self.Config['Portage']['make.conf'])
 
-        for line in lines:
+        for line in Lines:
             if not line.startswith('#'):
-                if StateBox is 'Null' and not line.endswith('"'):
+                if StateBox == 'Null' and not line.endswith('"'):
                     StateBox = line.split('=')[0]                
-                    MakeConfig[StateBox] = line.split('=')] = []
-                    for i in  line.split('=')] = line.split(" ")
+                    MakeConfig[StateBox] = line.split('=')[1].split(" ")
+                    for i in  line.split('=')[1].split(" "):
                         MakeConfig[StateBox].append(i)
-                elif StateBox is not 'Null' and not line.endswith('"')
+                elif StateBox != 'Null' and not line.endswith('"'):
                     StateBox ='Null'
-                    for i in  line.split('=')] = line.split(" ")
-                    MakeConfig[StateBox].append(i)
-                elif StateBox is 'Null' and line.endswith('"'):
+                    for i in  line.split('=')[1].split(" "):
+                        MakeConfig[StateBox].append(i)
+                elif StateBox == 'Null' and line.endswith('"'):
                     MakeConfig[StateBox] = line.split(" ")
                     
         print(MakeConfig)
@@ -38,10 +38,9 @@ class PortageConfig():
 
     def parsePackageMasks(self):
         Lines = self.getlines(self.Config.Portage['package.mask'])
-        
-    def def parsePackageKeywords(self):
+    def parsePackageKeywords(self):
         Lines = self.getlines(self.Config.Portage['package.keywords'])
 
 if __name__ ==  '__main__':
-    test = TestConfig()
-    test.parseMakeConfig()
+    test = PortageConfig()
+    test.parseMakeConf()
diff --git a/utils/utils.py b/utils/utils.py
index b260e71..bf70b81 100755
--- a/utils/utils.py
+++ b/utils/utils.py
@@ -3,7 +3,7 @@
 '__autor__' == 'serkus'
 import os, sys, json
 from urllib import request
-from utils.package import search
+from package import search
 # import xml
 import xml.etree.ElementTree as ET
 
@@ -164,18 +164,14 @@ def sort_install_pkg():
             #print(pkg_name)
             if pkg_name not in INSTALL:
                 INSTALL[d.replace(path, "").split('/')[0]] = []
-                if 
-            INSTALL[d.replace(path,"").split('/')[0]].append(dict(name = pkg_name[:-1], ver = f.replace(pkg_name, "")))
-            
+                if  d.replace(path, "").split('/')[0] not in INSTALL:
+                    INSTALL[d.replace(path,"").split('/')[0]].append(dict(name = pkg_name[:-1], ver = f.replace(pkg_name, "")))           
             else:
-                INSTALL[d.replace(path,
-                    "").split('/')[0]].append(dict(name = pkg_name[:-1],ver = f.replace(pkg_name, "")
-                
+                INSTALL[d.replace(path,"").split('/')[0]].append(dict(name = pkg_name[:-1],ver = f.replace(pkg_name, "")))
                 if d.replace(path, "").split('/')[0] not in INSTALL:
                     INSTALL[d.replace(path, "").split('/')[0]] = []
                     INSTALL[d.replace(path, "").split('/')[0]].append(f.replace(".ebuild", "") )
-                INSTALL[d.replace(path,
-                    "").split('/')[0]].append(f.replace(".ebuild", "")) #dict(name = pkg_name[:-1],ver = f.replace(pkg_name, "")
+                    INSTALL[d.replace(path,"").split('/')[0]].append(f.replace(".ebuild", "")) #dict(name = pkg_name[:-1],ver = f.replace(pkg_name, "")
                 
 
     #print(str(len(INSTALL)))
@@ -183,8 +179,8 @@ def sort_install_pkg():
     return  INSTALL
 def ScanTreePortage():
     DirsRoot = ["/var/db/repos", "/usr/portage"]
-    d, ListTree, f for in os.walk('/usr/portage') and d, ListTree, f for in os.walk("/var/db/repos")
-    return ListTree
+   #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():
     Dirs_root = ["/var/db/repos", "/usr/portage"]