Merge pull request #17 from lethal-bacon0/dev2

Dev2

Author: w4rryn

pkg/terminal/scrape.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/lethal-bacon0/WebnovelYoinker/pkg/yoinker"
 	"github.com/lethal-bacon0/WebnovelYoinker/pkg/yoinker/book"
-	"github.com/lethal-bacon0/WebnovelYoinker/pkg/yoinker/events"
 	"github.com/lethal-bacon0/WebnovelYoinker/pkg/yoinker/export"
 	"github.com/lethal-bacon0/WebnovelYoinker/pkg/yoinker/scrape"
 	"github.com/schollz/progressbar/v3"
@@ -35,7 +34,6 @@ var scrapeFlags = []cli.Flag{
 }
 
 func scrapeCommand(c *cli.Context) error {
-	events.OnErrorEvent.Add(logErr)
 	fmt.Println("Starting conversion.")
 	fmt.Println("Status:")
 	jobs := getBookConfigs(c.String("in"))

pkg/terminal/yoinkerTerminal.go

@@ -1,12 +1,10 @@
 package terminal
 
 import (
-	"fmt"
 	"io/ioutil"
 	"log"
 	"os"
 
-	"github.com/lethal-bacon0/WebnovelYoinker/pkg/yoinker"
 	"github.com/lethal-bacon0/WebnovelYoinker/pkg/yoinker/book"
 	"github.com/urfave/cli/v2"
 	"gopkg.in/yaml.v2"
@@ -38,12 +36,6 @@ func StartTerminal() {
 	}
 }
 
-func logErr(y *yoinker.CtxYoink) {
-	if y.Error != nil {
-		fmt.Println(y.Error.Error())
-	}
-}
-
 func getBookConfigs(path string) []book.Metadata {
 	books := []book.Metadata{}
 	rawBooks, err := ioutil.ReadFile(path)

pkg/yoinker/ctxYoink.go

@@ -4,83 +4,100 @@ import (
 	"fmt"
 	"html"
 	"log"
+	"os"
 	"path/filepath"
 	"strings"
 	"sync"
 
 	"github.com/bmaupin/go-epub"
 	"github.com/lethal-bacon0/WebnovelYoinker/pkg/yoinker"
 	"github.com/lethal-bacon0/WebnovelYoinker/pkg/yoinker/book"
-	"github.com/lethal-bacon0/WebnovelYoinker/pkg/yoinker/events"
 )
 
+var extensionMediaTypes = map[string]string{
+	".css":   "text/css",
+	".gif":   "image/gif",
+	".jpeg":  "image/jpeg",
+	".jpg":   "image/jpeg",
+	".otf":   "application/vnd.ms-opentype",
+	".png":   "image/png",
+	".svg":   "image/svg+xml",
+	".ttf":   "application/font-sfnt",
+	".woff":  "application/font-woff",
+	".woff2": "font/woff2",
+}
+
 //epubExporter exports a volume a epub
 type epubExporter struct {
 	epubExport *epub.Epub
+	fileDump   *os.File
 }
 
 //Export exports a valume as epub
-func (e *epubExporter) Export(metadata book.Metadata, path string, chapterChannel <-chan book.Chapter) string {
-	go func() {
-		events.OnExportStartEvent.Invoke(&yoinker.CtxYoink{
-			Volume: book.Volume{
-				Metadata: metadata,
-			},
-		})
-	}()
+func (e *epubExporter) Export(metadata book.Metadata, path string, chapters []book.Chapter) string {
+	var (
+		coverImage string
+		waiter     sync.WaitGroup
+		exportPath = filepath.Join(path, metadata.Title+".epub")
+		err        error
+		cssPath    string
+	)
+	// e.fileDump, err = os.Create(filepath.Join(path, fmt.Sprintf("volume_dump_%v_.txt", metadata.Title)))
+	// if err != nil {
+	// 	log.Println(err)
+	// }
+	// defer e.fileDump.Close()
+
 	e.epubExport = epub.NewEpub(metadata.Title)
-	cssPath, err := e.epubExport.AddCSS("https://raw.githubusercontent.com/lethal-bacon0/WebnovelYoinker/master/assets/ebookstyle.css", "stylesheet.css")
+	cssPath, err = e.epubExport.AddCSS("https://raw.githubusercontent.com/lethal-bacon0/WebnovelYoinker/master/assets/ebookstyle.css", "stylesheet.css")
 	if err != nil {
-		// invokeError(err)
+		log.Println(err)
 	}
-	var coverImage string
-	var waiter sync.WaitGroup
+	waiter.Add(1)
 	go func() {
-		waiter.Add(1)
-		var err error
 		coverImage, err = e.epubExport.AddImage(metadata.Cover, "")
 		if err != nil {
-			// invokeError(err)
+			coverImage = ""
+		} else {
+			e.epubExport.SetCover(coverImage, "")
 		}
+		e.epubExport.SetAuthor(metadata.Author)
+		e.epubExport.SetLang(metadata.Language)
 		waiter.Done()
 	}()
-
-	i := 0
-	for chapter := range chapterChannel {
-		i++
+	for i, chapter := range chapters {
 		if chapter.ChapterName == "" {
-			chapter.ChapterName = fmt.Sprintf("Chapter %v", i)
+			chapter.ChapterName = fmt.Sprintf("Chapter %v", i+1)
 		}
 		e.epubExport.AddSection(e.addChapter(chapter), chapter.ChapterName, "", cssPath)
 	}
-
 	waiter.Wait()
-	e.epubExport.SetCover(coverImage, "")
-	e.epubExport.SetAuthor(metadata.Author)
-	e.epubExport.SetLang(metadata.Language)
-	exportPath := filepath.Join(path, metadata.Title+".epub")
+	defer func() {
+		if r := recover(); r != nil {
+			log.Printf("Panic while exporting %v: %v\n", metadata.Title, r)
+		}
+	}()
+	err = e.epubExport.Write(exportPath)
 	if err != nil {
-		log.Fatal(err)
+		fmt.Println(err)
 	}
-	err = e.epubExport.Write(exportPath)
-	events.OnExportFinishedEvent.Invoke(&yoinker.CtxYoink{
-		Volume: book.Volume{
-			Metadata: metadata,
-		},
-	})
+
 	return exportPath
 }
 
 func (e *epubExporter) addChapter(chapter book.Chapter) string {
-	var parsedContent strings.Builder
+	var (
+		parsedContent strings.Builder
+	)
+
 	parsedContent.WriteString(fmt.Sprintf("<p><strong> %v </strong></p>", chapter.ChapterName))
 	for _, page := range chapter.Content {
 		switch page.(type) {
 		case *book.PageImage:
 			pageImage := page.(*book.PageImage)
 			imagePath, err := e.epubExport.AddImage(pageImage.Image, "")
 			if err != nil {
-				// e.makeCallback(err.Error())
+				continue
 			}
 			content := fmt.Sprintf("<div class=\"width\">"+
 				"<div class=\"pc\">"+
@@ -94,6 +111,7 @@ func (e *epubExporter) addChapter(chapter book.Chapter) string {
 
 		case *book.Paragraph:
 			par := page.(*book.Paragraph)
+			// e.fileDump.WriteString(fmt.Sprintf("%v\n", par.Content))
 			content := fmt.Sprintf("<p>%v</p>", html.EscapeString(par.Content))
 			parsedContent.WriteString(content)
 		}