From 8f884cc352e0bfb215d7392e924eae583c9e4fb6 Mon Sep 17 00:00:00 2001 From: mol Date: Mon, 20 Feb 2023 23:02:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + Gateway.py | 12 ++++++--- __pycache__/ExceptionHandler.cpython-310.pyc | Bin 2948 -> 2954 bytes __pycache__/Gateway.cpython-310.pyc | Bin 4642 -> 4703 bytes __pycache__/Route.cpython-310.pyc | Bin 2783 -> 2789 bytes __pycache__/utils.cpython-310.pyc | Bin 1047 -> 1053 bytes app.py | 2 +- plugin/MusicHandler.py | 5 ++-- .../__pycache__/__init__.cpython-310.pyc | Bin 159 -> 165 bytes .../__pycache__/app.cpython-310.pyc | Bin 975 -> 905 bytes .../__pycache__/resetDir.cpython-310.pyc | Bin 376 -> 410 bytes .../__pycache__/saveFile.cpython-310.pyc | Bin 433 -> 467 bytes .../__pycache__/sync.cpython-310.pyc | Bin 1001 -> 1035 bytes .../api/__pycache__/__init__.cpython-310.pyc | Bin 135 -> 169 bytes .../api/__pycache__/playlist.cpython-310.pyc | Bin 981 -> 1015 bytes .../api/__pycache__/token.cpython-310.pyc | Bin 436 -> 470 bytes plugin/NavidromePlaylistSync/app.py | 6 ++--- plugin/NavidromePlaylistSync/temp/测试.m3u | 3 --- plugin/NavidromePlaylistSync/temp/测试2.m3u | 1 - .../__pycache__/MusicHandler.cpython-310.pyc | Bin 841 -> 915 bytes plugin/__pycache__/__init__.cpython-310.pyc | Bin 137 -> 143 bytes test2.py | 24 ------------------ 22 files changed, 16 insertions(+), 38 deletions(-) create mode 100644 .gitignore delete mode 100644 plugin/NavidromePlaylistSync/temp/测试.m3u delete mode 100644 plugin/NavidromePlaylistSync/temp/测试2.m3u delete mode 100644 test2.py diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..95624dc --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +temp/* \ No newline at end of file diff --git a/Gateway.py b/Gateway.py index 79a2527..7916399 100644 --- a/Gateway.py +++ b/Gateway.py @@ -59,7 +59,7 @@ class GenericGateway(object): logger.info("Register route: %s", route.path) def proxy_request(*args, **kwargs): - + print('成功代理', route.name) upstream_path = route.upstream_path for p_name in route.upstream_params: v = get_params_from_context(p_name, kwargs) @@ -79,6 +79,7 @@ class GenericGateway(object): if request.form: upstream_req_info['data'] = request.form + # print('upstream_req_info', upstream_req_info) for pipe_handler in route.inbound_pipes(): upstream_req_info, args, kwargs = pipe_handler(upstream_req_info, *args, **kwargs) @@ -88,20 +89,23 @@ class GenericGateway(object): upstream_req_info['headers'] = {k: v for k, v in upstream_req_info['headers'].items()} upstream_req_info['headers'].pop('Content-Type', None) upstream_req_info['headers'].pop('content-type', None) + + # print('upstream_req_info', upstream_req_info) resp = requests.request(**upstream_req_info) + # print(resp.headers) status = resp.status_code content = None headers = resp.headers - + print(route.outbound_pipes()) for pipe_handler in route.outbound_pipes(): resp, headers, status, content = pipe_handler(resp, headers, status, content, *args, **kwargs) content = make_response(content or resp.content) for h_name, h_value in (headers or {}).items(): + # print(h_name, h_value) content.headers[h_name] = h_value - + # print('content', headers) return content, status - # 修改函数名称:Flask route注册使用func name必须唯一 proxy_request.__name__ = route.name return proxy_request diff --git a/__pycache__/ExceptionHandler.cpython-310.pyc b/__pycache__/ExceptionHandler.cpython-310.pyc index 87cb1f0a71f0ce1103be828382e8c8c88d6101ab..387f478a08f8b384e44c85a4bde93e3041e13cfa 100644 GIT binary patch delta 59 zcmZn>?-J+E=jG*M0D_L$4>oe=Fe)1BXXNLm>gVR?=ob{_XQd{W=;vmpq~xUP7N-`K Nr55RLp2YZx695SW6QTeB delta 53 zcmeAYZxQFt=jG*M00NJd=QeWZFiPvXTE!F;;<}mcv-nKGm`Lmd(r2OzpBb4 zk6S`Jf1_%9zT>ueCc2!Qokn}1qerJ|SK3y~<|7Z7N1rCY>D?ldfwU&=5L_+)CmUlblLip}eVs9u9t)$qP`q<-x9ns$|jW|$4Kf!@dk=CZW;U7!b< z8oeZy^!2U|hy2^#?O#8*^UL?2|9<AEBc?1JNMmUWyiV#P*h_f>QLaDjDC8FKTk|j*H>tA=fZC3Fd&+c%F zTH^qv+|YIm1<#_H>J2+>2^T55%{&+5)oM=LYF4_uDe?zFb9=Mmv}>-2CiVGsoJE&)+<|9vul4zMS?>JHjl4Fe0~MwH{f>N*scIi*Y5bwfv9rZC|>1YTLC3he0c&VhWC=rsCCUwt}*R7xC(g6GJe0Rb-pl;oku*HCZ?A@=<$&I-{> z#uH>Q@{F&qypDny0HIo*2T2dFZESWK_uc?FN`_^G$R8|v7E;-8I*@23&UZ8N&Gu4! z``<(cdL*1UlEb6O{@=25Gb&`uZ@-0BsW=xtiGe(VFpCg(L>xF$^Q#DloCn1G1Z<#b z2irO&rDOeC7F#X2H&(cV7Kxy$)E zkd_i6?O7a}H~uwY3yGv>ZKJMGuDfjeq2Cps9NU1$ eZj()SW5a20!2j^8{MjOA5}QAiXY^OTMA*Ma^=6*{ delta 1448 zcmZXU-EZ4e6u^D29e>4fk~U4(Olmt;3YlOnQdhPro5ol*0a`)gVPHCf7rTu^61z7} zScI)2%EJ(Xm-`PSd}soM_^8A)|G~toU*G|W2mS+i;T(sxWlMB_zW3bodGE1*Tl##- z^m92~fZzQ~4;oizel)KTV)2`#0&J2GiOT;X{^ATM{Jpffu^lkKG+2?&8BG z|A00t1}L#v1gf7v`H+fd#H9jC=Mf8tMZ_7zv3mLNhAfgIZYA30-G&>4p5J8}e@l7t zEZQeV&t(Iz;nur$$7RJw%=s6}Px}KR2=|1R5K|zzF5EU_F{F_gkpmh_p*WHvTuEaw zrhD=|GRlCSJSK6*AtNQqM08AJIaDJ#)LJ@>EDQri4uyQ@6-VSom}vZ zCydgFx3z5=n{htMM@Gwx%$l(GU1UVr9s0UZ&2I63v^DuWp6x2XpuhIq(FIk-gq~kb z$h!#{oV+%?8NKFsjj-W&f-7(EpLMT{R@J#A*AIFjbL~z&u*0UsuVq)atZC*3Z5ysJ zWz%mvE@S5~VioZ;B8w0a&mg7{X;LdVTLmQ2j?X$4|0TO_Tc+O+@A&<$QxCkr?Jv7JW2I>3^HN&Bq9B2nG06Zl>?w6q<##>{L0%~Xr(eNip?P^h_i^a3(~~VHG36t>~nIiC_4?n(ZlbK zD(F<5Q5AK~(Aeq2Kk`?}{swBL{e!(S>48f)OPk1qS(0h{w$n@0SKQ$yV?M+3p%bc^ zL=S8REt?)aHcp}h_7Jrb>5lIVAN%s4-{%4E!{{voBt9-KFQTZLW0&E3M#3# diff --git a/__pycache__/utils.cpython-310.pyc b/__pycache__/utils.cpython-310.pyc index 29a9d53ac18f2c0b4f6a518a58459564614661ec..f69da4ed78be7871a8f48876712497add074b86f 100644 GIT binary patch delta 77 zcmbQvF_(iopO=@50SG!~KiJ3}#i*#EpOK%Ns-K&mqhC;zpOuQws{_f0%w_|z S#_Yi;Ie9;`I*@$MYz6=W;}(?w diff --git a/app.py b/app.py index 340fc8a..c11c4b4 100644 --- a/app.py +++ b/app.py @@ -63,4 +63,4 @@ class GatewayServer(): gateway_server = GatewayServer() app = gateway_server.app -app.run(port=5000, debug=True) \ No newline at end of file +app.run(port=15000, host="192.168.124.12", debug=True) \ No newline at end of file diff --git a/plugin/MusicHandler.py b/plugin/MusicHandler.py index e2662d9..c0a32ba 100644 --- a/plugin/MusicHandler.py +++ b/plugin/MusicHandler.py @@ -8,8 +8,9 @@ class MusicHandler(OutboundHandler): :return: (request, args, kwargs) """ # raise NotImplementedError - print("222") - print(status) + print('music handler started') if status == 200: navidromePlaylistSync.start() + + headers['Transfer-Encoding'] = 'gzip' return [response, headers, status, content] \ No newline at end of file diff --git a/plugin/NavidromePlaylistSync/__pycache__/__init__.cpython-310.pyc b/plugin/NavidromePlaylistSync/__pycache__/__init__.cpython-310.pyc index e37f39bf9e3fdbe4d1064e8854a4cc34917ea6fd..b60cb19c3fcc5c312b5a0fa5a9fd33e5fc297cba 100644 GIT binary patch delta 85 zcmbQwxRjAQpO=@50SG!~KbXjEW9Oltk)NBYpPQefUr>~vm6}|lpPQMIl9Q@ioLW?t mTBKi)Q<|Qcr|*|omYGrnR2qZ delta 62 zcmZ3=IG>R_pO=@50SNx}oSVpPqvYgj6;n`@pOurrFl98XM0O#hErf25GOw1Q$ JjG5S~003$M6;A*F diff --git a/plugin/NavidromePlaylistSync/__pycache__/app.cpython-310.pyc b/plugin/NavidromePlaylistSync/__pycache__/app.cpython-310.pyc index bfae2852d21a3a8935fb09a60b396c99f19cafd5..c383a44e11921fab389255fee04485abc2c6c031 100644 GIT binary patch delta 372 zcmYjMJxc>Y6ugflcV2QqL<x!tF(=U5VrIO zh`+{u3x9*Pm3!w0K6sBeGce4&1&bhNaU3~zWbYUYMS;N6HpK=mGLbw4Zt~~(5ymsM+pP4lrKs-lwgj|FhQm! z3pznf;IZS6PM`_MT z$_2Yd6P4x|LV^w?5_2R{PHv}|rn={Etfw~HfET7N6%Z;YD|Ymg*IkP|v1O5|Tu7*k(nn9y!5+|b)s1I=EQnPU3 z7r60L6u0A_xDfC7!hv(&oO|ZpxG%1kcwWVV*SLS~E!}!owK60QU=5Hx-9Fqjl{c`j zQBXP}a%W&StiAF%RkZ;fplgh*-2ug5)fY5+0cLHnbVd_^H?kBf&_P$31OF zh9D5pFM(fX)NF5?jgIGH2aR=na_%%-6@>6jmyLVaF}OsGaEzZqz^YtGv3 Ne(C;a#tLrFe*!E?hy?%u diff --git a/plugin/NavidromePlaylistSync/__pycache__/resetDir.cpython-310.pyc b/plugin/NavidromePlaylistSync/__pycache__/resetDir.cpython-310.pyc index b4a6edbaa2248784fea4115137ed653fc205cefa..9dc205109eb3d1c9ed1d0d80e4cf469b71ba4a9c 100644 GIT binary patch delta 154 zcmeytG>e%#pO=@50SG!~KbXjUF6I_{N@|WzW^u_a#K3OKm8BNx7vz+tXXfeqC6;BT6ake68VY88{0SeBVml%JcbTac4jnUh&uqFY> HkTD4Wo%|6X diff --git a/plugin/NavidromePlaylistSync/__pycache__/sync.cpython-310.pyc b/plugin/NavidromePlaylistSync/__pycache__/sync.cpython-310.pyc index b0b1ec6131dc660e5eff9c7f9b67251427342870..0e7b77fa18aadc7b95cea711a5c5417107f60204 100644 GIT binary patch delta 294 zcmaFK-p#?C&&$ij00bSgA8h2_%jj~8FS5+tBskm6!l*FCJi9nVljRnFd1_KhVp)7f zesM`&Vs7d!9;iT0etKpeT)H5!xVSvODCO2<9;SIBw^);NQWNuvSb&D#Vl61j%qzJy zc^{Kz_ASnWoW#nU%;J*bTb!vC$*Bb;nfZCQIMOn6QvHCY7x4mhtYj#X22#IV^fU5v zQ}uK6bMy;}^0QKtOZ0OyQ&MtLb&FGr%2JE;3vx<A3JT)mLu`E6# zzqlkXF*h}e2P%-0pPrcqmo7*wE-ue6N{O1x!!%DMiZwYWH8HP<1!(v!)`FtUyppKN z`#jA!Zhj@SLP+hOb%jpR}=xN(qu1U2U1ad5N8?dCFf+O=9LsNfdnV-VwMvH PsRA2_L;$kd;ht^fcQ1s_5H delta 55 zcmZ3<*v`nE&&$ij00bVVPfz5wQP6U=ipfhX%SEw0QKvmHbL diff --git a/plugin/NavidromePlaylistSync/api/__pycache__/token.cpython-310.pyc b/plugin/NavidromePlaylistSync/api/__pycache__/token.cpython-310.pyc index fe693268a09758c2c68ef7ce8a6667441765094c..6dd9f8aa000d23af71fa5000a68cbb1eba66b857 100644 GIT binary patch delta 196 zcmdnOe2tkqpO=@50SG!~KbXkfrF4rqH$SI}FIh3PA}=){B)iZm|^P7nc;VPUdG64Zg)*lv?anoS(Onp@`IjOopGs;qn^b2xI(=+q*{SwPEQ;L8}19B28b25udf-Ccq^%Dy+^(Tii bswnaU&C+BlVh2)1AU4==B!X}9EJi5+i7GtJ delta 162 zcmcb{yoH%NpO=@50SE;DpPtCwr4+@So1as~m#i3Ck(U|}l3niPn`ExZ6va_moLZEZ zn420kaeDwq6iY#VaY+%=WPV0b!zlKm)MBsV{JfP6MI1nreyO`!#pETHWu_G6=ceiw uxKu0;GySY_L`&f^+g7MkxTW8Z9RP diff --git a/plugin/NavidromePlaylistSync/app.py b/plugin/NavidromePlaylistSync/app.py index d42c50f..69694b4 100644 --- a/plugin/NavidromePlaylistSync/app.py +++ b/plugin/NavidromePlaylistSync/app.py @@ -25,9 +25,9 @@ def start(): sync() - if len(delPlaylistIds) > 0: - for delId in delPlaylistIds: - delPlaylist(delId, token) + # if len(delPlaylistIds) > 0: + # for delId in delPlaylistIds: + # delPlaylist(delId, token) if __name__ == 'main': start() diff --git a/plugin/NavidromePlaylistSync/temp/测试.m3u b/plugin/NavidromePlaylistSync/temp/测试.m3u deleted file mode 100644 index b8c4beb..0000000 --- a/plugin/NavidromePlaylistSync/temp/测试.m3u +++ /dev/null @@ -1,3 +0,0 @@ -#EXTM3U -#EXTINF:317,浮森かや子 - お隣はだあれ -/music/浮森かや子/お隣はだあれ.mp3 diff --git a/plugin/NavidromePlaylistSync/temp/测试2.m3u b/plugin/NavidromePlaylistSync/temp/测试2.m3u deleted file mode 100644 index fcd7187..0000000 --- a/plugin/NavidromePlaylistSync/temp/测试2.m3u +++ /dev/null @@ -1 +0,0 @@ -#EXTM3U diff --git a/plugin/__pycache__/MusicHandler.cpython-310.pyc b/plugin/__pycache__/MusicHandler.cpython-310.pyc index 72f2f98c01d680c5ae74fe2f800bd62226b0bf8b..f6162f267e3c3e03af5dc0a924e1b47a826e21d2 100644 GIT binary patch delta 319 zcmX@fHkq9_pO=@50SE+(KPR_L0+ zGB7fvFxN1pu-E`aYnW=7Ygp1*f*CYfC%&I!S|yrWTAZ1zkdc^|l9O7bP+XE&RFazV z@&wS-TP*2SnFUpXAw`LK#c8QUx~_T2`6-!s>60fgrsxU)Rs1s3&&bbB)z8h((Jv^< z&q_@$(a+6H0h**+oLW?tTBKi)Q<|Qcr$1SmNrsOHsDp!zgAojwCOb0OiwXgSia;hI z5rUJaGU+kintX&w(c_k=Ut(EiN)gbKfSkn2oXp~q;L5z@Tg-_C1x4&YeYg1iOG}dS WOY>4ZAU-H!Ml}s=xZq@6W*Goa;8*zo delta 225 zcmbQtev*whpO=@50SK(D&nL@GicEjY86vZl%JKFToO}IS(1^TrvT^Xl%{9q z#Y|3QlHuY2s^wtgVB}z&+|6V!Dgfjbf%GF0{FCo9=`lu4=3`a_k_OB&jI5J=nWc2l el>v3#;;_lhPbtkwwPOVGirIh!2ZIo!2onHfwlHx3 diff --git a/plugin/__pycache__/__init__.cpython-310.pyc b/plugin/__pycache__/__init__.cpython-310.pyc index 73d447caeaeb15ebf921cef434f7b8df63d0c4a9..9b8cb485f2ec27b600254852fc253c9b9d9c7763 100644 GIT binary patch delta 63 zcmeBV>}TZ8=jG*M0D_L$4<>TkXc*~dt{l%{9q=}*j5002}<6wCks delta 57 zcmeBY>}2H5=jG*M00PP0a}&93lyqFJVhW1#vr>~wVhSotGV=2j;M|Hello, tracks!

" - -@app.route("/api/playlist//tracks") -def hello_playlist(): - return "

Hello, playlist!

" - -app.run( - host = '127.0.0.1', - port = 7777, - debug = True -) - -if __name__== '__main__': - app.run( - host = '127.0.0.1', - port = 7777, - debug = True - ) \ No newline at end of file