From 9d1d3f0f179df0868222733b79e7df0749ec94a9 Mon Sep 17 00:00:00 2001 From: nite Date: Sun, 20 Apr 2025 02:13:59 +1000 Subject: [PATCH] fix font error --- a_test.go | 55 +++++++++++++++++++ cmd/download.go | 6 +- cmd/package.go | 4 +- downloader/{ => bilinovel}/bilinovel.go | 42 ++++++++++++-- {utils => downloader/bilinovel}/epub.go | 8 ++- .../bilinovel}/style.css.go | 11 +++- go.mod | 1 + go.sum | 2 + 8 files changed, 115 insertions(+), 14 deletions(-) create mode 100644 a_test.go rename downloader/{ => bilinovel}/bilinovel.go (94%) rename {utils => downloader/bilinovel}/epub.go (93%) rename {template => downloader/bilinovel}/style.css.go (80%) diff --git a/a_test.go b/a_test.go new file mode 100644 index 0000000..d9226e2 --- /dev/null +++ b/a_test.go @@ -0,0 +1,55 @@ +package main + +import ( + "bytes" + "fmt" + "io" + "testing" + + "golang.org/x/text/encoding/simplifiedchinese" + "golang.org/x/text/transform" +) + +// 尝试使用不同编码进行解码 +func tryDecodeWithEncoding(data []byte, decoder transform.Transformer) (string, error) { + reader := transform.NewReader(bytes.NewReader(data), decoder) + decoded, err := io.ReadAll(reader) + if err != nil { + return "", err + } + return string(decoded), nil +} + +// 检测可能的编码 +func detectEncoding(data []byte) { + // 尝试 GBK 解码 + if result, err := tryDecodeWithEncoding(data, simplifiedchinese.GBK.NewDecoder()); err == nil { + fmt.Printf("可能是 GBK 编码: %s\n", result) + } + + // 尝试 GB18030 解码 + if result, err := tryDecodeWithEncoding(data, simplifiedchinese.GB18030.NewDecoder()); err == nil { + fmt.Printf("可能是 GB18030 编码: %s\n", result) + } + + // 尝试 UTF-8 解码（直接输出） + fmt.Printf("原始 UTF-8 输出: %s\n", string(data)) +} + +func TestA(t *testing.T) { + chaos := "凳蹦戎昆储。" + body := []byte(chaos) + + fmt.Println("尝试检测编码...") + detectEncoding(body) + + // 使用 GBK 解码 + reader := transform.NewReader(bytes.NewReader(body), simplifiedchinese.GBK.NewDecoder()) + decoded, err := io.ReadAll(reader) + if err != nil { + fmt.Printf("解码失败: %v\n", err) + return + } + + fmt.Println("GBK 解码结果:", string(decoded)) +} diff --git a/cmd/download.go b/cmd/download.go index 9b26dd1..5848887 100644 --- a/cmd/download.go +++ b/cmd/download.go @@ -1,7 +1,7 @@ package cmd import ( - "bilinovel-downloader/downloader" + "bilinovel-downloader/downloader/bilinovel" "fmt" "github.com/spf13/cobra" @@ -60,7 +60,7 @@ func runDownloadNovel(cmd *cobra.Command, args []string) error { if novelArgs.NovelId == 0 { return fmt.Errorf("novel id is required") } - err := downloader.DownloadNovel(novelArgs.NovelId, novelArgs.outputPath) + err := bilinovel.DownloadNovel(novelArgs.NovelId, novelArgs.outputPath) if err != nil { return fmt.Errorf("failed to download novel: %v", err) } @@ -75,7 +75,7 @@ func runDownloadVolume(cmd *cobra.Command, args []string) error { if volumeArgs.VolumeId == 0 { return fmt.Errorf("volume id is required") } - err := downloader.DownloadVolume(volumeArgs.NovelId, volumeArgs.VolumeId, volumeArgs.outputPath) + err := bilinovel.DownloadVolume(volumeArgs.NovelId, volumeArgs.VolumeId, volumeArgs.outputPath) if err != nil { return fmt.Errorf("failed to download volume: %v", err) } diff --git a/cmd/package.go b/cmd/package.go index c57a800..c28d945 100644 --- a/cmd/package.go +++ b/cmd/package.go @@ -1,7 +1,7 @@ package cmd import ( - "bilinovel-downloader/utils" + "bilinovel-downloader/downloader/bilinovel" "fmt" "github.com/spf13/cobra" @@ -28,7 +28,7 @@ func init() { } func runPackage(cmd *cobra.Command, args []string) error { - err := utils.CreateEpub(pArgs.DirPath) + err := bilinovel.CreateEpub(pArgs.DirPath) if err != nil { return fmt.Errorf("failed to create epub: %v", err) } diff --git a/downloader/bilinovel.go b/downloader/bilinovel/bilinovel.go similarity index 94% rename from downloader/bilinovel.go rename to downloader/bilinovel/bilinovel.go index 36e0a7c..6139641 100644 --- a/downloader/bilinovel.go +++ b/downloader/bilinovel/bilinovel.go @@ -1,4 +1,4 @@ -package downloader +package bilinovel import ( "bilinovel-downloader/model" @@ -286,6 +286,11 @@ func downloadVolume(volume *model.Volume, outputPath string) error { return fmt.Errorf("failed to render cover: %v", err) } + err = DownloadFont(filepath.Join(outputPath, "OEBPS/Fonts")) + if err != nil { + return fmt.Errorf("failed to download font: %v", err) + } + contentsXHTMLPath := filepath.Join(outputPath, "OEBPS/Text/contents.xhtml") err = os.MkdirAll(path.Dir(contentsXHTMLPath), 0755) if err != nil { @@ -331,7 +336,7 @@ func downloadVolume(volume *model.Volume, outputPath string) error { return fmt.Errorf("failed to create toc ncx: %v", err) } - err = utils.CreateEpub(outputPath) + err = CreateEpub(outputPath) if err != nil { return fmt.Errorf("failed to create epub: %v", err) } @@ -407,6 +412,7 @@ func downloadChapterByPage(page, chapterIdx int, chapter *model.Chapter, outputP content.Find(".cgo").Remove() content.Find("center").Remove() content.Find(".google-auto-placed").Remove() + content.Find("p").Last().AddClass("read-font") content.Find("img").Each(func(i int, s *goquery.Selection) { if err != nil { @@ -549,21 +555,26 @@ func CreateContentOPF(dirPath string, uuid string, volume *model.Volume) error { Media: "application/x-dtbncx+xml", }) manifest.Items = append(manifest.Items, model.ManifestItem{ - ID: "cover", + ID: "cover.xhtml", Link: "Text/cover.xhtml", Media: "application/xhtml+xml", }) manifest.Items = append(manifest.Items, model.ManifestItem{ - ID: "contents", + ID: "contents.xhtml", Link: "Text/contents.xhtml", Media: "application/xhtml+xml", Properties: "nav", }) manifest.Items = append(manifest.Items, model.ManifestItem{ - ID: "images-cover", + ID: "images-cover" + path.Ext(volume.Cover), Link: fmt.Sprintf("Images/cover%s", path.Ext(volume.Cover)), Media: fmt.Sprintf("image/%s", strings.ReplaceAll(strings.TrimPrefix(path.Ext(volume.Cover), "."), "jpg", "jpeg")), }) + manifest.Items = append(manifest.Items, model.ManifestItem{ + ID: "read.woff2", + Link: "Fonts/read.woff2", + Media: "font/woff2", + }) for _, chapter := range volume.Chapters { manifest.Items = append(manifest.Items, model.ManifestItem{ ID: path.Base(chapter.TextOEBPSPath), @@ -655,3 +666,24 @@ func CreateTocNCX(dirPath string, uuid string, volume *model.Volume) error { } return nil } + +func DownloadFont(outputPath string) error { + log.Printf("Downloading Font: read.woff2") + + fontPath := filepath.Join(outputPath, "read.woff2") + err := os.MkdirAll(path.Dir(fontPath), 0755) + if err != nil { + return fmt.Errorf("failed to create font directory: %v", err) + } + + resp, err := utils.Request().Get("https://www.bilinovel.com/public/font/read.woff2") + if err != nil { + return fmt.Errorf("failed to download font: %v", err) + } + err = os.WriteFile(fontPath, resp.Body(), 0644) + if err != nil { + return fmt.Errorf("failed to write font: %v", err) + } + + return nil +} diff --git a/utils/epub.go b/downloader/bilinovel/epub.go similarity index 93% rename from utils/epub.go rename to downloader/bilinovel/epub.go index 8f480b1..436d21c 100644 --- a/utils/epub.go +++ b/downloader/bilinovel/epub.go @@ -1,14 +1,16 @@ -package utils +package bilinovel import ( "archive/zip" - "bilinovel-downloader/template" "io" + "log" "os" "path/filepath" ) func CreateEpub(path string) error { + log.Printf("Creating epub for %s", path) + savePath := path + ".epub" zipFile, err := os.Create(savePath) if err != nil { @@ -29,7 +31,7 @@ func CreateEpub(path string) error { return err } - err = addStringToZip(zipWriter, "OEBPS/Styles/style.css", template.StyleCSS, zip.Deflate) + err = addStringToZip(zipWriter, "OEBPS/Styles/style.css", StyleCSS, zip.Deflate) if err != nil { return err } diff --git a/template/style.css.go b/downloader/bilinovel/style.css.go similarity index 80% rename from template/style.css.go rename to downloader/bilinovel/style.css.go index e2c5cbf..69bf041 100644 --- a/template/style.css.go +++ b/downloader/bilinovel/style.css.go @@ -1,6 +1,15 @@ -package template +package bilinovel const StyleCSS = ` +@font-face{ + font-family: "read"; + src: url(../Fonts/read.woff2); +} + +.read-font{ + font-family: "read" !important; +} + body > div { margin: 0 auto; padding: 20px; diff --git a/go.mod b/go.mod index 837436b..86e9a21 100644 --- a/go.mod +++ b/go.mod @@ -8,6 +8,7 @@ require ( github.com/go-resty/resty/v2 v2.16.5 github.com/google/uuid v1.6.0 github.com/spf13/cobra v1.9.1 + golang.org/x/text v0.24.0 ) require ( diff --git a/go.sum b/go.sum index 84b1afa..22370b9 100644 --- a/go.sum +++ b/go.sum @@ -77,6 +77,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0= +golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU= golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=