From 0b23d8a47a9e223451d122cac81f326d36e11dcf Mon Sep 17 00:00:00 2001 From: serkus01 <7erkus@gmail.com> Date: Sun, 13 Feb 2022 12:15:32 +0900 Subject: [PATCH] add framwork bottle --- core/__pycache__/handler.cpython-39.pyc | Bin 5312 -> 5324 bytes core/bottle | 1 + core/handler.py | 22 +++++++++++++----- utils/__pycache__/package.cpython-39.pyc | Bin 1281 -> 1380 bytes utils/__pycache__/parsePortage.cpython-39.pyc | Bin 0 -> 3291 bytes utils/__pycache__/utils.cpython-39.pyc | Bin 4948 -> 4948 bytes utils/package.py | 2 +- utils/parsePortage.py | 8 +++---- 8 files changed, 22 insertions(+), 11 deletions(-) create mode 160000 core/bottle create mode 100644 utils/__pycache__/parsePortage.cpython-39.pyc diff --git a/core/__pycache__/handler.cpython-39.pyc b/core/__pycache__/handler.cpython-39.pyc index 25fcebf0699b7be756c29db88c0431767408dcc3..af0b4c030eb7765afb82f945f2d7d7a73c01add1 100644 GIT binary patch delta 512 zcmZvZze`*}5XWcs-Q9b)-n;kSd3w1*5Q30vwM!L6Nf8K0EGz<=FyK!v_}EHzJ@EYl z2U}VB*2Y?_0}@h&6oR#VisU~K%#XmqdI1JC=Ihijs2XKRp~f9_s9_@- z99k#uNk3UsaTRJ)zD7ACmhyNY$4!!3st_n|=3 zI5=aaNo|gL>p5n^gEM=c%#9LJHnF~Vt-@#RhD5B>#aXM{ok delta 521 zcmZuuJxc>Y5Z&3_C6`O?l1scq5dtC#=@djHRzbxsh}vq13`h(_b8I29i^ctcz&0uG zenJo|ti;N~!opgAfsK`wx_9}|!mVcCo0<1!=BavLwOW>C67~GY&sJ?{J=m}>pY6r9 zGm5lBy>(6k4HF>%>C^5kCkodTe!_I02;kr~P#3_GK?;*{HRpCxA$T9mR4k3MgAAt7 z2&qW$M3BXF2ts3oYrg8pwQX`#6FS#}G@7dJj#(4rX4~byw|aoJ<>WQ!e|qbX1Q3EhTsF{I#gwDOc2aUCqG}#$0%b2oyZd#%~FtC z`GxDtf9h|!5jd>y+a>ZD?Wb!`n9&~#+-QUH5O?HiavwNp8r_R{i^W*?Ys5zTn(})w zKhvR=KJ_Z&gyNrsmG~&G1jk*@NAg%IE92<;P*y)6NDfG~+_*CEyt%t`STkkak-Aq` Vca|^Cw|N|091JMgH*bY^_yNdAh#3F? diff --git a/core/bottle b/core/bottle new file mode 160000 index 0000000..eb1982e --- /dev/null +++ b/core/bottle @@ -0,0 +1 @@ +Subproject commit eb1982ea22937a042f5a6e98c5709f779a8fd66c diff --git a/core/handler.py b/core/handler.py index da979bf..a1a2ac6 100755 --- a/core/handler.py +++ b/core/handler.py @@ -3,6 +3,8 @@ import json # from BaseHTTPServer import BaseHTTPRequestHandler,HTTPServer from http.server import BaseHTTPRequestHandler +from core.bottle.bottle import Bottle, run +#route, post, head, request, error, run import logging import os, urllib from utils.utils import get_list_overlays, load_config, write_config, sort_install_pkg @@ -13,13 +15,14 @@ from core.jwt import genaratorSecretsToken import logging from io import BytesIO #repl = '\n' - + app =Bottle +@app.post(/login) def login(user='demo', password='demo'): if auth(): return(generatoSecretsToken()) else: return ("403") - +@app.post('/') def main(): try: with open('./pkgs.json', 'tr') as fn: @@ -30,7 +33,7 @@ def main(): except Exception(e): print(e) return "404" - +@app.post('/set_settings') def set_settings_app(params): config = load_config() # param = self.path.replace("/?st_app=", "") @@ -45,7 +48,7 @@ def set_settings_app(params): write_config(port, Lang) print(config) print(param) - +@app.post(/find/) def search(pkg): # param = self.path.replace("/find?pkg=", "") #request['params']['name'] Pk_list = [] @@ -69,9 +72,16 @@ def search(pkg): # self.r_t = str(json.dumps(search_result)) return str(json.dumps(Search_result)) # self.r_t = json.dumps(pkg_list) - +@app.post('/get_settings') def get_settings_app(): return str(json.dumps(load_config())) +@app.route('*',['GET']}) +def req_get(): + return" 404" + +# run (host='0.0.0.0', port=8000, keyfile='key.pem', certfile='cert.pem') + + class Handler(BaseHTTPRequestHandler): #self.Response = "" @@ -139,7 +149,7 @@ class Handler(BaseHTTPRequestHandler): def do_GET(self): print("do_GET:\n") print(str(self.path), str(self.headers)) - + self.send_response(404) # print(Router.parse_url(self)) # print("data:\t" + self.rfile.read()) # request = Router.parse_url(self) diff --git a/utils/__pycache__/package.cpython-39.pyc b/utils/__pycache__/package.cpython-39.pyc index 61451599b9b62642ac70cede79929863fae779ac..44bf4928980c5ea6a4fc31d4c2ef5cf0d49987b2 100644 GIT binary patch delta 837 zcmZ`%L2DC16n<}Kc6WBOo2H={BSl&dmY_&aURp$ndJ++=6cEU!d18ZBs?uI zAB%*Ru}O3A^Yq=?NW%oDkcTIDywxGz515yMkb4J1yTG1efr1>+&AFLde>X=wMdXzrD)ci1M6$Z|%)Y;mHY$Y{?c zd7%zuJVpcqInOQ-!?_G1mtKu_sRGyD=x^%Z#8l$J|EbM_{h!<;j0k-~Dx3?#GGTDo z&bVC2`8H%XIcU1wS054b3c~TS4ybNrOi~f#ok|{U!&8uS__~sX=eQ2*V3^^?CDp+c zjYqgh=o>-F0bOt?tM5hb=%DC2pHLKQZ1Z9g-phvbHfWTTLytUT>L@ExcE7TiF!j8j zux3loSbwimd}f!bwjUIyCGl+@r59h>bzCV*eB*L#n`Da?K>p7siZoHiqc)sz)$8e`dZc&v2RHgHHAv^m&UHDmow%~y>hG#0%0DZjR;=}BStWNS XHV=C8Xg|Hh$Q#(^6-4S`gjMesh0Ve5 delta 743 zcmZ`%O^Xvj5UrZ-`Tj@@Y6yhY!-51oEGT-|#mfdS!h#>LI3SX>!{SD>*~z%z(qoYL z0}|%yA=#sN@CSJE=r52Q#fx6_=+W147eTOxu2)@E{azK*UxQac(uw1Mu)cr%)%oF1 zlO|uAUT)m(@}9u98lgB3$}%=|{Px!!awnCnlWbI&9N~AD%5@)Ce8x0QE^O zHIG?~L&`qGkHv&u);GCa-Pf*U41PMvj)stCQlnHRd`MHVC6b&ORY+ zLo_h4esppQ&FLV;31WpnV}=|usEm3x+Ou+3L7YibA^Ybc@uv-lE2oYq801oVsXRKB zJ{1N<`~T89G4m7-Fao+j5EmXW0s04NU#dzWx2b8$Q}(+vDwKNV$j>oLj2<_GA1@AF{WaSc?6k&DOcqcUMcU$^`@yC-i0BS|9<6L zxgM^v$Js^XTWiN^|O(QwX2 diff --git a/utils/__pycache__/parsePortage.cpython-39.pyc b/utils/__pycache__/parsePortage.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..5682dda26e8d71be0fe4a278655f578ab24dcfe4 GIT binary patch literal 3291 zcmb7G%W@mX744oG3WoI`8ROr^lvWYx1j0y}F|xh}=sPz0@RvfF;xqQTjpJ?^M~f{7Si&$qr} zyIgQ#J@b4!yO{5YoN%8px*TMA;XUJio&aOa6D3hbTM!kofR@0VMOzZ*#Cf#kub9L9 z3P4@ZmF=!f!-r8VgTrUA5Ko#XNa_QSlpV1F3;09a=miI7wW)6#>ZH)_&>gU0e#Azc z!#+5`YE({arfqp zTD^f~#aeB%cD){K-MHhI#(eXJU-vK6Z`JQygP?wO^X|=^;Py6FyS1w~H?K8)uXgX= zn7g(4S)F86Pg=NxcC(xMrJYbdjMD8;sz?`ah5KU_=wdy2oGB&LIo0n)QhPzrPTFY@ zXj}G^ms~q4ig(c#f}j$yZuB|^V;ev?T|pb(HCu%qSx(3iFRZZ3TUqvw^N<# z$##-f9f{Cp+S_f%Q4)3{&3AP!ZYPnFXCTPPSu+K8xk-WwdSk_ud6}lbAJEwp*^sNmT*Q~Ekkkk5aBiAM_jo3 zj$B4RMBXaEbFTfI8#LzR=fFC925$J;iP(1~+jlCP-}!jFvvsns;T%yK z;r4ULC%a>Z4Tg1e8@5*v_6AFf)FY=cQD1KOPNN^kIzRT}gF*)ZwnjPcn7?z(ulz{n zI_9gI$&9;nU|m_QmgHL)mt;R(RB0$v^`s5&vf(mvkw)_}>cwFz(q5DZBa~!m?S?%# zo{)K3zXVdv8GrM=W*Vl^r`<1f&iIse$mcX~zv^`r6PlAm@C$6A-UVUY;TNqUUxovo z=L?9>H~AuZZ-8IqEBw6mE+hxPnvd7Hy;_r`PTSGlra}8Jbd1Nqui!CkNIqf-zJ$K< zQ1~Kjc-h#{j1BG788}%elNV2UN3bu+vvc1d$l)`q152hU^6{QoX99Z6H_1oMC|ND_ zHZrTZ4Y>k5@;5}tD)McRs->LLV+Pr;Pe*3v{yetVwY4z8)=vnX z{O~k&O<<8~@0z)P{hzQ-=KjC1emQ{^wpvjy4fdm_Pr6d5)A3!LRoiFd>7UL(Ts>WL zlj*Oaq=(qJ8kvBUM-^oX^9oDYR6l}uW_Ucr({Xpgo6MPSNUF4U;F0g4m46`eCn6t# zR4qx7ajH{DDkAFmrqu*Jo5)V*<}ZaJrn*2?4ZXvtYKlS7>56_#d^rdn^}{%mnDQhG zb~;$+cEcF;jR}^^gyfGzC?w=xh|u}EGA@c*Q5*-sOgzzZE-9)d#U>>}bsogy<-F&4 zi{-LsXMZCne4VhJU<=AaDBP3Bl%0JW5u0gAlD@TLJd!l!yJPnxjo~r5Kw?`xMOm_^ zx`{5C8f?u_Qw^Gf_jTn4vNCZGfF;528PSZlZ{MSAJZ+=n;?tO@xpZvbsOFX Jd}k-0^%F1}?c4wW literal 0 HcmV?d00001 diff --git a/utils/__pycache__/utils.cpython-39.pyc b/utils/__pycache__/utils.cpython-39.pyc index a8b014fc1827fb5f4473e50cc704b53c521f0192..363fc83e9e145bb6ca826fa14e47dfd1d7171452 100644 GIT binary patch delta 30 kcmcbjc14Xhk(ZZ?0SK;M1& diff --git a/utils/package.py b/utils/package.py index 23d1129..a532a43 100644 --- a/utils/package.py +++ b/utils/package.py @@ -3,7 +3,7 @@ import json import portage portage.root -from parsePackage import PortageConfig +from utils.parsePortage import PortageConfig portge = portage.db[portage.root]["porttree"].dbapi #from utils.utils import sort_install_pkg #ПЛАН: diff --git a/utils/parsePortage.py b/utils/parsePortage.py index f692bcb..b497023 100644 --- a/utils/parsePortage.py +++ b/utils/parsePortage.py @@ -1,7 +1,7 @@ #-*- codding:UTF-8 -*- #!/usr/bin/env python import os, sys, json -from utils import load_config +from utils.utils import load_config class PortageConfig(): def __init__(self): self.Config = load_config() @@ -80,9 +80,9 @@ if __name__ == '__main__': Test.parseMakeConf() elif sys.argv[1] == "use": Test.templParse('package.use', res=True) - elif sys.argv[1] == "mask: + elif sys.argv[1] == "mask": Test.templParse('package.mask', res=True) - elif sys.argv[1] == "unmask: + elif sys.argv[1] == "unmask": Test.templParse('package.unmask', res=True) else: - + pass