pack tpls/,fonts/ with go:embed

Author: sndnvaps

CHANGELOG

@@ -1,5 +1,9 @@
 ## 更新日志文件
 
+     2022.08.25 go版本
+        1. 更新go版本为v1.16+
+        2. 采用embed模式来内嵌tpls/fonts文件
+        
      2022.08.21 go版本
         1. 删除qtgui版本
         2. 删除http-server

README.md

@@ -12,6 +12,11 @@
 
 # ebookdl 网文下载器，go语言版本
 
+## 编译版本依赖条件
+
+   1. go >= 1.16
+   2. gcc 必须要安装，用于编译 github.com/andlabs/ui库
+
 ## 安装方法
 
   ```bash

conf/ebdl_conf.ini

@@ -17,7 +17,6 @@ import (
 	"github.com/chromedp/cdproto/cdp"
 	"github.com/chromedp/chromedp"
 	"github.com/goki/freetype"
-	"github.com/sndnvaps/ebookdownloader/fonts"
 )
 
 const (
@@ -36,15 +35,13 @@ func GenerateCover(this BookInfo) {
 	}
 	defer imgfile.Close()
 
+	img := image.NewNRGBA(image.Rect(0, 0, 617, 822))
 
-	
-	img := image.NewNRGBA(image.Rect(0,0,617,822))
-
-	fg,bg   :=  image.Black,image.White
+	fg, bg := image.Black, image.White
 
 	//需要一个ttf字体文件
 	//fontAbs, _ := filepath.Abs("./fonts/WenQuanYiMicroHei.ttf")
-	fontBytes := fonts.MustAsset("fonts/WenQuanYiMicroHei.ttf")
+	fontBytes, _ := fontFS.ReadFile("fonts/WenQuanYiMicroHei.ttf")
 	if err != nil {
 		log.Println(err.Error())
 	}
@@ -54,7 +51,7 @@ func GenerateCover(this BookInfo) {
 		log.Println(err.Error())
 	}
 
-	draw.Draw(img,img.Bounds(),bg,image.ZP,draw.Src)
+	draw.Draw(img, img.Bounds(), bg, image.ZP, draw.Src)
 
 	f := freetype.NewContext()
 	f.SetDPI(72)
@@ -77,7 +74,6 @@ func GenerateCover(this BookInfo) {
 	ptAuthor := freetype.Pt(img.Bounds().Dx()-320, img.Bounds().Dy()-500) //字体出现的位置
 	f.DrawString(this.Author+" ©著", ptAuthor)                             //写入小说作者名
 
-
 	err = jpeg.Encode(imgfile, img, &jpeg.Options{Quality: 100})
 	if err != nil {
 		fmt.Println(err.Error())
@@ -125,7 +121,7 @@ func (this BookInfo) GetCover() error {
 	c, _ := chromedp.NewExecAllocator(context.Background(), options...)
 
 	// create context
-	chromeCtx, cancel := chromedp.NewContext(c, chromedp.WithLogf(log.Printf))
+	chromeCtx, cancel := chromedp.NewContext(c)
 	// 执行一个空task, 用提前创建Chrome实例
 	chromedp.Run(chromeCtx, make([]chromedp.Action, 0, 1)...)
 	timeoutCtx, cancel := context.WithTimeout(chromeCtx, 20*time.Second)

ebookCover.go

@@ -0,0 +1,11 @@
+package ebookdownloader
+
+import (
+	"embed"
+)
+
+//go:embed tpls
+var templateFS embed.FS
+
+//go:embed fonts
+var fontFS embed.FS

embed.go

@@ -1,14 +1,12 @@
 module github.com/sndnvaps/ebookdownloader
 
-go 1.13
+go 1.17
 
 require (
 	github.com/Aiicy/htmlquery v0.0.0-20191217151354-e656ce3100dc
 	github.com/Chain-Zhang/pinyin v0.1.3
 	github.com/andlabs/ui v0.0.0-20200610043537-70a69d6ae31e
-	github.com/antchfx/xpath v1.1.4 // indirect
 	github.com/asdine/storm/v3 v3.1.1
-	github.com/bmaupin/go-epub v0.10.0 // indirect
 	github.com/chromedp/cdproto v0.0.0-20201204063249-be40c824ad18
 	github.com/chromedp/chromedp v0.5.4
 	github.com/goki/freetype v0.0.0-20181231101311-fa8a33aabaff
@@ -19,6 +17,25 @@ require (
 	github.com/stretchr/testify v1.6.1
 	github.com/unknwon/com v1.0.1
 	go.etcd.io/bbolt v1.3.4
-	golang.org/x/image v0.0.0-20200119044424-58c23975cae1 // indirect
 	gopkg.in/urfave/cli.v1 v1.20.0
 )
+
+require (
+	github.com/antchfx/xpath v1.1.4 // indirect
+	github.com/bmaupin/go-epub v0.10.0 // indirect
+	github.com/chromedp/sysutil v1.0.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/gobwas/httphead v0.0.0-20200921212729-da3d93bc3c58 // indirect
+	github.com/gobwas/pool v0.2.1 // indirect
+	github.com/gobwas/ws v1.0.4 // indirect
+	github.com/gofrs/uuid v3.1.0+incompatible // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/mailru/easyjson v0.7.6 // indirect
+	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	golang.org/x/image v0.0.0-20200119044424-58c23975cae1 // indirect
+	golang.org/x/net v0.0.0-20210505024714-0287a6fb4125 // indirect
+	golang.org/x/sys v0.0.0-20210423082822-04245dca01da // indirect
+	golang.org/x/text v0.3.6 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
+)

fonts/bindata.go

@@ -10,24 +10,23 @@ import (
 
 	"github.com/Chain-Zhang/pinyin"
 	"github.com/unknwon/com"
-	"github.com/sndnvaps/ebookdownloader/tpls"
 )
 
-
-func bytes2string(in []byte) string {
+func bytes2string(in []byte, e error) string {
 	return string(in)
 }
+
 //GenerateMobi 生成mobi格式电子书
 func (this BookInfo) GenerateMobi() {
 	chapters := this.Chapters //章节信息
 	Volumes := this.Volumes   //分卷信息
-	//tpl_cover := bytes2string(tpls.MustAsset("./tpls/tpl_cover.html")
-	tplBookToc :=   bytes2string(tpls.MustAsset("tpls/tpl_book_toc.html"))
-	tplChapter :=  bytes2string(tpls.MustAsset("tpls/tpl_chapter.html"))
-	tplVolume := bytes2string(tpls.MustAsset("tpls/tpl_volume.html"))
-	tplContent := bytes2string(tpls.MustAsset("tpls/tpl_content.opf"))
-	tplStyle := bytes2string(tpls.MustAsset("tpls/tpl_style.css"))
-	tplToc := bytes2string(tpls.MustAsset("tpls/tpl_toc.ncx"))
+	//tpl_cover := bytes2string(templateFS.ReadFile("./tpls/tpl_cover.html")
+	tplBookToc := bytes2string(templateFS.ReadFile("tpls/tpl_book_toc.html"))
+	tplChapter := bytes2string(templateFS.ReadFile("tpls/tpl_chapter.html"))
+	tplVolume := bytes2string(templateFS.ReadFile("tpls/tpl_volume.html"))
+	tplContent := bytes2string(templateFS.ReadFile("tpls/tpl_content.opf"))
+	tplStyle := bytes2string(templateFS.ReadFile("tpls/tpl_style.css"))
+	tplToc := bytes2string(templateFS.ReadFile("tpls/tpl_toc.ncx"))
 	//将文件名转换成拼音
 	strPinyin, _ := pinyin.New(this.Name).Split("-").Mode(pinyin.WithoutTone).Convert()
 	savepath := "./tmp/" + strPinyin