From 4f74f33f2e473f26319928bb86cb814ee71d68b2 Mon Sep 17 00:00:00 2001 From: amarcu5 Date: Sat, 22 Sep 2018 21:45:11 +0100 Subject: [PATCH] Added logging module Added new logging module, removed old logging references, and added support to set logging level during build script --- make.sh | 19 ++++++++++++++- out/PiPer-safari-legacy.safariextz | Bin 15196 -> 15196 bytes src/common/scripts/defines.js | 2 ++ src/common/scripts/logger.js | 36 +++++++++++++++++++++++++++++ src/common/scripts/main.js | 30 ++++++++---------------- src/safari-legacy/update.plist | 2 +- 6 files changed, 66 insertions(+), 23 deletions(-) create mode 100644 src/common/scripts/defines.js create mode 100644 src/common/scripts/logger.js diff --git a/make.sh b/make.sh index c87c091..3f2190d 100755 --- a/make.sh +++ b/make.sh @@ -25,6 +25,7 @@ Options: -c --compress-css Compress CSS -j --compress-js Compress JavaScript -s --compress-svg Compress SVG + -l --logging-level Set logging level (0=all 10=trace 20=info 30=warning 40=error) -e --package-extension Package extension for distribution (safari-legacy requires private key) -d --no-debug-js Remove JavaScript source maps to prevent debugging -v --no-version-increment Disable automatic version incrementing @@ -41,7 +42,7 @@ while :; do -h|-\?|--help) show_help ;; -p|--profile) [[ "$2" ]] && profile=$2 ;; --profile=?*) profile=${1#*=} ;; - -t|--target) shift ;; + -l|-t|--logging-level|--target) shift ;; -?*) ;; *) break esac @@ -56,6 +57,7 @@ case $profile in compress_js=1 debug_js=0 package_ext=1 + logging_level=100 ;; release) compress_svg=1 @@ -63,6 +65,7 @@ case $profile in compress_js=1 debug_js=1 package_ext=0 + logging_level=40 ;; *) compress_svg=0 @@ -70,6 +73,7 @@ case $profile in compress_js=0 debug_js=1 package_ext=0 + logging_level=0 profile="debug" ;; esac @@ -89,6 +93,8 @@ while :; do -v|--no-version-increment) update_version=0 ;; -t|--target) [[ "$2" ]] && targets=$2 && shift ;; --target=?*) targets=${1#*=} ;; + -l|--logging-level) [[ "$2" ]] && logging_level=$2 && shift ;; + --logging-level=?*) logging_level=${1#*=} ;; -p|--profile) shift ;; -?*) ;; *) break ;; @@ -315,8 +321,13 @@ for target in "${targets[@]}"; do scripts_path=$(get_absolute_path "out/${EXTENSION_NAME}-${target}${target_extension}${common_file_path}/scripts") + defines_path="${scripts_path}/defines.js" extern_path=$(fix_absolute_path "${scripts_path}/externs.js") + defines_processed_path=$(echo "${defines_path%.*}" | sed -E 's|[/@\]|$|g' | sed -E 's/[-. ]/_/g' | sed -e 's/\[/%5B/g' -e 's/]/%5D/g' -e 's/>/%3E/g' -e 's/n>NxhL;U)t7(Ys`A4%Zo9mx|M-Y~Mn8UtYtTe_o&NFB*(smc zkN^IPe7ObfSLDNoFMR{-c%YS_93I4{F@19fi8`qcdsMksJ0d95O z{qZsD`_sSX^M7F&J`cp_rcLKKilTFro5KMST>JY{aPEOZIVtFaKbyWaigDZLNe+TO z{%YvD66{1#P}Gzkbb(KG9q2}vnZ4O=^+B?{#j^4B>0h6)N~Pn z_jY{g?hM-)WXqFW%UVkONdTJA`CDNTR>sBH4#P5i^na}+(R}VZgv6pld@VZps*~EP zi~IZA6{zm0D~mEz6*Sm$7ceQZA?qrSIWj*CjCBx(5RP|oZVXkMK!Uwp>atx%mD`1c zP=Z|8LPJ@kme;U0QVVxS_*?~h^QkQtgy>*5aP?E96$7GWz%+L0u$JV>kP6h4tZDyf zD_*x9g@4Yln?dEhrReKb?r+AGY6%E$4NFrpO{;KqXJ<|JP7w@=eRi32aHaANi_7h*xTJs@S1 z>8+hIIL?4+)muV`N>y+>Ga?GoxV#LaW;Ge7SK7AcHn#6KH>>9lIKF0rX6uv4c@JV8VXH50U~vvT&(p6RLNhIHW3}Rx+hafR zoRFriklv#XKuE2dA+p2D^7Q5434-Nl2Cu66K0_mor&l9)MLfbBR+TaU^;WJb^M4v{ zx$C3t5D~tn560ay>%q)O=eO|L8`4yUB!V77{vZzm;btLN@{lI*7Z|E2b}DZmmiJGQwy}y@NSL zd#r?mGY>aQpxIeinWe6Bm9E(h0)Ho=f$CmhEZkq?ZYaOUJ0R`@Z5R_4T+JQBgOPfB zs?b&Vnw5Qe4tFHPy)-(Qt-R0w;V`gEyHHnAeB z#paA$Y6e?tL<&WR-857kxPMNP$MovB_OA`LtE!uDs4TZFMcW33%||}5-paINB+SpG&^sGHNCUezDXi7h8+cCcF#=cwcOwuej#X*IqLUknz=W=0p43G{; zot}w`&Diq-ZC86Bih6A6-1)R27cs8}cpx~Yu>tbwC^8kyBY?8i6PJZ@D0*M!Z%^7^ zoWinx56$8H{S@XSnt#1XW#0(=yQi>slvf5{JPsK|$PCeSjhj62_S50e?8M@Ufx28? zJgE1JBVRoAbvw;@?t6*>9_{Y&L$piL$bZ5XghH zlPAQG^ue6;n<=HJi8ZiMpWd{+N*vzi4an~%4sY`Yc3m0F<(6DDwkpB_b%=JIsB0ea4iRL!qv?!C z%}c&lT;BsCHoK{eux*^#YA(f@aL!z|y2iKTJh(QlTokS-RNcAn&WLfr_a2^Yl^t&6 zmvJ84a+l=S9e+Hj55hiKOU>Rj@wOMk;Nr8G?Jwr)!Bklnr)tv^aKt=swRBICM=os@ zhhi2{7F;medI@?K^-g1al=4|g z4eBZLZ~Kwm5M{8srsu|eVO$`$t{Uht zHOc4xsb7~RAV@>FhRe&cQpPTrn~;mckzPxP1b@iLW_GuNJRhUQr5LDe%%*PEqRy%) zx0KOdELAaEu^_F!FCs@BvXnnBc4ce?SjQrpAmj)rSNaWIZSz3eFlW0c#zM7qKXel; zE^{r$^ChJR#`bc}xAyjYiZGX7R+kIf4M=-Y(=HrN>DpUFv;E9m>cUvh0hzYdn#mbv zb$`ms#85oAC6mQ6nlrj5^U}^h<xDo;CIHx;^!bRn+7Y}HJ-?zPHHJ7#G> z&rwQ@&H*vCbCgt1er*Uh`{Yg?@XjLAtHVYToaFbl{4zl;r`OL~F7Q93=Z?ZlLT*^y zAU+jMsyr-QXOedieEFeSVrDF#HEX-4j(@A8Tp6PE)ORzY=f1Zxg}l+Jn{woxC&@K- z(zEa@i)%<&sfEhJqyCY+!IX5&ILav0asz)9K$8PAMxMGiKH84&yZqK;oM{x zm)}b7TjfPwNN-UD#X_UBP%9#f9uEDXuH;qR;Y}GCZVXE}ua0L<-*Hyl!a_=&cDjHL7_T3Xs#j$Iw)2&R#>HakE%L8L9z!wN$V z76WNM3)$R}F6Dl+b5WDsTbO=xSBhIi9knAksB#k~(u12>KFR96C=nw)bTAnnkp9RD zhCUJ&%Wmo&F)h)eQM)5lu{|aAWq+)h;c62)bemWkDHXROBWFrZq1bLPaa`XcXWG0K zMYMB)dR?LFG}~N{z#ysyy(vk?!8jH7mRHM>s;^|-6tZc(Ohb9tuWx}MEe#}Ctv6ak zm0-@*hicDmqYSSn!|?-!D2<~3F1@Kj->b~%$giLBSoV>9A`reui6IRy3x6R80t6*@ zdY$yXr?SYi%>IrfL+I_NDvOuzJkam13DUjr;a{fR3cnKt_Q;=KR9PZ#d+|fMHRF-j zBQF#CAM$!#lU_|eib9{Ag$}!CA?2g4K_HfwdtnpY>y=l$cT%r@lp>U_2^mboC|L7M zfPfXpqqZ?&`68eQ9B_n5&wtg=?}d?bFSSY-Fpm@EZpf=(Y-lEWuW7u)qJWFtFApYY z?Bc^32o^+C5j=7`YI-WO+{xb#KX?OF?rxBJp7>lmA@}O(o>4(JN9Y!OHlJ2J*k!nP zFOddQwVxkN05MOcu{z`g^|Q!P!$Xo`3zGKjxFu`TQ1N zF({y}7qqfA$VikM)6DbDwIt{GRTpMAZtbmC&M58H#`bolP8+eh&X@C>e;S-cB1F8K z$#G<^iF`B|#HKfHIPP+qQwdMRf2b&Tp}$Ug$Rs z)-U4*kV=Z&vOW~Ivwv-O&E)MyNY@L}<#uT0kK)q6TSD?y8{%>~uIA+~DEneijVYP~ zS{QG8nrk+QZZW~7HvAoP@XdNIWZ1z!Q59trD+V{+TV2zc(}M8oo8m&y&$oe%`T_@s zYNKyS{(v~k^Ad~NVs63=dWwhW;ADSsG(B~_ya4<%|8|}De18G@{j%~~Lz0*Ahdlb@ zKy>!Z9u;0t!QukY+JF z#xa~=0uKE$|H06!W#G=X0qB3a4zz_PAfci#2E*z zT6(?Ew@dqH^TFv<-nj%po!>sCQ-1n5e@Uz86{YTQ{C@~6@guO1cb}o*uKx#MB`JdX z3tR~t|2eK4gZ?d8S(2hKI$?t-0a!#*34yUN1W*DbWEhhm0r$;k|65o|Jm!*sKq-Ks zF#u@H#B59uBu2&ofQu72g<~WD{}WirA7IU^AdS2CA^l1CzcfgFeC6}QN)#u-rR+a< z*B=z%uYbt$4qg5v3`L>u66TpQ6v_O^m_Io~5cqqX`88_-0)~G`uqY8xTmoM#!O4i^ zm?%nUj12GBhBN~b?iZ~24|qdkOv2GbNRc=jM386+<31_#+dm68OE7;0H^aRn{C_Xtrm?>VH^*^k9MKF;atVpjF&!op zJPjfura=^80LOwbW&+~BhnoyTlt~CCgsQ~GYyxqPv4|q@0DvffBp{Lm7U1#!JKR5$ z4(12x=s=sF`oFIo>^o#iAd!wgnEcy3qOm(se$FEd!@0jA5_SJV_wNviB@+yAF`jUM zV}BS7$0LHou^7YYh)Dp!L@W-dF!@yy@gEQgCE)48GC@pm7{yXCLl8s|Bt%RBhJp)+ zBpn9y{Tu85p>A;RKwSlS{f}bJP~=}?O<_-8|NjhZ5@X1}hc-j843ve43}9Y^k$3{) z2;A2g%QKjQ5c5sREn4o4gaUI z@#ixH@cv&TU*`9JBKbcaWq|)5Xro=)w=J10>S>V&7o$r)m#Z)enFrreK(&s9+SCon zR6BIt+T)-g0O35wKG!Rzm!cDHjcSgK9!8MnkSa<1ul)c1QO!B=)+-3m$ppLu|9|lr zXMO18HR${Z)+B4K9f)K|i!yLpR-?DZ{mPCaj7V-gP~-+>^NBEWV}H+G=(Aq>`u3h{ z*!Pt6tu#%j7=86cR52SuD~BzHs{R2Sa>on>E2PdYXq!gIz@LZ#N|vGTN638c-(!9$ zpLX~r0l|XnTP%__V3m~LThNm!<2JO(R1TBewZG)i5YBHd*OdG#tFyon$q;`dOCDVe&aba* z10f_@@n-y8wAL=tZui?N7o-GjxRPHxXUS=YfJ{}!<@{^sVRCcwrSq+K)O|nrel__$ zx+aC-#*)#){(lC~AnUB6okE*%#cX!5Hy-B+HSU!0yNpOP>8x~rQ@Co=&9ZVJJwdzQn#cEm@ZL%Q1x zq~$XXuY&cvkg&W7HZg3*G*1d%AWm|o27U{C^h{TQ@3=@#L;8QQ-!QwDjT^?k_%u0B zK8NI?jk`E|rBKrPkKQuZd27LOs(E3}27E?a_*!OL=v|j-&DzK9dZyLWoN<}_*-f+O z(5;|LH`PLS%Vq$r{*4dmXPF@*&vhCIm)pmglkJ`hZYyFH`K_FFQ#dB~U}u7_j!8df zPfC(sJOg!1CQE;A)5S4iG9$Ut@P2=P22g^i3qM>Nmp?9koPWBz`RD(A@%75@ZJmgN z%HiyFIrv)5xv9zK?F{_~Q^PHgewu;_CaN!lT0%w!s?LPLlg1vcV?z3W{?m(uZ3!Qe zD1|kf?9YzGJqAspoGl}ddIT72e5NA?A;KEYAfgWuHt~P4*arj%sS*O_uyDRMv3)p< zmpaXrFPF;y29~3Shf=|5WeR^-)dw!1K^{z4$OW1i6s|#AV$u*Q+Y=mHIZ9EfK@I~9 z^;dutie-P^J1CD)RD-tvsGv!d(=x()h~xey<0kc?A`WqmZwyzM0R|VE=TO$yFP6$f zScORoED8)Z@FeSVEqKR82%B>;tj7s096J#XVOhv93lz2sP?Fn=_7>E*!$iIEtNqIb6@)9){PW#q|0bIX2w?FstIm2aLCo|EK+?NyFVR5ehwHq|@5*{Z!@IE!WNs_8Y*SwoaKgY6U7x$z^r;1b=2IM&&* zg}u{EtrrbPunl7=uqQ51xYpfr3%}GZ+P3eP$$f4m@PGQ#+`-2dE#xZU$(60dlx@`A z->!jd52~~%d|86MJ#z_0Nz_DDW)Vwd`<^lmT$18p_4hue8KK?EyTO-d=wk%Q!APm^C>46e@WSDQTcQeROL^ep7FEq=(Av5R#XfGUFJXa}@>|kE6Vxt6|jk+R&^WNKuhU?KfDE z5*ik+B~l#*dxJ)MmtC(hqQHG&w?9Xz!seFSk>f&N_HnY&a8G0x2ogi9_L|;SIbvfK zu6P+z6l*6(_Il0uO&u8Zrm)~ujlzSI*nj1fLlnLym*{@Bm`PX9PzAsPmaB1Y&=1yY&B69*nPrn)x|AXoPEb})N2coRD+sGC0WJx*o`d1 zB}v02Q`7|jQsbuabiXnjb=f-{XIP5H%Cfpo;ZR}8)xcaK2h;miDfNMTD^{g`^?$d_ z^*(k8F;`K0ZSu^xGc#1#EqHeNBoP6LfQNuT(49c2o^yuSCo%X5G@0jHnKdkl>s7E& zMg>(KEkI*$FI^neN_-SgLODGJ19ybn!vch@dvZ_-1~HyRTQ2phJPBlJ0MV8>2Yn3p zNC6h74yqS{Vy1qn7plyZs$$j<*nb3jvV8%uFnx{5P&UPTfK3Zc5EBMC%^v)NmNja!29L1H_s;GUitp!u@DO`&Z9D2AO~f-75a#RgNj#;3+``xVSk9+yf<`> zZDoFYmba>pIjAA>0vq0WVc?>a7#4K(tq^U{SpdYa#nW*)TXRgfX9=9{h2&1E%_FG{ zflVS-;{Zz8H-j=@qQ$W>EwYKlYApQiGy!-3+-F(9Qr6&biS+c@AYtY(cF9s1O>Bji zi_ICjR1~sSump$>y{U=Hvwy8Pi^$b+?OtnSSC%*KP#Shq@TM7PCL6lgdOJU>bv5(- zp;n>9U1iP;t3A&L;bdM?aG(>3RDxRu*zunKM1E2AS zGgPSuGixhyq-F~tKb-A>xOEGdn=@-`$3(%pk2Ja0U@EGyF+b*4bbm<&p>VY7oqv*Y z0kV^RRw#jnwsRV5k#@!!$9OJlF-fRrWjjQ--O#n`osR3pCO^m^E0k9}w=NfYM+L$G zs**ES(kXpjz|CqO@VpusDsw(<@I}PR9_n$Hu5AMGbmXZL)DeNSRb!h5a>zRm^Vga7 z7g<M`rX3eb${Ie{chm^gfn{{T+kF< z?APcLdUjf{Wa}x?gymY=mILCQ2i_pI>r$gGxA>yaW$yQ|g*EF~UbB#M2m#YAMWq~K zUa*~HyH3C(vzttD+uE9~=0cQm=hUXlYjiu#y=!fYd2aJu*`B-h3~3j1@1W^c+M!x@ z8Rp(CvvGFaf`3eX;P&xasQ0#xHXZMK7nep%cQKa_x=hylWGBvyW&8IMWUrmvKIoS2;seMi5Uqk2P`ktLrQAf@K$C; zyWG$&M)a3t;cl^z&vzxk1X#LT&)GGcX{U>o9%AI|HGh{%I@$>YU%ZZnozoBe4jHW@B@?y2?JVxAt<4Y3ySj6#Kg>OB#?-pqaoxe>ZUCxTKeA)><;$$s|mak15#0 z;ft~KF@FtYJN8)fasny16MBjX2SR;aq51$yxAc*^_Y&?Jl*}~* z${LjYJ8~||5OCy$o`Y=jD=FWMGseAUBhr@r6*|uFT{^C6Znv-fx?_fYu3Z4Pu1e4% za-7ZGQ@1XP0K+xz>Mt+LQW{!st^+RiM{+GdLVtjVCbhfe`1u$vE_qL+Lprvz2DVmt zu_d(TV#t!-@HuXDT^?F;pC;^iu`43YLs}Zzcs_#xxl(WNYMXh=hB}*hKIF2gy1pGF zQIRPTnk@;{)3%puwl%lsQ;68?vbmcjC%4kLn|ZRwHgL{7)XDuu;H>!fwfr&yEhpDcTF$X=%5zI%1uoN! zw&x$4CRywkwl#`70KRzFEI!qiPnxye6Mx6mQ7kpyc$~Xw;nUn}nSx&F)J;0F)}!QV zJK;(ArN!09jKqM&{@(uxPOl3pq8&vTXt{>o8=%nw6(dVbgZHuH`!2us82Vk8UwaJw z%H`M6`&xOSXVRPJUcOKW#aHssAp1jis7i4awP;<0njL`_&Z(lA)wPTfHK38=Nq;Vx zK{JV6z!<}w7e`S2oyv+g8!_aMmzm)&TP-eJf)tjfk|9@1ItJrF8=GB#TVALvBTsTVxX(8zJGhJSC=5M!?9f*HKj6LuXRI z<$1WX1Npjw<#D#T9s><4YxpL`DFfn^-y2RPhO)X6Rh>)6^)m6re!sqXoUqg&Z?)bi zAyEW#raF{+dK;!_HENdYNm!xf-8bn?By#F9!y~(XtYhhW^$7v^?k$GUKYwq8EC3LY z-0@}6`<}`|Pcr*Ek_@0XAG<78oOqy4u5rTD_^{8*Zi(IT9DQWZ&$=w0HJ#`#-HLXv z>!Ig`{hPX8RfHFtk383Vi?%WlyX z1qa0S0++@H8n9xc>shwB7Wf>!s@&|xtey4B8id_i+up9kX~UP-`Eq`9PrbE>xsbI} zF$(oHmJJ#OndHXyhh0W8G8X9c#*D;jxJq5L#;VQ?4rl!~Q;&z`B0RVP<2J}r&DEO% z`j=r7;8FtJ($43%vwv-SO~vhoOV$hAW_EDt4*XI>8%%Ik8|-p9uI9zgE4sXwwK1Fr zBsbjlBvWr7)u6mfrMWxm;OfPmd>~b_X zlpA%6vj@mpo|j12Y{egXI}|9YMHbbkT*?XvRgK%5oPhb;X2 zt0-_Ajw-&fxEt3h3TLQwkisY+g&d@?$1erXTPgs<;8pKe+y^7U2g_v=<1#p### zt@pVis*)}RvwsBhF#r1D`MlQzX?BgmPw(GF`&fYb3=u~-97homq6iaV9)ZBIPtph) zp$Ljm9s@tj-xzvv40yAR7j!>72iSt+ASOcJ^U25yNsshl2AoC4Fonis;8P?XG04OG zt)-U-eZ91QGVh&E#l$55>iqU88MD*J`Ey!@FDNy^@qZRr>@Bc>cb|dbw)+QQ#R-h~ z39cB5{uoz=g8u|o1`C5I3=xv@X*3|n071PdhJ6B#Vb7zy5DO9PPN@G4RzLO;24`R& zC8?MS2m%A=M3D~=jr=$u{3xQMm_Yv(Sn)ToW~G-z?fa1aApD;jBtE|I`EDhQV((IP zpWEvj1%LP%S>B<`cft?^{4QahC_~`XTgH6n3^x7Z=PhS`%^D8_;qPNKjD-XfgD)1N zc!)Dp7{(-m`_r`{Nd+yde=PW=PB@aFmWhoTdVVK_@MuJq!>C^)QS;8RVC8 z@Y~FJ&7Ifmc@8)E4%}7L#YJ}eXW^zX>Su6M%zrz={|s&t`7^i~hJmAyq)?oRahQxq zKPEsn2(gF^fOZ5Z;`tHfVgEbaxbMSMj8Q&L5OhSx0Otq^C$R{E&;umE;utjG(f>Q# zKavjWjdZj@lbyOh*ADs}GR1&M$2TVbm`5Zs5#`4`LJ*Ys8Ig$T7rK8!BpQ#AfQitU z34a)hLQpisa1@CUlnkjjz^HJ_L4N$JBI3Uw5{yL{MpIsdF$h5u5rtux=fzk=1QY=d z_Hokp$muuM|DtX%??7F8S@n-%O%eD{u_lnInEEl;I6~onhBige6p)1w_ds2P;Ajjg z4WQpB;Ul1IWEh%&X$HrFe?T@ukRov3Lw}IK3t^nXeFUcv#1AQ&41M1RSt+D^*#B2$ zxB7rGa>4Ofykte^rfit^>dConuyt>tbnn{Xf8yRk5&qB{Um8 z7|-UASnkmjQ|S#=Sk*srpjWlDZV0)tRV0Z^K_Bsqml)h)!$-_4ZyOfczE6zteSf5( z@`2Q}2#i}?8>32Ov=~F(WE+Kaz}wA~uXh-4PqLyEWEE=C1#65|Ub_<`4KP5902$5M zxC1ArpB??W*tPzk3ixuh_PHHtDdcRObg?WXSbhPuU}$$Y0+L$ffW|60knrjtk{v0T z$~)+KjB-nr$nI}?jA_AA3|{bpZ$ovrb@U*znc6W zU6WjJ>&WQga(H`1IwzF&^IQO>gUNu5hPUGh@g9_3-*-r7;avVNrOV|qVKpmBwXBJj zj*QO1xN7LlPP`z=T-JZ_%e3w|a@De5Ad8#w598 zCM|52uHUT%mjxFY81kz%-B+HSU!0yNpOP>8x~rSZLS+I5+~$H+_e{dRcEm?uLb}@w zl;blFuY&cvkTBT_<0|>Hn`Y0U zTS1p@s)g>B%>Y{c8z0ioGD}9DTNof*Z69ZaYWG}lR}rVlZ(X=z3diIg+)VJ*G3iV8 zq!szaGtkFmvgCg*T^tjpG9tBs_xt-ZfD%Mq_~F{P{BiN){L|gdKmYHGuUCF=>qHz> z4ri~+!PlzfwkF%RGxQ%!Eq6frX$m%&sJ;+-2^ksaIujO88hdmF6UzVdpI#(vOZbpP zDXiIKe|99rW6&hZ*)n9*BfwbWGZQfg5!P@95q*fTiI0E9J|I9ywGc3eMd51`+lRw= zX<@kb08$ZSD`N`oIM=$b+eK&Xk*KImO%#AT0_}U=}#;j}RxoE&Q{^ zTn^(&W*2PQ-lrj_I7fnGDVyOgQI6y*JW~;Z6li8pxCUK`Nkgb=PjGDIC`G3hISeq= zUja&JmU(~gpgcy=4ch*rf+kT;%Lwlwj{BR8+ti1OIK(-=Fj=45=~^VJ;2b?x01;eks^O^$^XnyEdrOuVNwJwO^FO{g`|s57?7(a1v3^-nf$`}f&zPSK?wH~;@DuvO&*A>WQ4jmpPy6=cx)Ei|riG!+Y= LOGGING_LEVEL) ? + console.trace.bind(console) : function(){}; + +/** + * Logs informational message to console + */ +export const info = (LoggingLevel.INFO >= LOGGING_LEVEL) ? + console.info.bind(console, loggingPrefix) : function(){}; + +/** + * Logs warning message to console + */ +export const warn = (LoggingLevel.WARNING >= LOGGING_LEVEL) ? + console.warn.bind(console, loggingPrefix) : function(){}; + +/** + * Logs error message to console + */ +export const error = (LoggingLevel.ERROR >= LOGGING_LEVEL) ? + console.error.bind(console, loggingPrefix) : function(){}; \ No newline at end of file diff --git a/src/common/scripts/main.js b/src/common/scripts/main.js index e8c435f..eafcdb0 100644 --- a/src/common/scripts/main.js +++ b/src/common/scripts/main.js @@ -1,4 +1,4 @@ -'use strict'; +import { info, error } from './logger.js' /** * @typedef {{ @@ -18,9 +18,6 @@ let PiperResource; -/** @define {boolean} - Flag used by closure compiler to remove logging */ -const COMPILED = false; - const BUTTON_ID = 'PiPer_button'; const TRACK_ID = 'PiPer_track'; @@ -31,15 +28,6 @@ let /** boolean */ showingCaptions = false; let /** boolean */ showingEmptyCaption = false; let /** string */ lastUnprocessedCaption = ''; -/** - * Logs message to console - * - * @param {string} message - Message to log - */ -const log = function(message) { - !COMPILED && console.log('PiPer: ' + message); -}; - /** * Returns localized button title * @@ -100,7 +88,7 @@ const addButton = function(parent) { // Get the video element and bypass caching to accomodate for the underlying video changing (e.g. pre-roll adverts) const video = /** @type {?HTMLVideoElement} */ (currentResource.videoElement(true)); if (!video) { - log('Unable to find video'); + error('Unable to find video'); return; } @@ -108,7 +96,7 @@ const addButton = function(parent) { video.webkitSetPresentationMode(mode); }); - log('Picture in Picture button created'); + info('Picture in Picture button created'); } // Inject button into correct place @@ -129,14 +117,14 @@ const prepareCaptions = function(video) { for (let trackId = allTracks.length; trackId--;) { if (allTracks[trackId].label === TRACK_ID) { track = allTracks[trackId]; - log('Existing caption track found'); + info('Existing caption track found'); break; } } if (track) return; // Otherwise create new caption track - log('Caption track created'); + info('Caption track created'); track = video.addTextTrack('captions', TRACK_ID, 'en'); track.mode = 'showing'; }; @@ -159,7 +147,7 @@ const videoPresentationModeChanged = function(event) { lastUnprocessedCaption = ''; processCaptions(); - log('Video presentation mode changed (showingCaptions: ' + showingCaptions + ')'); + info('Video presentation mode changed (showingCaptions: ' + showingCaptions + ')'); }; /** @@ -228,7 +216,7 @@ const processCaptions = function() { } } caption = caption.trim(); - log('Showing caption "' + caption + '"'); + info('Showing caption "' + caption + '"'); track.addCue(new VTTCue(video.currentTime, video.currentTime + 60, caption)); showingEmptyCaption = false; }; @@ -246,7 +234,7 @@ const mutationObserver = function() { if (buttonParent) { addButton(buttonParent); if (currentResource.buttonDidAppear) currentResource.buttonDidAppear(); - log('Picture in Picture button added to webpage'); + info('Picture in Picture button added to webpage'); } }; @@ -1061,7 +1049,7 @@ resources['youtu'] = resources['youtube']; const domainName = location.hostname && location.hostname.match(/([^.]+)\.(?:co\.)?[^.]+$/)[1]; if (domainName in resources) { - log('Matched site ' + domainName + ' (' + location + ')'); + info('Matched site ' + domainName + ' (' + location + ')'); currentResource = resources[domainName]; initialiseCaches(); diff --git a/src/safari-legacy/update.plist b/src/safari-legacy/update.plist index e911f0d..8d10d21 100644 --- a/src/safari-legacy/update.plist +++ b/src/safari-legacy/update.plist @@ -10,7 +10,7 @@ CFBundleShortVersionString CFBundleVersion - 160 + 161 Developer Identifier BQ6Q24MF9X URL