From 175612b82f19138c59884caf29560c3f00f1030e Mon Sep 17 00:00:00 2001 From: "Yann Esposito (Yogsototh)" Date: Sun, 3 May 2020 21:50:56 +0200 Subject: [PATCH] add gzip size --- engine/update-file-size.sh | 13 ++++++++++++- project.el | 5 ++++- project.el.sig | Bin 586 -> 586 bytes 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/engine/update-file-size.sh b/engine/update-file-size.sh index b0ce241..341ea88 100755 --- a/engine/update-file-size.sh +++ b/engine/update-file-size.sh @@ -31,6 +31,9 @@ for fic in $filelist; do htmlsize=$(sizeof $fic) debug HTML: $htmlsize + + gzhtmlsize=$( gzip -c $fic|wc -c ) + debug GZHTML: $gzhtmlsize xfic=$tmpdir/$fic mkdir -p $(dirname $xfic) @@ -49,21 +52,29 @@ for fic in $filelist; do css=( $( < $xfic hxselect -i -c -s '\n' 'link[rel=stylesheet]::attr(href)')) csssize=0 + gzcsssize=0 for i in $css; do isize=$( sizeof $webdir/$i ) + gzisize=$( gzip -c $webdir/$i | wc -c ) debug $i '=>' $isize (( csssize += isize )) + (( gzcsssize += gzisize )) done debug CSS: $csssize + debug GZCSS: $gzcsssize total=$(( htmlsize + imgsize + csssize )) + gztotal=$(( gzhtmlsize + imgsize + gzcsssize )) # the space is important before the toh total sizeinfos=$(print -- " $(toh $total) (html $(toh $htmlsize), css $(toh $csssize)") + gzsizeinfos=$(print -- " $(toh $gztotal) (html $(toh $gzhtmlsize), css $(toh $gzcsssize)") if ((imgsize>0)); then sizeinfos="$sizeinfos, img $(toh $imgsize))" + gzsizeinfos="$gzsizeinfos, img $(toh $imgsize))" else sizeinfos="$sizeinfos)" + gzsizeinfos="$gzsizeinfos)" fi print -- $sizeinfos - perl -pi -e 's#(
)[^<]*(
)#$1'"$sizeinfos"'$2#' $fic + perl -pi -e 's#(
)[^<]*(
)#$1'"$sizeinfos"'$2#;s#(
)[^<]*(
)#$1'"$gzsizeinfos"'$2#' $fic done rm -rf $tmpdir diff --git a/project.el b/project.el index 34d55e1..b9a2a8e 100644 --- a/project.el +++ b/project.el @@ -171,7 +171,9 @@ (format "
%s
" (format-time-string "%Y-%m-%d %H:%M:%S"))) (size - "
XXK (HTML: XXK, CSS: XXK, IMG: XXK)
") + "
XXK (html XXK, css XXK, img XXK)
") + (gzsize + "
XXK (html XXK, css XXK, img XXK)
") (generated-with (format (concat "
" "Emacs %s, " @@ -195,6 +197,7 @@ ("tags" . ,keywords) ("rss" . ,rss) ("size" . ,size) + ("gz" . ,gzsize) ("gen-date" . ,generated-date) ("get-with" . ,generated-with) ("src" . ,website-code) diff --git a/project.el.sig b/project.el.sig index 5b4f1b237f0266bcdc21e7c83f56292d46e39a7e..b1d3f506962ed2aa4d2305cded145c4559f1576b 100644 GIT binary patch delta 534 zcmV+x0_pwA1j+=EBLlA>j*%uHf7JpH|9&1O#FPYUt;@Ez;^^7BpwH@Z8Af5GAWoXY z_SHl2zwgDbit@~o{!j?uU`H*D2PMrQC!L6V1Ww6=UYDu@QjXF}E=0l-!Z2eeORXN2 z9rf>0rwn5eb1?gj=bp%Kir;RcreHX8;p*~YiZE;LY z&Y%MV4zn$3xh%t_y_taSGWPF4)-|@-{Nk2I@Mk z!lMwGCsNrN^{x`d)vqd-e;7DvzRNz;7&4QQP?5MK^R*u4EHR4i;ODnvv|CpBOYp#% z=quHgnEPrA0sXSdD&V}HLJR|!`g5AdU4GK|kb8;mF@i_h$GAAT&i99LJmy~XjHe|dMIL3$A9tyS=M z>cJNJ3$hcL(I&%A$Snog{&K$u6(6_aKs$_f7xfT<)`{nGWaYyzH@`HOTiUIWOHkg1 z4MrBR-O&AUehB*{0|r<%6rhPGb4Mtv!)O(SzM1?LFTEG;%O8kC!5~-QqVSH#07;Xd(BFjT(FmNCExj0Cy8 z8b#3Yl=EBrG-X#8B>`XU$0y7irdR5zOMo`p&d{Sq!e3;3_Ur}&@%hF3 zH)ACS&ZIeHcugE#hG}C6qT?>hA>C9|=HN>=M@qS`uaTjwpp?odB4mO|e*q@r?7k-P z*ZDCi6@)|!+W&XBadV3 zDAA3%`P1&8!U8y_;v%o;f6c~hqg%-poaKK}UOG_Y8M|xjun=6 z!q=j`NaK?aVP0o7g9pwP%+{!i+g;>r4i+VbB$2BTE5yqw^SRw3f6#%I)|0cPvYDVK z={kuV-i;}Cg2gOcLG+;8n=aE`4ie^MfMCPoJw=_`g`I&0fW?{AcADv>Pb(7(vl=sL z$nnl71MPa^S>XSbD+@e+aHNUWAt%>@MjmRQH?s#}L*KhBlATAaePNR`RR=XM<)6BO Y