fix generate content html

missdeer · Jan 25, 2024 · 2bab984 · 2bab984
1 parent afa22a3
commit 2bab984
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/dlutil.go b/dlutil.go
@@ -126,7 +126,7 @@ func (du *DownloadUtil) AddURL(index int, title string, link string) (reachEnd b
 		theURL, _ := url.Parse(link)
 		headers := http.Header{
 			"Referer":                   []string{fmt.Sprintf("%s://%s", theURL.Scheme, theURL.Host)},
-			"User-Agent":                []string{"Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Firefox/45.0"},
+			"User-Agent":                []string{"Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:121.0) Gecko/20100101 Firefox/121.0"},
 			"Accept":                    []string{"text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8"},
 			"Accept-Language":           []string{`en-US,en;q=0.8`},
 			"Upgrade-Insecure-Requests": []string{"1"},

diff --git a/ebook/html.go b/ebook/html.go
@@ -227,8 +227,8 @@ func (m *singleHTMLBook) writeContentHTML() {
 		return
 	}
 
-	contentHTML.WriteString(fmt.Sprintf(contentHTMLTemplate, m.bodyFontFamily, m.bodyFontSize, m.h1FontFamily, m.h1FontSize,
-		m.h2FontFamily, m.h2FontSize, m.paraFontFamily, m.paraFontSize, m.paraLineHeight, m.title, m.title, time.Now().String(),
+	contentHTML.WriteString(fmt.Sprintf(contentHTMLTemplate, m.title, m.bodyFontFamily, m.bodyFontSize, m.h1FontFamily, m.h1FontSize,
+		m.h2FontFamily, m.h2FontSize, m.paraFontFamily, m.paraFontSize, m.paraLineHeight, m.title, time.Now().String(),
 		string(tocC), string(contentC)))
 	contentHTML.Close()
 }
diff --git a/ebook/kindlegenmobi.go b/ebook/kindlegenmobi.go
@@ -10,7 +10,6 @@ import (
 	"os/exec"
 	"path/filepath"
 	"runtime"
-	"strings"
 	"time"
 	"unicode/utf8"
 
@@ -251,11 +250,6 @@ func (m *kindlegenMobiBook) SetLineSpacing(float64) {
 
 // Begin prepare book environment
 func (m *kindlegenMobiBook) Begin() {
-	if b, e := fsutil.FileExists(m.fontFilePath); e != nil || !b {
-		contentHTMLTemplate = strings.Replace(contentHTMLTemplate, `@font-face{	font-family: "CustomFont";	src: url(fonts/CustomFont.ttf);	}";`, "", -1)
-		contentHTMLTemplate = strings.Replace(contentHTMLTemplate, `font-family: "CustomFont";`, "", -1)
-		return
-	}
 }
 
 // End generate files that kindlegen needs
@@ -462,9 +456,9 @@ func (m *kindlegenMobiBook) writeContentHTML() {
 		return
 	}
 
-	contentHTML.WriteString(fmt.Sprintf(contentHTMLTemplate, m.bodyFontFamily, m.bodyFontSize, m.h1FontFamily, m.h1FontSize,
+	contentHTML.WriteString(fmt.Sprintf(contentHTMLTemplate, m.title, m.bodyFontFamily, m.bodyFontSize, m.h1FontFamily, m.h1FontSize,
 		m.h2FontFamily, m.h2FontSize, m.paraFontFamily, m.paraFontSize, m.paraLineHeight,
-		m.title, m.title, time.Now().String(),
+		m.title, time.Now().String(),
 		string(tocC), string(contentC)))
 	contentHTML.Close()
 }