rename preset directory to pdfpresets

missdeer · Nov 23, 2023 · 7ef9843 · 7ef9843
1 parent 4c9838d
commit 7ef9843
Show file tree

Hide file tree

Showing 37 changed files with 35 additions and 36 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -19,23 +19,23 @@ jobs:
         env GOOS=darwin GOARCH=arm64 go build -o getnovel-arm64 -ldflags="-s -w" .
         mkdir darwin-universal
         lipo -create -output darwin-universal/getnovel getnovel-amd64 getnovel-arm64
-        cp -r preset darwin-universal/
+        cp -r pdfpresets darwin-universal/
         env GOOS=linux GOARCH=amd64 go build -o linux-amd64/getnovel -ldflags="-s -w" .
-        cp -r preset linux-amd64/
+        cp -r pdfpresets linux-amd64/
         env GOOS=linux GOARCH=arm go build -o linux-arm/getnovel -ldflags="-s -w" .
-        cp -r preset linux-arm/
+        cp -r pdfpresets linux-arm/
         env GOOS=linux GOARCH=arm64 go build -o linux-arm64/getnovel -ldflags="-s -w" .
-        cp -r preset linux-arm64/
+        cp -r pdfpresets linux-arm64/
         env GOOS=windows GOARCH=amd64 go build -o windows-amd64/getnovel.exe -ldflags="-s -w" .
-        cp -r preset windows-amd64/
+        cp -r pdfpresets windows-amd64/
         env GOOS=freebsd GOARCH=amd64 go build -o freebsd-amd64/getnovel -ldflags="-s -w" .
-        cp -r preset freebsd-amd64/
+        cp -r pdfpresets freebsd-amd64/
         env GOOS=openbsd GOARCH=amd64 go build -o openbsd-amd64/getnovel -ldflags="-s -w" .
-        cp -r preset openbsd-amd64/
+        cp -r pdfpresets openbsd-amd64/
         env GOOS=netbsd GOARCH=amd64 go build -o netbsd-amd64/getnovel -ldflags="-s -w" .
-        cp -r preset netbsd-amd64/
+        cp -r pdfpresets netbsd-amd64/
         env GOOS=dragonfly GOARCH=amd64 go build -o dragonfly-amd64/getnovel -ldflags="-s -w" .
-        cp -r preset dragonfly-amd64/
+        cp -r pdfpresets dragonfly-amd64/
       
     - name: Upload artifact getnovel-darwin-universal
       uses: actions/[email protected]

diff --git a/appveyor.yml b/appveyor.yml
@@ -149,7 +149,7 @@ build_script:
 # scripts that run after build
 after_build:
     - mkdir -p "$APPVEYOR_BUILD_FOLDER/distrib/getnovel-$PREFIX"
-    - cp -r "$APPVEYOR_BUILD_FOLDER/preset" "$APPVEYOR_BUILD_FOLDER/distrib/getnovel-$PREFIX/"
+    - cp -r "$APPVEYOR_BUILD_FOLDER/pdfpresets" "$APPVEYOR_BUILD_FOLDER/distrib/getnovel-$PREFIX/"
     - cp "$APPVEYOR_BUILD_FOLDER/getnovel-$PREFIX$SUFFIX" "$APPVEYOR_BUILD_FOLDER/distrib/getnovel-$PREFIX/getnovel$SUFFIX"
     - cd $APPVEYOR_BUILD_FOLDER/distrib
     - zip -r -9 "getnovel-$PREFIX.zip" "getnovel-$PREFIX"

diff --git a/config.go b/config.go
@@ -3,7 +3,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"os"
@@ -27,7 +27,7 @@ func readLocalBookSource() {
 			continue
 		}
 
-		c, err := ioutil.ReadAll(fd)
+		c, err := io.ReadAll(fd)
 		if err != nil {
 			log.Println("reading book source file ", configFile, " failed ", err)
 			continue
@@ -72,7 +72,7 @@ func parseConfigurations(content []byte, opts *Options) bool {
 }
 
 func readRemotePreset(opts *Options) bool {
-	u := "https://raw.githubusercontent.com/missdeer/getnovel/master/preset/" + opts.ConfigFile
+	u := "https://raw.githubusercontent.com/missdeer/getnovel/master/pdfpresets/" + opts.ConfigFile
 	client := &http.Client{}
 	req, err := http.NewRequest("GET", u, nil)
 	if err != nil {
@@ -91,7 +91,7 @@ func readRemotePreset(opts *Options) bool {
 		return false
 	}
 
-	c, err := ioutil.ReadAll(resp.Body)
+	c, err := io.ReadAll(resp.Body)
 	if err != nil {
 		log.Println("reading content failed")
 		return false
@@ -103,7 +103,7 @@ func readRemotePreset(opts *Options) bool {
 func readLocalConfigFile(opts *Options) bool {
 	configFile := opts.ConfigFile
 	if b, e := fsutil.FileExists(configFile); e != nil || !b {
-		configFile = filepath.Join("preset", opts.ConfigFile)
+		configFile = filepath.Join("pdfpresets", opts.ConfigFile)
 		if b, e = fsutil.FileExists(configFile); e != nil || !b {
 			log.Println("cannot find configuration file", opts.ConfigFile, "on local file system")
 			return false
@@ -116,7 +116,7 @@ func readLocalConfigFile(opts *Options) bool {
 		return false
 	}
 
-	contentC, err := ioutil.ReadAll(contentFd)
+	contentC, err := io.ReadAll(contentFd)
 	contentFd.Close()
 	if err != nil {
 		log.Println("reading config file", configFile, "failed", err)

diff --git a/dlutil.go b/dlutil.go
@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"log"
 	"math"
@@ -164,7 +165,7 @@ func (du *DownloadUtil) BufferHandler(cu ContentUtil) (exit bool) {
 				continue
 			}
 
-			contentC, err := ioutil.ReadAll(contentFd)
+			contentC, err := io.ReadAll(contentFd)
 			contentFd.Close()
 			if err != nil {
 				log.Println("reading file ", du.Buffer[0].Content, " failed ", err)

diff --git a/ebook/bs/bs2.go b/ebook/bs/bs2.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"net/url"
 	"strings"
@@ -73,16 +72,16 @@ func (bs *BookSourceV2) SearchBook(title string) []*Book {
 		charEncoding = strings.ToLower(charEncoding)
 		switch charEncoding {
 		case "gbk":
-			data, _ := ioutil.ReadAll(transform.NewReader(bytes.NewReader([]byte(title)), simplifiedchinese.GBK.NewEncoder()))
+			data, _ := io.ReadAll(transform.NewReader(bytes.NewReader([]byte(title)), simplifiedchinese.GBK.NewEncoder()))
 			title = string(data)
 		case "gb2312":
-			data, _ := ioutil.ReadAll(transform.NewReader(bytes.NewReader([]byte(title)), simplifiedchinese.HZGB2312.NewEncoder()))
+			data, _ := io.ReadAll(transform.NewReader(bytes.NewReader([]byte(title)), simplifiedchinese.HZGB2312.NewEncoder()))
 			title = string(data)
 		case "gb18030":
-			data, _ := ioutil.ReadAll(transform.NewReader(bytes.NewReader([]byte(title)), simplifiedchinese.GB18030.NewEncoder()))
+			data, _ := io.ReadAll(transform.NewReader(bytes.NewReader([]byte(title)), simplifiedchinese.GB18030.NewEncoder()))
 			title = string(data)
 		case "big5", "big-5":
-			data, _ := ioutil.ReadAll(transform.NewReader(bytes.NewReader([]byte(title)), traditionalchinese.Big5.NewEncoder()))
+			data, _ := io.ReadAll(transform.NewReader(bytes.NewReader([]byte(title)), traditionalchinese.Big5.NewEncoder()))
 			title = string(data)
 		}
 	}

diff --git a/ebook/kindlegenmobi.go b/ebook/kindlegenmobi.go
@@ -5,7 +5,6 @@ package ebook
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -398,7 +397,7 @@ func (m *kindlegenMobiBook) writeContentHTML() {
 		log.Println("opening file toc.tmp for reading failed ", err)
 		return
 	}
-	tocC, err := ioutil.ReadAll(tocTmp)
+	tocC, err := io.ReadAll(tocTmp)
 	tocTmp.Close()
 	if err != nil {
 		log.Println("reading file toc.tmp failed ", err)
@@ -410,7 +409,7 @@ func (m *kindlegenMobiBook) writeContentHTML() {
 		log.Println("opening file content.tmp for reading failed ", err)
 		return
 	}
-	contentC, err := ioutil.ReadAll(contentTmp)
+	contentC, err := io.ReadAll(contentTmp)
 	contentTmp.Close()
 	if err != nil {
 		log.Println("reading file content.tmp failed ", err)
@@ -453,7 +452,7 @@ func (m *kindlegenMobiBook) writeTocNCX() {
 		log.Println("opening file nav.tmp for reading failed ", err)
 		return
 	}
-	navC, err := ioutil.ReadAll(navTmp)
+	navC, err := io.ReadAll(navTmp)
 	if err != nil {
 		log.Println("reading file nav.tmp failed ", err)
 		return

diff --git a/ebook/pdf.go b/ebook/pdf.go
@@ -2,7 +2,7 @@ package ebook
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 	"strconv"
@@ -78,7 +78,7 @@ func (m *pdfBook) SetFontFile(file string) {
 		return
 	}
 
-	fontContent, err := ioutil.ReadAll(fontFd)
+	fontContent, err := io.ReadAll(fontFd)
 	fontFd.Close()
 	if err != nil {
 		log.Fatalln("can't read font file", err)

diff --git a/main.go b/main.go
@@ -20,7 +20,7 @@ import (
 type Options struct {
 	InsecureSkipVerify bool    `long:"insecureSkipVerify" description:"if true, TLS accepts any certificate"`
 	ListenAndServe     string  `long:"listenAndServe" description:"set http listen and serve address, example: :8080"`
-	Format             string  `short:"f" long:"format" description:"set generated file format, candidate values: mobi, epub, pdf"`
+	Format             string  `short:"f" long:"format" description:"set generated file format, candidate values: mobi, epub, pdf, html, txt"`
 	List               bool    `short:"l" long:"list" description:"list supported novel websites"`
 	LeftMargin         float64 `long:"leftMargin" description:"set left margin for PDF format"`
 	TopMargin          float64 `long:"topMargin" description:"set top margin for PDF format"`

diff --git a/preset/10inch → pdfpresets/10inch b/preset/10inch → pdfpresets/10inch
diff --git a/preset/6inch → pdfpresets/6inch b/preset/6inch → pdfpresets/6inch
diff --git a/preset/7inch → pdfpresets/7inch b/preset/7inch → pdfpresets/7inch
diff --git a/preset/a0 → pdfpresets/a0 b/preset/a0 → pdfpresets/a0
diff --git a/preset/a1 → pdfpresets/a1 b/preset/a1 → pdfpresets/a1
diff --git a/preset/a2 → pdfpresets/a2 b/preset/a2 → pdfpresets/a2
diff --git a/preset/a3 → pdfpresets/a3 b/preset/a3 → pdfpresets/a3
diff --git a/preset/a4 → pdfpresets/a4 b/preset/a4 → pdfpresets/a4
diff --git a/preset/a5 → pdfpresets/a5 b/preset/a5 → pdfpresets/a5
diff --git a/preset/a6 → pdfpresets/a6 b/preset/a6 → pdfpresets/a6
diff --git a/preset/b0 → pdfpresets/b0 b/preset/b0 → pdfpresets/b0
diff --git a/preset/b1 → pdfpresets/b1 b/preset/b1 → pdfpresets/b1
diff --git a/preset/b2 → pdfpresets/b2 b/preset/b2 → pdfpresets/b2
diff --git a/preset/b3 → pdfpresets/b3 b/preset/b3 → pdfpresets/b3
diff --git a/preset/b4 → pdfpresets/b4 b/preset/b4 → pdfpresets/b4
diff --git a/preset/b5 → pdfpresets/b5 b/preset/b5 → pdfpresets/b5
diff --git a/preset/b6 → pdfpresets/b6 b/preset/b6 → pdfpresets/b6
diff --git a/preset/c0 → pdfpresets/c0 b/preset/c0 → pdfpresets/c0
diff --git a/preset/c1 → pdfpresets/c1 b/preset/c1 → pdfpresets/c1
diff --git a/preset/c2 → pdfpresets/c2 b/preset/c2 → pdfpresets/c2
diff --git a/preset/c3 → pdfpresets/c3 b/preset/c3 → pdfpresets/c3
diff --git a/preset/c4 → pdfpresets/c4 b/preset/c4 → pdfpresets/c4
diff --git a/preset/c5 → pdfpresets/c5 b/preset/c5 → pdfpresets/c5
diff --git a/preset/c6 → pdfpresets/c6 b/preset/c6 → pdfpresets/c6
diff --git a/preset/dxg → pdfpresets/dxg b/preset/dxg → pdfpresets/dxg
diff --git a/preset/kpw3 → pdfpresets/kpw3 b/preset/kpw3 → pdfpresets/kpw3
diff --git a/preset/mobile → pdfpresets/mobile b/preset/mobile → pdfpresets/mobile
diff --git a/preset/pc → pdfpresets/pc b/preset/pc → pdfpresets/pc
diff --git a/preset/pixel2xl → pdfpresets/pixel2xl b/preset/pixel2xl → pdfpresets/pixel2xl
@@ -1,8 +1,8 @@
-{
-    "format": "pdf",
-    "pageType": "pixel2xl",
-    "titleFontSize": 12,
-    "contentFontSize": 10,
-    "pageWidth": 217.4,
-    "pageHeight": 447.6
+{
+    "format": "pdf",
+    "pageType": "pixel2xl",
+    "titleFontSize": 12,
+    "contentFontSize": 10,
+    "pageWidth": 217.4,
+    "pageHeight": 447.6
 }