remove ico generator, use embed instead

4 files changed, 4 insertions, 31 deletions

diff --git a/go.mod b/go.mod
index 8ad6e4d..1ee9f99 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,6 @@ module github.com/tenox7/wfm
 go 1.17
 
 require (
-	github.com/biessek/golang-ico v0.0.0-20180326222316-d348d9ea4670
 	github.com/bodgit/sevenzip v1.2.2
 	github.com/breml/rootcerts v0.2.4
 	github.com/dustin/go-humanize v1.0.0
@@ -12,7 +11,6 @@ require (
 	github.com/kdomanski/iso9660 v0.3.1
 	github.com/mholt/archiver/v4 v4.0.0-alpha.7
 	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
-	golang.org/x/image v0.0.0-20220617043117-41969df76e82
 	gopkg.in/ini.v1 v1.66.6
 	howett.net/plist v1.0.0
 )
@@ -27,7 +25,6 @@ require (
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e // indirect
 	github.com/klauspost/compress v1.15.6 // indirect
 	github.com/klauspost/pgzip v1.2.5 // indirect
 	github.com/nwaples/rardecode/v2 v2.0.0-beta.2 // indirect
diff --git a/go.sum b/go.sum
index 554846f..8e33031 100644
--- a/go.sum
+++ b/go.sum
@@ -19,8 +19,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
 github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
-github.com/biessek/golang-ico v0.0.0-20180326222316-d348d9ea4670 h1:FQPKKjDhzG0T4ew6dm6MGrXb4PRAi8ZmTuYuxcF62BM=
-github.com/biessek/golang-ico v0.0.0-20180326222316-d348d9ea4670/go.mod h1:iRWAFbKXMMkVQyxZ1PfGlkBr1TjATx1zy2MRprV7A3Q=
 github.com/bodgit/plumbing v1.2.0 h1:gg4haxoKphLjml+tgnecR4yLBV5zo4HAZGCtAh3xCzM=
 github.com/bodgit/plumbing v1.2.0/go.mod h1:b9TeRi7Hvc6Y05rjm8VML3+47n4XTZPtQ/5ghqic2n8=
 github.com/bodgit/sevenzip v1.2.2 h1:oVstkjbJ/bRfmxPIFtaf0Fzf6XhXrXiglQU/WLfWHJk=
@@ -90,8 +88,6 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
-github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e h1:LvL4XsI70QxOGHed6yhQtAU34Kx3Qq2wwBzGFKY8zKk=
-github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw=
 github.com/juju/ratelimit v1.0.1 h1:+7AIFJVQ0EQgq/K9+0Krm7m530Du7tIz0METWzN0RgY=
 github.com/juju/ratelimit v1.0.1/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSgWNm/qk=
 github.com/kdomanski/iso9660 v0.3.1 h1:zTO5dqfhtFXsOsd/pCB7MBse0CPg3OSQn5VMobP6bq8=
@@ -155,8 +151,6 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20220617043117-41969df76e82 h1:KpZB5pUSBvrHltNEdK/tw0xlPeD13M6M6aGP32gKqiw=
-golang.org/x/image v0.0.0-20220617043117-41969df76e82/go.mod h1:doUCurBvlfPMKfmIpRIywoHmhN3VyhnoFDbvIEWF4hY=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
diff --git a/handlers.go b/handlers.go
index f2b1021..9935884 100644
--- a/handlers.go
+++ b/handlers.go
@@ -7,8 +7,6 @@ import (
 	"net/url"
 	"path/filepath"
 	"strings"
-
-	ico "github.com/biessek/golang-ico"
 )
 
 type wfmRequest struct {
@@ -125,7 +123,7 @@ func wfmMain(w http.ResponseWriter, r *http.Request) {
 
 func dispFavIcon(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "image/x-icon")
-	ico.Encode(w, favIcn)
+	w.Write(favIcn)
 }
 
 func dispRobots(w http.ResponseWriter, r *http.Request) {
diff --git a/web.go b/web.go
index c76647c..934016d 100644
--- a/web.go
+++ b/web.go
@@ -1,24 +1,20 @@
 package main
 
 import (
+	_ "embed"
 	"fmt"
 	"html"
-	"image"
-	"image/color"
 	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
 	"path/filepath"
 	"strings"
-
-	"golang.org/x/image/font"
-	"golang.org/x/image/font/inconsolata"
-	"golang.org/x/image/math/fixed"
 )
 
 var (
-	favIcn = genFavIcon()
+	//go:embed favicon.ico
+	favIcn []byte
 )
 
 func htErr(w http.ResponseWriter, msg string, err error) {
@@ -122,15 +118,3 @@ func upDnDir(uDir, uBn string) string {
 	}
 	return o.String()
 }
-
-func genFavIcon() *image.NRGBA {
-	i := image.NewNRGBA(image.Rect(0, 0, 16, 16))
-	d := &font.Drawer{
-		Dst:  i,
-		Src:  image.NewUniform(color.RGBA{0, 64, 128, 255}),
-		Face: inconsolata.Bold8x16,
-		Dot:  fixed.Point26_6{fixed.Int26_6(4 * 64), fixed.Int26_6(13 * 64)},
-	}
-	d.DrawString("W")
-	return i
-}