diff --git a/book/chapter.go b/book/chapter.go
index 9c82b1b..1797dc5 100644
--- a/book/chapter.go
+++ b/book/chapter.go
@@ -1,6 +1,7 @@
package book
type chapter struct {
+ url string
body string
name string
author string
@@ -10,11 +11,11 @@ type chapter struct {
}
func NewEmptyChapter() chapter {
- return chapter{"", "", "", "", []chapter{}, NewScrapeConfigNoInclude()}
+ return chapter{"", "", "", "", "", []chapter{}, NewScrapeConfigNoInclude()}
}
-func NewChapter(body, name, author, content string, subChapters []chapter, config *ScrapeConfig) chapter {
- return chapter{body, name, author, content, subChapters, config}
+func (c chapter) URL() string {
+ return c.url
}
func (c chapter) Body() string {
diff --git a/book/format.go b/book/format.go
index c8f1312..7cb6dd7 100644
--- a/book/format.go
+++ b/book/format.go
@@ -30,6 +30,11 @@ func ToMarkdownString(c chapter) string {
markdown += fmt.Sprintf("%s\n", c.Name())
markdown += fmt.Sprintf("%s\n\n", strings.Repeat("=", len(c.Name())))
+ // url
+ if c.config.PrintURL {
+ markdown += fmt.Sprintf("_Source: %s_\n\n", c.URL())
+ }
+
// convert content to markdown
content, err := md.NewConverter("", true, nil).ConvertString(c.Content())
if err != nil {
@@ -72,7 +77,15 @@ func ToHtmlString(c chapter) string {
// chapter content
if c.config.Include {
- html += fmt.Sprintf("%s
", c.Name())
+ // title
+ html += fmt.Sprintf("%s
\n", c.Name())
+
+ // url
+ if c.config.PrintURL {
+ html += fmt.Sprintf("Source: %s
\n", c.URL())
+ }
+
+ // content
html += c.Content()
}
@@ -114,19 +127,6 @@ func ToEpub(c chapter, filename string) string {
e := epub.NewEpub(c.Name())
e.SetAuthor(c.Author())
- AppendToEpub(e, c)
-
- err := e.Write(filename)
- if err != nil {
- log.Fatal(err)
- }
-
- return filename
-}
-
-func AppendToEpub(e *epub.Epub, c chapter) {
- content := ""
-
// append table of content
if len(c.SubChapters()) > 1 {
html := "Table of Contents
"
@@ -143,6 +143,19 @@ func AppendToEpub(e *epub.Epub, c chapter) {
}
}
+ AppendToEpub(e, c)
+
+ err := e.Write(filename)
+ if err != nil {
+ log.Fatal(err)
+ }
+
+ return filename
+}
+
+func AppendToEpub(e *epub.Epub, c chapter) {
+ content := ""
+
// chapter content
if c.config.Include {
@@ -173,8 +186,15 @@ func AppendToEpub(e *epub.Epub, c chapter) {
html := ""
// add title only if ImagesOnly = false
if c.config.ImagesOnly == false {
- html += fmt.Sprintf("%s
", c.Name())
+ html += fmt.Sprintf("%s
\n", c.Name())
+ }
+
+ // url
+ if c.config.PrintURL {
+ html += fmt.Sprintf("Source: %s
\n", c.URL())
}
+
+ // content
html += content
// write to epub file
diff --git a/book/format_test.go b/book/format_test.go
index 7153b23..847f2f4 100644
--- a/book/format_test.go
+++ b/book/format_test.go
@@ -19,7 +19,7 @@ func TestFilename(t *testing.T) {
func TestToMarkdownString(t *testing.T) {
- c := NewChapterFromURL("https://example.com/", "", []*ScrapeConfig{NewScrapeConfig()}, 0, func(index int, name string) {})
+ c := NewChapterFromURL("https://example.com/", "", []*ScrapeConfig{NewScrapeConfigQuiet()}, 0, func(index int, name string) {})
got := ToMarkdownString(c)
want := "Example Domain\n==============\n\nThis domain is for use in illustrative examples in documents. You may use this\ndomain in literature without prior coordination or asking for permission.\n\n[More information...](https://www.iana.org/domains/example)\n\n\n"
@@ -30,9 +30,25 @@ func TestToMarkdownString(t *testing.T) {
}
+func TestToMarkdownPrintURL(t *testing.T) {
+
+ config := NewScrapeConfigQuiet()
+ config.PrintURL = true
+
+ c := NewChapterFromURL("https://example.com/", "", []*ScrapeConfig{config}, 0, func(index int, name string) {})
+
+ got := ToMarkdownString(c)
+ want := "Example Domain\n==============\n\n_Source: https://example.com/_\n\nThis domain is for use in illustrative examples in documents. You may use this\ndomain in literature without prior coordination or asking for permission.\n\n[More information...](https://www.iana.org/domains/example)\n\n\n"
+
+ if got != want {
+ t.Errorf("got %v, wanted %v", got, want)
+ }
+
+}
+
func TestToMarkdown(t *testing.T) {
- c := NewChapterFromURL("https://example.com/", "", []*ScrapeConfig{NewScrapeConfig()}, 0, func(index int, name string) {})
+ c := NewChapterFromURL("https://example.com/", "", []*ScrapeConfig{NewScrapeConfigQuiet()}, 0, func(index int, name string) {})
ToMarkdown(c, "")
filename := "Example_Domain.md"
@@ -49,7 +65,7 @@ func TestToMarkdown(t *testing.T) {
func TestToMarkdownFilename(t *testing.T) {
filename := "ebook.md"
- c := NewChapterFromURL("https://example.com/", "", []*ScrapeConfig{NewScrapeConfig()}, 0, func(index int, name string) {})
+ c := NewChapterFromURL("https://example.com/", "", []*ScrapeConfig{NewScrapeConfigQuiet()}, 0, func(index int, name string) {})
ToMarkdown(c, filename)
if _, err := os.Stat(filename); errors.Is(err, os.ErrNotExist) {
@@ -64,10 +80,26 @@ func TestToMarkdownFilename(t *testing.T) {
func TestToHtmlString(t *testing.T) {
- c := NewChapterFromURL("https://example.com/", "", []*ScrapeConfig{NewScrapeConfig()}, 0, func(index int, name string) {})
+ c := NewChapterFromURL("https://example.com/", "", []*ScrapeConfig{NewScrapeConfigQuiet()}, 0, func(index int, name string) {})
+
+ got := ToHtmlString(c)
+ want := "Example Domain
\n\n \n
This domain is for use in illustrative examples in documents. You may use this\n domain in literature without prior coordination or asking for permission.
\n
More information...
\n
Example Domain
\n \n
This domain is for use in illustrative examples in documents. You may use this\n domain in literature without prior coordination or asking for permission.
\n
More information...
\n
Example Domain
\nSource: https://example.com/
\n\n \n
This domain is for use in illustrative examples in documents. You may use this\n domain in literature without prior coordination or asking for permission.
\n
More information...
\n