From a344d177d6dac17a0eb2a5941d91b52dbd1267bf Mon Sep 17 00:00:00 2001 From: Antoni Sawicki Date: Sun, 3 Nov 2019 17:24:18 -0800 Subject: [PATCH] footer and img alt displays page height and image size --- wrp.go | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/wrp.go b/wrp.go index 21dabbc..c921f0e 100644 --- a/wrp.go +++ b/wrp.go @@ -129,9 +129,9 @@ func (w wrpReq) printPage(out http.ResponseWriter, bgcolor string) { fmt.Fprintf(out, "
\n") } -func (w wrpReq) printFooter(out http.ResponseWriter) { +func (w wrpReq) printFooter(out http.ResponseWriter, h string, s string) { fmt.Fprintf(out, "\n

"+ - "Web Rendering Proxy Version %s | Shutdown WRP\n\n", w.W, w.H, w.S, w.C, w.T, version) + "Web Rendering Proxy Version %s | Shutdown WRP | Page Height: %s | Img Size: %s\n\n", w.W, w.H, w.S, w.C, w.T, version, h, s) } func pageServer(out http.ResponseWriter, req *http.Request) { @@ -142,7 +142,7 @@ func pageServer(out http.ResponseWriter, req *http.Request) { w.capture(req.RemoteAddr, out) } else { w.printPage(out, "#FFFFFF") - w.printFooter(out) + w.printFooter(out, "", "") } } @@ -168,7 +168,7 @@ func mapServer(out http.ResponseWriter, req *http.Request) { w.capture(req.RemoteAddr, out) } else { w.printPage(out, "#FFFFFF") - w.printFooter(out) + w.printFooter(out, "", "") } } @@ -276,6 +276,7 @@ func (w wrpReq) capture(c string, out http.ResponseWriter) { imgpath := fmt.Sprintf("/img/%04d.%s", seq, w.T) mappath := fmt.Sprintf("/map/%04d.map", seq) ismap[mappath] = w + var ssize string if w.T == "gif" { i, err := png.Decode(bytes.NewReader(pngcap)) if err != nil { @@ -291,14 +292,16 @@ func (w wrpReq) capture(c string, out http.ResponseWriter) { return } img[imgpath] = gifbuf - log.Printf("%s Encoded GIF image: %s, Size: %dKB, Colors: %d\n", c, imgpath, len(gifbuf.Bytes())/1024, w.C) + ssize = fmt.Sprintf("%.1f MB", float32(len(gifbuf.Bytes()))/1024.0/1024.0) + log.Printf("%s Encoded GIF image: %s, Size: %s, Colors: %d\n", c, imgpath, ssize, w.C) } else if w.T == "png" { pngbuf := bytes.NewBuffer(pngcap) img[imgpath] = *pngbuf - log.Printf("%s Got PNG image: %s, Size: %dKB\n", c, imgpath, len(pngbuf.Bytes())/1024) + ssize = fmt.Sprintf("%.1f MB", float32(len(pngbuf.Bytes()))/1024.0/1024.0) + log.Printf("%s Got PNG image: %s, Size: %s\n", c, imgpath, ssize) } - fmt.Fprintf(out, "", mappath, imgpath) - w.printFooter(out) + fmt.Fprintf(out, "\"Url:", mappath, imgpath, w.U, ssize) + w.printFooter(out, fmt.Sprintf("%d PX", h), ssize) log.Printf("%s Done with caputure for %s\n", c, w.U) }