Merge pull request #30 from przemekd/fix/sanitaze-file-names

Fix/sanitaze file names

.gitignore

@@ -1,2 +1,3 @@
 dist/
 .idea/
+.vscode/

epubgen/epub.go

@@ -10,6 +10,7 @@ import (
 	"github.com/PuerkitoBio/goquery"
 	"github.com/bmaupin/go-epub"
 	"github.com/go-shiori/go-readability"
+	"github.com/gosimple/slug"
 	"github.com/nikhil1raghav/kindle-send/config"
 	"github.com/nikhil1raghav/kindle-send/util"
 )
@@ -31,7 +32,7 @@ func fetchReadable(url string) (readability.Article, error) {
 	return readability.FromURL(url, 30*time.Second)
 }
 
-//Point remote image link to downloaded image
+// Point remote image link to downloaded image
 func (e *epubmaker) changeRefs(i int, img *goquery.Selection) {
 	img.RemoveAttr("loading")
 	img.RemoveAttr("srcset")
@@ -44,7 +45,7 @@ func (e *epubmaker) changeRefs(i int, img *goquery.Selection) {
 	}
 }
 
-//Download images and add to epub zip
+// Download images and add to epub zip
 func (e *epubmaker) downloadImages(i int, img *goquery.Selection) {
 	util.CyanBold.Println("Downloading Images")
 	imgSrc, exists := img.Attr("src")
@@ -58,7 +59,7 @@ func (e *epubmaker) downloadImages(i int, img *goquery.Selection) {
 
 		//pass unique and safe image names here, then it will not crash on windows
 		//use murmur hash to generate file name
-		imageFileName:=util.GetHash(imgSrc)
+		imageFileName := util.GetHash(imgSrc)
 
 		imgRef, err := e.Epub.AddImage(imgSrc, imageFileName)
 		if err != nil {
@@ -71,7 +72,7 @@ func (e *epubmaker) downloadImages(i int, img *goquery.Selection) {
 	}
 }
 
-//Fetches images in article and then embeds them into epub
+// Fetches images in article and then embeds them into epub
 func (e *epubmaker) embedImages(wg *sync.WaitGroup, article *readability.Article) {
 	util.Cyan.Println("Embedding images in ", article.Title)
 	defer wg.Done()
@@ -93,12 +94,12 @@ func (e *epubmaker) embedImages(wg *sync.WaitGroup, article *readability.Article
 	}
 }
 
-//TODO: Look for better formatting, this is bare bones
+// TODO: Look for better formatting, this is bare bones
 func prepare(article *readability.Article) string {
 	return "<h1>" + article.Title + "</h1>" + article.Content
 }
 
-//Add articles to epub
+// Add articles to epub
 func (e *epubmaker) addContent(articles *[]readability.Article) error {
 	added := 0
 	for _, article := range *articles {
@@ -116,7 +117,7 @@ func (e *epubmaker) addContent(articles *[]readability.Article) error {
 	return nil
 }
 
-//Generates a single epub from a slice of urls, returns file path
+// Generates a single epub from a slice of urls, returns file path
 func Make(pageUrls []string, title string) (string, error) {
 	//TODO: Parallelize fetching pages
 
@@ -169,11 +170,17 @@ func Make(pageUrls []string, title string) (string, error) {
 		storeDir = config.GetInstance().StorePath
 	}
 
-
-	filename := path.Join(storeDir, title+".epub")
-	err = book.Epub.Write(filename)
+	titleSlug := slug.Make(title)
+	var filename string
+	if len(titleSlug) == 0 {
+		filename = "kindle-send-doc-" + util.GetHash(readableArticles[0].Content) + ".epub"
+	} else {
+		filename = titleSlug + ".epub"
+	}
+	filepath := path.Join(storeDir, filename)
+	err = book.Epub.Write(filepath)
 	if err != nil {
 		return "", err
 	}
-	return filename, nil
+	return filepath, nil
 }

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/bmaupin/go-epub v1.0.1
 	github.com/fatih/color v1.13.0
 	github.com/go-shiori/go-readability v0.0.0-20220215145315-dd6828d2f09b
+	github.com/gosimple/slug v1.13.1
 	github.com/lithammer/dedent v1.1.0
 	github.com/spf13/cobra v1.0.0
 	gopkg.in/mail.v2 v2.3.1
@@ -18,6 +19,7 @@ require (
 	github.com/go-shiori/dom v0.0.0-20210627111528-4e4722cd0d65 // indirect
 	github.com/gofrs/uuid v3.1.0+incompatible // indirect
 	github.com/gogs/chardet v0.0.0-20191104214054-4b6791f73a28 // indirect
+	github.com/gosimple/unidecode v1.0.1 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/mattn/go-colorable v0.1.9 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect