From b333b56e80e00d268a37af1e3541f08bdc11c166 Mon Sep 17 00:00:00 2001 From: _ <> Date: Tue, 10 Nov 2020 03:01:00 +0000 Subject: [PATCH] Make Markdown previews sans-serif on principle --- .gitignore | 1 - src/server/file_server.rs | 16 +++++++++------- test/face.png | Bin 0 -> 2669 bytes test.md => test/test.md | 2 ++ todo.md | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 test/face.png rename test.md => test/test.md (81%) diff --git a/.gitignore b/.gitignore index 932b8d8..bb1ca12 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,4 @@ /ptth_relay.toml /ptth_build_L6KLMVS6/ /target -/test diff --git a/src/server/file_server.rs b/src/server/file_server.rs index c8d384c..7d9084b 100644 --- a/src/server/file_server.rs +++ b/src/server/file_server.rs @@ -235,7 +235,7 @@ async fn serve_root ( fn serve_html (s: String) -> Response { let mut resp = Response::default (); resp - .header ("content-type".to_string (), "text/html".to_string ().into_bytes ()) + .header ("content-type".to_string (), "text/html; charset=UTF-8".to_string ().into_bytes ()) .body_bytes (s.into_bytes ()) ; resp @@ -394,10 +394,13 @@ fn render_markdown (bytes: &[u8]) -> Result { let parser = Parser::new_ext (markdown_input, options); // Write to String buffer. - let mut html_output = String::new (); - html::push_html (&mut html_output, parser); + let mut out = String::new (); - Ok (html_output) + out.push_str (""); + html::push_html (&mut out, parser); + out.push_str (""); + + Ok (out) } // Sort of an internal API endpoint to make testing work better. @@ -809,13 +812,12 @@ mod tests { range_requested: false, file: AlwaysEqual::testing_blank (), })), - ("/files/test.md", ServeFile (ServeFileParams { + ("/files/test/test.md", ServeFile (ServeFileParams { send_body: true, - range: 0..117, + range: 0..144, range_requested: false, file: AlwaysEqual::testing_blank (), })), - ("/files/test.md?as_markdown", MarkdownPreview ("

Markdown test

\n

This is a test file for the Markdown previewing feature.

\n

Don\'t change it, it will break the tests.

\n".into ())), ("/ ", InvalidUri), ].into_iter () { let resp = internal_serve_all ( diff --git a/test/face.png b/test/face.png new file mode 100644 index 0000000000000000000000000000000000000000..18668bb6760b9f7811e532f2bea65337ec44c9fc GIT binary patch literal 2669 zcmV-z3X=7SP)0004mX+uL$Nkc;* zaB^>EX>4Tx04R}tkv&MmKpe$iQ$;NmK|6@3WT;LSL`5963Pq?;YK2xEOfLO`CJjl7 zi=*ILaPVWX>fqw6tAnc`2!4P#IXWr2NQwVT3N2zhIPS;0dyl(!fKV$j)odFFRLwGy zv8b5Ntco442w)h!7($oCOnokqh{JPy-NVP%y9m$nKKJM7Rb`6 zkz)a6sE`~#_#gc4*33;#xJkh%(EeiEA0t4=E>N%9_V=-E*G~ZdGjOFf{pA`k^GSNO zsfCY#o^9abx~a)~z~v6m|D;QXy3IZuBvJ#Ml000PlNkl8lG+p#RXt!N!VwWaOHBD2~o2CK+BZGo~IDo@Nl;Ji5@8Y~4F}~mDi-^|d z^DF^Re$P42@A5oHsM%~X{^Z4E{Nd{gz!iWi09OG1JOGVGqtR$|H;#_m5&KlXu2!qD zSS%O}(ll+gT8%~{pU;ON=q#aA6m@WLP%4!W1mW}f91iDP05qFTk|dXxm*2g6_x0;n z2!cjNMrLMa?%uttQmI%hRtKTeG+ihZyk76}@-l{DVzJomc27-B8I495hEH*K?W}US zytK45K0eN5{>?fjlj(3cUcGvSVHibG&C@S}AZBN0$HvBbdU_ZP1_VJuq44qJ$6l|u z(P*@}NxJ}2snm-XFIv%q1woKbr+fSMZ7!EPZS;*sBNz-mdGh4go+6Rx&6_vna=FcY zm~Gw?MN!dc^jPjTo6X(bT@1rYrBVl3*lael+3c}BOQjM)5EMmqvkE~Fgdm7SBKc>& za=BcYOokxHX;T@3Ah}#_Hk*&-k3=HTXf*Aoa=T@e&*zVij|+vuW1pMN=F!nnfk4nf z5=*7hnVFgK@$nXT7K=48G2wJNPf?57XKgeZefsoiYikICluG66*RL~~OtaHPlH}an z+{DC$NF-9JRQK-Po12>>2%`NRp!T^-QB)uhn4h0tU0tPVTBFfSPEJlwPxtrtcUDHh z%4V}GD=WcZkk9Aa?RJO5Ar_0<-w--g^3gP1EEW$A4qzDOa=E>|y)X=)v60a<4H_Ab z#}fzyZ1(ATE7V!_IAhRV+!MOe#8&{W0Q}jDeFU1p8qNP|ZS2c%-V{aU^LY%zd_EtFqTAcskw_#Sk5d$7 zv)P_MfBx{{L$O$V=>Sj^mCa^Dp^)G2-`Lm)1Onl3IFrfL>-E3I3WI@R7=~eohle7O z=)V$){ag55sZ=tVjNkA7{Q2{@Z{IdHHVzIBTCxs;AP9okY&L=*gM))kr}G5m&Av#U z?CIpaMfq~J{(c8Cg4-XGZ zrP6;r>}~>}X}VsoA08eS3I!a;W3kxo?k+(P1VQZW?WNP{WHQ+z35c7`X7hMFold9M z>kS5j-EMceTmu6GAoPxp@6-S)l}a+142Q$XWHJ_u#bUAT?d^CxP7nm3N6XRyhYiE9 zLZL7kjaI95U|_&zvt7G(O{rA&_4W1k_8#+8&JjSP(I80@$MNOmTsMiQ6H<#al&R;yO4mC0mWF1LMtcLxAX)45zO6bh}ZtbFnc@82&hEY$1uR_G#;$l-8|jg8&7 zal>dd_V@S8WU`~-p3`}Eas$BrrfC|4#pm)7Z{-x3dP9Ch}~|tSS)tCy)_zj zt6O(Xkx>+tN~IPT7w6~a*VfiDnM_N>u-R-5ha;EEtyZhcQ%X!Lsh(9n>}=ha*d9T4h{~AM4}TgT<8-Mu!(ZHTr!!&FbsGW z@pwFuNC4-eRlZ;tR;$(b@85s+?Ag%J5cp?`-|vlr?tvhPMx$}LTzBr=$z(FAR4N*c zVi<;^XgC~Br_;4styZh0)9FYglF#RX6uDgXI+Mxd@pwEQufM+^l;C_mABjXz6kT6m zM^QAJ%}OMa>FH^$R(o(y#CFzWsQ07sFuFRZWLiLU_s bzXSLS!+vC>9$T(q00000NkvXXu0mjfa`FHg literal 0 HcmV?d00001 diff --git a/test.md b/test/test.md similarity index 81% rename from test.md rename to test/test.md index 120b141..119ee02 100644 --- a/test.md +++ b/test/test.md @@ -3,3 +3,5 @@ This is a test file for the Markdown previewing feature. Don't change it, it will break the tests. + +![A silly face](face.png) diff --git a/todo.md b/todo.md index c28e579..b3d977b 100644 --- a/todo.md +++ b/todo.md @@ -1,4 +1,4 @@ -- "Preview as" feature for Markdown / pretty-printed logs +- "Preview as" feature for Markdown (It's not threaded through the relay yet) - Make a debug client to replicate the issue Firefox is having with turtling - Add Prometheus metrics - Not working great behind reverse proxies