From 6c7e94fc2055118c85bc44c67fb3b56ae312b26a Mon Sep 17 00:00:00 2001 From: krateng Date: Sun, 26 Dec 2021 19:20:43 +0100 Subject: [PATCH] Updated scrobbler --- .../chromium_scrobbler/maloja-scrobbler.zip | Bin 38431 -> 39042 bytes .../maloja-scrobbler/manifest.json | 2 +- .../maloja-scrobbler/sites/spotify.js | 10 +++++----- .../chromium_scrobbler/update_scrobbler.sh | 2 +- maloja/proccontrol/control.py | 14 ++++++-------- maloja/web/jinja/abstracts/admin.jinja | 2 +- pyproject.toml | 2 +- 7 files changed, 15 insertions(+), 17 deletions(-) diff --git a/auxiliary/chromium_scrobbler/maloja-scrobbler.zip b/auxiliary/chromium_scrobbler/maloja-scrobbler.zip index ef42efd95c356c48961dc698df74cc0ead2302cd..e1c2be0d080053ea58c089815cd6481a743671fe 100644 GIT binary patch delta 14754 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 Yff@}Q;?Jvs@cZiy4g_=;|L52L16fV4DF6Tf delta 14182 zcmZXbWmFu^*0u+CcXtR*g1fuB2X_yyjRkj4a00>I-95NF!QDN`$8(P~22=Sto>jWXc zu7E%wa&Qm`^txx5TUQ^hLmBi`<}mX1P}<}uXLNaxLDa+IRA5e;>mY| zz0XXw^T7@f_Z$Bvhst;X#KtYmx-D2-PXM+Yb16{{_}^=iV4b`B$T`^KlIpiI1?#HKW^`&rYoOO3~kmN$9mOdl2!OY z6H(klOUlM837vxrRaem7`IEa9dDlYWm>XdCtD=eEjmKD;fR8IzAdh>wT+f!MbTNkK zQ+*gfy(NjfqW`MEg`mYs1{e#rOl-DHk2Ty?Onq0FfY5AMGR(_C9>h^Ef$e3ySIy1{ z}>y$*2EL2zb%^z90sHR*h!+w*~I8cPYwbB@9i&-txO#3 zKYrq3a{x_NF+tT2cSc8k?4+&*jT7|!aNKiuN%L?bi=UIyz&G#p+i8n5@VVf?FAW#_FED6Et z(!m=Y;(Y~CQtb;QD92IL%#2^t+Z(hw9ya8WFHqFQVr!?>Een?{9n9Sh%;b9MksV5W zD;wm2s7xHMe}KEF}ZAz;n9B4}$KVNoLGh4k?BhXB$v&cyk{uh6VVhC(O< z7AO)hGitZT+8)wW1;ufBqu=DLG8xcmNIT}5b3=#8EUD0btUqr1FV6*0px2pG^d7U- z)A?bB&4SzVd`s8LhpMLK05(tdKI;Vg=e4(1hdqefW0Zj2bo9hr?nz@EwBFd<4QT@B zc02m5Ur!e3^oh`=8~ArWvnd){LdPDW(9-)CoL=hN<+lSKgTn7j6{oe6Fmvg&Ic#Ov zd4`=%V17iV!ln4elJsepz&>84qNB5){x&k1*Z9R-!UpMS>6l-R2e_Tk8vfZ7oJ;@x z>k|)WoQWsljDABY_BlwP z39j=k3tZGV#f?LOth0L*e3x30^;&7HW5G^fmnF0_%ztywfR24BQY<-uO6;wmxo*a ze(1Bn*p`+B*vRd{C}9y}2H@wYFHz0>uopB&6lpLS(VJ;;fR}H{>mzR;-4F`5uIV=& zZr15pXavLjtUAK8Hw4r!4^d9%N$;~1J+BfqOEnek>?*x@3}TpBSt+1Kn0I2HDGEhs zUUVTAO|z^9T&&l6Tei99aAySebRdvsAnx&s z#2E2jSLKRgG^mn+D1 z@|y4l{SL^S*7H8}PD;ol6pu-OR@9(7swZMNGlTO@00O_uIhO`P891jWu)3ZQw4mGf zoB4>wen(9}Rf5fujk3i5^$nFW(wKT{khia(=g>nZ1*Gxm$J|H|;2MIbF!0==iGOi1 znDQl#ixS!ud(R=G==&Odqj%VM=LAI37c9OsuN=?ou70F~3fE-q5KfdK^tr%m&H-&0 z^ya*|7~suV?nkU+k+Avj4p-4135m32kA7nEi6{!Bz#Sz0-f#Ybr)VVE0dKA3$ zsh=hX-}X(ON8**`V8MS?1KpG7!o$#3RJ#(Y4j;HP%}u>rnj7t#5L@sWeC5c?zad$& z`b0Wd|8`c%Y$O#YeL=?G`ExO5CVIR)zy^z-!Y>+s^pG{N_nsc9SU9GzgbZy-J|@rN zatYq;ETOBu>!Y_4r|3Z57%E=K=@ZQWzG?J~=^zsMw(CHeS7N&te8>RpWv7>p1b8!Q zKNxU2GQXg+d7(}4Y^^@;1(xo>A3~yP5@sc`WOYL}m>^IookALp9-orr@pH^ zcv97OS`TmSj-PtPu4v|0)mqNxZh02&V=E9a-%@?wvWh*IWTX^FxubKW)sRp~ST~mb zVQwwbq#0O4C0yfFvDDK(3&;1_(Us$ej?g>TV4>LAR1p>H;NDB1$^6xN-qK(dhFD7> z&S5`L!e>MlyMRPJ*ZC8r(&ik_OGdH{DjTupsD_PewCkHhR5Qdkt{wR|HAS;~U5ADCTCP%ovnm6K)rr{|1!R`7YjPv<)D!hmUs-d%L;B^RXTA?P) zJ{I~V!{Dn__cicfL~2kHXgJF3+VbEJ6xB}PhjqhEckm5T*@6KORKMrLNGE^;Fe*rF z7hKAb8)C^etw{ek5T$IrLsWGtVk=S4ep?EUy6hNJfNlZ=Efj-}%4|9Hh>`X0Phm;q zD$PO%DX;zfMkhs|s6%@uVpP54Uk=Dz{b^J%8M)3-RkE8caBRAv$B(rJb2pV5}VHwvEi-bPkckbitUBtTZ zrd?Sc)lG*0C8=J5-UPlUfzyuEut?&(<|4AVn9+7SN?3_&qmVih5^g}6UVJoKq}KU| znNpQP+^oj! zXh?O==dk(cb)5qCMg)tJhlGa`8DNafIUG@KUzuhF)1QqNpD>t%5s~`uJbVHc_)B1h zL_z`sY4JR8oK!yqj8*!(yE+xnd9629Vtv2Jv0_shZ8u0J(*iClb(~Yd3o9Khbi^3|RB%+68 z(Leg=z8LRTG1Xd`JTX*L6ksu_q^W$k8RT#}iafXfU?f9j(~Uo5D%l{me#!cZC5}U7xaF-8dxlWDZrI;Lk7j&!j>`8jp&Jo4^0lln;40Dzd zEAUvr&jDVY=8oG`LJX*adFegtrCeH0A_W*sNLv!50~_fy)AkDOU1~XtJQ`wiiIg$F z*c{2TbC?5`9<|nlb7dq?yt9`RS&H|XSD{7M7%xs))T^jR?!AV}64KA)ecL>^NW)xB zS#?BPo01XBLYzxm9vUlu^4Ol*t~H% zvK9xVPAr%N;@ivex~xANd_>(NYB*G5NDJ#sQ!rwgLZ_wfKHGs zx!5SPKO1hs3KtoCSk!-{hYNhPq)ZFsL*H`JA%TK6Qu}gM6r)(5muiNlX@nj80p3uf z8}}F(R&l>CXkCj${z3W0Wgr$_8lxorES;Z@2ibIwIv!~3e0DZPI{Jte@@S(l$yaKi zEls?&j5(+0K|YSs&M_ZByYnO@D)X!CT*I!Gnf98Ifsyh{a?t2aua-?_$;-Z#Upcz& zr*?t2GQtG(*ru$i*ZI(C5!Hgex}2V+1g=3K_i~@~$f=}PmQcC#_-SafyaMd;&>i)Z zb;Z@j|mXZZ)`q zl&Yco_DI>#@ag60jr1r^n$RC?Ea6Z;Lfx`Pn9;*JTt^lB0Otpt<}wGOM7NkX@-;KS zf*&bTG)iwxE|4I`f5;U1_T`B4v)2q#jVgj}jb<{ub-tN80)@NL((@2{v&OBxpLei& z@RAFv=MS$t_6mft<1$m-hQ~H_?8j?rnN^H0&&Z?uE0_bk)3Nv!B~SVOWGC%2Y(yV< z1vKo55LjNHCwC3ns?Y?`$%fC!txTAK`X*iQ;zE&}edXz{;0ANU26`<&I+BVW4*YBt?c>L3pHfp%O0{t}Rm;AJ$Q3ft6$-BFzkBOO3HJSHv zaes0aeZVdok7AL;S0xPUq}hi{vP&{D4J5b^6Rn1&)joQBT;sy@4ybo*Z2e#cWOa&E zAtv~zSo{%LvZl~vc#?oaz0}!rl7tv3f~35yInQ)9T}j%^Y`)vHL8h`#r;_9UF+qiI zb3Qm$q2324{j07UNyo37+OhFwm1`JEV6a@Hf^H2TLyE5Ua0WIynN#eVXg@h27iT1R zqhUjNz#dzEyzsL&+d59_5O$^^5YW_=R|Zb6?n#9_49mMq03P_b71G!k)buqi>w@1x zSDJBGNlEDHB+a!=C!LBy?Yp|D=7j=NPm$QdMKVHL`CLR+2B!S9*t7)T*Du@oO%-rs zQ@cf8BjZP+V70%E`E4^9hjCV9dMNm|@W!ZOiDFS62@ZqXg)%zaC zmCbjQ73{-6ugh)ewa)>k9f9ly@km+Gj~=Qr^QWh6wt>62mUXXZ)25>U7K z-X2==zy`t{(nil1<~cXw2-#~F#COU4KONs7GvH+_0?BP5pejZqos`Lxp1R`Q9tyLP zEM|44A4GES#k6TzzRdZw)@alV9cbT|y0@ZlOVnC-rAmCgr~|Zj0qsKW-=;R7ry8{l z_>IcK)PC0u87Sh9%RNx!$O*Khf}pWcK4fX119h zk;~mWPAF9fNY%a>4!3^@4H$$<3$kgiI_~a+feDBW)` zGw#CdkJc{sXD3VA3D~(=L=mqzAPPgZ#N6CR)3s@U=4?bP6L_*SFfQDv{iFK1i&c5K zV@B!sbCog|jr=mX)dT8^n(x1yT4> zA_jNCPU6h+ywa=Bf5I>l4dxvy{GsuOmhKM8{+)P~`$&!1xZI-g04 zMZZ1Q1V;v5(aFrQ73Lv^);n>3Ej@7m$hdY>&PV z59A{+MySE#$$KAm#dCMpI^;^*r{qwPAl??qly&gH=UtkGicbTxak|mIU~F*<^{2}V zza+s|CcFT?cz4^Fx^(T!p21|tYi2g&4(DS2$~ld)B{IXa-w1Ec7tQt+2!D|HN?}|E zsoWte$~ej+Zu06B`&RoGqk1^e2D2Fk^FNBqKFV#3|EW-1(K&!QCv3ED6)8<(VE9}K z=RjYOa-gUgaF9phkDZF^66xBFJPvv8&PAxps2Tzss{PI&wHCOnx#xXAKxm}hGKFH_ z-_kVte7l4NSa1_K7Z%oz2)lHybgo*FLH~~9E2hA^Ad5)ERNl+~-6BUPyQY9cA_oxq z3DA#gE88d0(~-0oc+RB@wJC-D@>8ACzEKM7W#>1?(#?Y~_s^0{{CV|y=mlF)GbB)! z{KOA*!!Xb+!Jvkhj4W=WuUa1-n`UrCJ>qaKqFYpU|>q;)R{k-{itv zA{IP-e&eMEOg*o2n=(!OIPdXn39CuBN~#0g##9Z*;|f=&LtR%RZV1xqIWC^aqPac8 zGQ2x1+la|t&?7dfwSsGuOT12nK3zLiRFR#OXWj3k;vd#cb!e-tmdf9@s(nQ$j;>aB zi621H+nV^Zb((LXduI_9DmX=C71E@A9UrC0ltEXq855*1-s?c;%`jrEHY8lK^uh{! zSFZN^aqyv=HTgUqR}bZ0tpSUN0KE>cMM$r0{icI){?>+Ktf?Mi(D+h4X~9y!L9Y#6 zSgNC+uKUX9Xs?nVCAMT)_x7=kv)Q1>4{B0M&KM{tHZOOH-|mzMv&5~6EEjV7BYrdd zP^vJcY5+F;+q>*+)p-2&cnn{x0qqr#%)oGOrkJ;pRMX~?9obMVWguEH;jepXa5YWG z*_6C^d$?pCkw$WOJMYa#ZO8fXfU0?CY4L>0C+)Tv864Co=1Y|0MTak{8&H|Cj9IC! zd~Y+_vGL(RwzP7zIX*H3G!I(HucVXdO^E93Bfd@T^b=t7 zB)V1ztPNg=*JB$HP9>t-k+})*8S=JFNhf5bFQQ~7szw`b>fmwMrx#Ti8;TXKd8f(2 zzzmWv_)F&KgwNTX>fW!J9pM4^uUUhqIC>Au1=5;L)NVg9XlWElRVA69BXoz*%no&L z7mSqeAH5fKO%pmJ3$Q#q0oYK#upT6%b&*%d?xKG@&f;Y#7 z?r&Ox*c#kljg-^CRzA2kpr=hX+uZE4Hip`1J zP2WOX3E9KMwmr2+X+<4ZsK8hwk92AdGeQJ^j_|hcP6x2&DO?~hNZuEm&=q#zjePn{ zx9js_q~iK0t?_E26f*{#1RJMoX>QuLeJy@UyR*T5nQ>!2U0CU1!@MObePl{?4GczI zDNxS#O|_w>BjU_MI-oHnjtBWI*slymg9I;S`Sp3^VcIZ z{vMGIOYg+lV_O<&oo)ze;B5Fn8Y&)&c+p6+6tC9Z5t>0#)L322(Kwkw_hDmAkAcGP2b`lgZQOsM?4*u(_?l za^w_Eyse}9M8XR>pE)xJ<~mTH%9P|oRgnbMSrWuq;&9wIP$EAJ@goa%07+G|2tHoF z1+!VjinMB7->=omjOQXKV0eN%&Lw*4nPERc>%=oAZUtC+>fPVpDf7urAkn}_$-q4E z+vZ$2WZ|vtwji%OJD!B)UpVk8!N_FbV?jeahAl@Ab6{VJfE$1AZ#Rc|CR5gcnJ(Hh zT8J7%C%xN)ADcuf9&O(2tFl_fSBASA4}+vC=w$QRIB&LnY6R5FMqp?9UbkFv78&@CL^ed6_HM$r)3n28HYYYyT{ZiWT*vtHq1hQ+s(Kf# z6%uRnKeukpT#SqQk)Et@CibIy%ZZQY6sJD9{?@s8%^f}xL|3*S5cHM%#2F0BUi@Xq ziFW&t*94sEJRxzn(j?RP@$|Ie5MQKza8$#x5(nTvTc=VNEJZ{)_)^)u*k6o=!Rb_y zG9m58Em5vqD%qz(s$Fij18)ZFezV_iy|mId3GIlwD_+cNO`+3*>%`nXxZeH~2JQPk zt2($llQF@kv`(#W{Y=&xvyQi~rQtCV->f~xZmd`N7{SIUdv7+0z0ESOdQ`!Chp_`S zM<0Ni5J^g!(mm+&F%f3>0edHi7yCM9=PdJ`N?YRf6JLUd;9F9}ax=7}C3MhmFLp<$c`hTW)eZWIq-NJWL#AEnD!!@d!ppIi4 z3}%Nul}kieL&Z>FV$v@7=&sF%?S=X*j+P|`%;a$8t%@ISEE80k4&fmoL2$>+TUP*Y z@#?d1H?O+AgeB(!HTUGrQjOi7bMui>!0FYbrW1?CHr9!^PY6Cy2Nil+cv&((%|Xv< zp-rFXZ$DeC{(%`(KeS&G4fRUj3dZ;tw01bQcB@>tn(vhl1Z*=s>;szSejbIt1q6%? zSm+MQAFj1y-%-vA4G`p=eP8EQe^UnF9?f_(v=aoeGwy859U`h04)`)!*6+^MS3+E! zG7xxYvP(Nw*|649iVnpzNPT!Wwe*Ji_VD~kFo$R~937i#CaN@bDNEL|uW+oqY}MJ^ zT!WY7w(sm=uhwl^2p2znt<*PzU79E_{MGQ>nzk+5s{X}QwxW4=t#ZTTcCH@KI$=kg zG<3(~0u<|!HROJ}#QPGg%VA+6bLg_5ZJ>Wp+s}Jx{CQEPyHtkK_~0-)TuCF48vdXd zKkP?vV}lvG5GaGtEUI!fK%fXZtSeamG4Evkc5O4w6jN)??5d-Sry1YlDV}5F?u#j! zucW8+J)V{&3t^;sZ&T7Et=1ecOQ)F--&hf0u*i8~n&I~GV*bo7K9rHk{Osrd#{}U{ z3{`t_e~v)7*Km^imiyk++FIz9I^_A$F+PKDy*w)8(d|2eR=2;34a>DKlCmsDE?xHSc)S+h{Cdq^!u%3Id3fk%Pm+fX5 z4{fIi;pZub4Cl?RP#Deox>}P@SM*Ta0QG%IFDNieSn7f^tw6T2lh+0sn(6#Z*a45J z_qASZSQm>!BnBpFoAHq~NIQr@;L`~q_a6GAwcnK8XbnQ#G@VNvEZ)TKR0*$1oW<>x zM=N(N*!iDKk1HdY_kR}6jqAal7p;SR^2QF5K-9@j;dw0rs_s_Z%!-Y2#5s(~czd5S zE5lTkq8_hBsE*=f=L-kDjQqtYfBFG?0b2z%WbcQIo6l-nGCr^2&S*=Ke_Cb}MOUdQ zH!ki;7zw3Qt`Q5c?GFhGKOMg=syCCUegR@04`aHc7c>;qfM`i|ImO>Xq4fw35?L4Z0qQ-!QoZr(@ehGUZxMi2-UN{jSRJb8(dvlk60Xz@04C z)AZR^)s|o0*JH$3#RZ}6t=^F-w=dq@?Ps9G-=`*sMw|3sVi}KfHdSLf2C=1?@Lur> z2x%nmsW4j_RQ8P&dMxb7H8;YBSK-cooXR{m-mx|f)UgJ!}+DVY^?k14Kc#$zQmb81goAnH7Ns$f##TYU!WO%vslME zGSaDDtW!KlJg(E~I~hZ#?}LnxO#w6G>HCk)T7zS8&0`lKL%HnpWW*sB6{p!QW^_To zNkVSfiY61b~t^u{>^ue0ncOXYNJOvIk{9y@4n*MHem3ceGdI~ z>*Wi*ck3eF07K$iz|pSKS_xL(TOz=u(qnY?^QhwsTY?;Mwoz6-v-Qmm$HT!H7K$bX z2at+tMM2x$*dv#PI>u@=EHATjUrM3fqpc_m?ew|>>*)S%-PaLt5f_1JiWa~A9^y5* zBQo~`T=rx_RArMu@1>gxe@P0@xJkh*BTUN@j`%>VQ+sRm&2=fTI7!b+^Hi_#i$5Hk zH0RF>lEs&3i`|7O*|;n8Mil(X?5Ob+3IMCR3)IRDwkK7ia*&0pA64Ys;M_vaR4(cz z`1%n$jIdOI`41V}d)1AkKRkI?H%FK9^7_Q(IEY+?ya!wa9Xzi`qGxN`IB(iG!N;8f z4(@UFV&KI9QqciMvvBf_6HM(%g#U>4>r$r+Fhc{3g5h1_-TM;$~{)juje@Mjmwigw_>>KD`B`trI zr-TvuxYUckmmo=iKm`A+Px-{o@gMamWw?yB*^Fx7aMF_G0|ypFR&ce?%Pp?f&N5z{2o7u=D+~_{RjK#~T37EJ=gX1(aboSi?^! zf~;khBV4Z=&5Banxg&$}@Aih2G0gXYT*TzNdSO+$bdu)(@o=;Sil7PKEC`Ty# zr{1Sy@vwVtUCl0127ssdBx_DecpIM4V8|}%#(P|H8H)2xi$Sbb0q)x!+sq+EMIyg1 zvL#0y*ajFXCZVl({>9s{;8#zqfVVWf77Dx;u+>Iq#_wtno{fJ-nTv|ooc&q&&E1Uz z^g3*}zZJR-WNa4)Un6htr;LpL#9Q{eFfSM7k%~o6p;58AT%{Fyo>9%>{8O2KI@EC8 zeJ#91XATpT-vKqo`TLPU4bAm9_rkM-1}dN_@x+A^u&1d^$PIyJpyp<(32_}-8UA7e z!P@Dt=3!Kp;L{7KphUO3XQgNMCz0zOZbrkT!b>AfdPUo3_!RRG%7wnUeId*gd! zXsN_P0<_v2GcD$(jnCeaXC5C{XbL4WL*tXr_Y{ybb`9OVC zU|s9gn2m^_{Otf=cQDW?I0&^Twa#FHpF>N(@;g2R@R~I}UUFjc6~bW;6%j;N10Y~( zWg(_4M!Pm@roD0|nuLLpsZAKaF=n=l=nbRSn7iiq5o1QZSZrx#ePLer&2Cj; zb3|%BXpO1jrbn}f84bkK3yZ-qq$ti*mr?_@d7J3s<^vo8Uf$5wk80~rcq_;TH#(<4 zuHR)eVj}&C5>6DSM%xB)4DGJ&I7*^-7)f{#T$jhlX@0eYF5^!nNW(8zb7Ig}Uc#?9 zSMVAosa*|KzJW{Vgxen&o?c#`XyGFmTG>SDjyr~rKi_u=f?;LuRV0LLf|8qXJJs_pBRi&z+36qbH`hs{ zY<}{OmbD)V%h5(Qemxy>_J)4gTE4Oi!VP8OqZ%n4RN~>lI{M!9v81oxj{ie0aHFib z!|f(D(Xjwva+XL`C-8it5Eb4O_j1T^iEC$WrAj2YW^$*ahtc38{@BU&2idr9_v5Tb z>G_tC)PyI{^2?3LtB9PpUXy1(#xPv1+4SdzK&Rzp4gS2pY=1Y~UA>x)xNyLidoFO5WSz_R3PXCYY33UwJvdqIm>m0`j1I z)*!?46WyUJbd_Onc}Sg_sXR7D6__vO6Pp8ZGsta;4L&HkuRAziljJ`Ej;=_N6Y_*D zp4^KL+d}{%VnTt|#0Zak-(xmCO%b^wBh4QRPsSsi*6he9A~x4?lgIvg^my#q z`DyqFzjUHHh8@1&Z#g!E{29H5y4M? zcCV;swn^)1{CM=_97F>UZkTh#7o)OTM|r&OWH@KhK{xo3`YOf_oNTdVdtr6E3JiU+iT1YLnR6vL!?Yr4CZOY&4NviszJ8u&&Y3Dv z*KB`Dq%z0TaUl*$O?|*afbeHHk0jUEeVl4oibB|98?6xXZde2?d8@@L$FTFg35tRW z+o%hM(oaN!iHBM3aF8XuxH({=b1TDV$Wny&ywjFZ*T3Ucu;R5>hU8e;YO@f9Lnqkg z)&NPZQM8JE80F;n_8v2<->Ei~y{9U)T_1-QOvdidzV4LMd<@c*Nmq@?iZNthV_Sz% zY>Ym69T{`QKV=43tXH?+P*)N{sT1-j3JNzOs+#9<)xFV?zhUEY@qP%vzv0Hr@LZM46Vja?yhw% zwVU6s)ihEQ2r@HNTyMUZf)DP>nX|A?Zi*nrVRrLK<_iH^D<9|JEx1TN-+yin7d}p! zTlnCy#7(g5NbF7{SS-f2I-ESk7~5Cc)AMId zom=hV#YyhQ$~yHa&%Q=GZk1P%uh%5UIU{#o+24)>ejF~lO@30}OMPuZZf+ygR7I69 zfutqRY5`b&R>(Im1%%f*>ZS46txZ)AmIoV4JYZO~pkA4?2;wXk( z6O`*2kBq=O5(n{{_9Thji1yIsWZfKJv%^ChaC=xfaJ)^l3oo6AaPnT($!F+(P_&ZM zM`{(Uz0Bu$|dg=~s39oPioul$hsxs&5@^ebvClHUycF zTvdJ-t)Hu|AiEpbolMvef1~)liQ?i##iP#JVfx{N$$ft)E8@&{beqqHFCXlY<$*X4 zFze}a=5$=@rED{XuxfCZ?l@q5%jqS_{LVb&&KAlz)eH*0dSP<4+B5EDamExvW=pyUX)765nf$ar({j!`7X-`~+!EpMZ&wbx zxLGu`6cJ(t6YgtW^y?ciQ)SJjQyos49xk>_&jtzZiZLyUCa}mARmZlYZdi^0<(2Na z$`TWJa0@SHrxzBMv?Grz@a+rcv;>$5OmXS-F|6}pry}C7uo<`awfLnpkWq+krTk^D zINF~HOi{h;zEXQ%*_vCOPC`*L%>6@5CY;tq+)xf&KvgV_kh7kf$B zb!|j$P&~oK4u1iA^PfXGM)c$dl6`qP%t#CG&`kt9n!ZGRCi#X*%O!tqIf05Sy>Y6^ za5-k%A|deWh`Po z>$E;gEp&{!*l?V(lPJ}2G?bhTTDh)6jayeo%t$-%f^Iu{Qk}Ov76xImcUOoC+grSu z+^J|yB%<-=5Xbm5)kihD;%@2{Z1$fD`u~KxyVzLxd?KS2LNwloySRv@tc^n?){jmY zfh42WD%x5!AxI-XB$moP1&|h$w}*F??HP^EE}fFh!t@7nA-)T!wKwxlR{1`i@vp(p z84t);2kmIRXwdIPr6A0YAC#^jYT9i;a6cahcP;CU39|c*q`+0bT^Hg3i{$}dt3T7!^g(W8z6;~hn9))eaE`v zR}!XEy)?LXqum2ppNYv4Z7FW?169FMpT7RThVYvE)X2W%zgQEO#vr@e!Z z@K@YXi)d!O;VdV8Dzth9&x>zcGvfWw!hN`xo{od{M+iwOD$9|rp(ZocLR?-A4Sib& zhnEC5Y*T$%2Qd_0mOv{SUkpJGvZkhLhz(t~YOQi>PPvnUuBa>;@HcC{3E~!Aq=Ju{Uq!Oj3APHxYQ;y&`%_g4s*d=b_BlF%F z+KI$PH-;}b1W45x0dqEaXIoP34$dE1_Z$A_>rbd$Kgr$-UKpIfC>1jZ;>9jVpHcjx zWrzi!J>GC&UG6U+UL}b1e?`X-b*(~L={X!ET#zJMrVyf|fpFgm8W89ms{r{2{PiiZ zFhv|4=|8%y-oH&mNfk!N_>b;{cf2LhIhB*=f7zvfOOD*O-VWb8_5I(f_NvH z61!4JiRT%&Y!Kc<9KFwn`X3SAp$Sl;SQ=eoPAWX-|3W_h9z_Kj^xw$Odx&@B=RE`= z`~TuT|E?uKdtc!{VUoWnu6N}-{PWl1KKv)`^DmWuK 0: - action = args[0] - args = args[1:] - if action in actions: actions[action](*args,**kwargs) - else: print("Valid commands: " + " ".join(a for a in actions)) else: - print("No action specified!") + try: + action, *args = args + actions[action](*args,**kwargs) + except (ValueError, KeyError): + print("Valid commands: " + " ".join(a for a in actions)) return True diff --git a/maloja/web/jinja/abstracts/admin.jinja b/maloja/web/jinja/abstracts/admin.jinja index 249ccea..3fd6180 100644 --- a/maloja/web/jinja/abstracts/admin.jinja +++ b/maloja/web/jinja/abstracts/admin.jinja @@ -18,7 +18,7 @@ {% for tab_url,tab_name in [ ['overview','Overview'], - ['setup','Setup'], + ['setup','Server Setup'], ['settings','Settings'], ['apikeys','API Keys'], ['manual','Manual Scrobbling'], diff --git a/pyproject.toml b/pyproject.toml index 715a8c9..f02988a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ name = "maloja" version = "2.13.4" description = "Self-hosted music scrobble database" readme = "./README.md" -requires-python = ">=3.6" +requires-python = ">=3.8" license = { file="./LICENSE" } authors = [ { name="Johannes Krattenmacher", email="maloja@dev.krateng.ch" } ]