mirror of
https://github.com/NohamR/papeer.git
synced 2026-05-25 12:27:20 +00:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4521497d12 | ||
|
|
2cbcf17cc2 |
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
@@ -15,7 +15,7 @@ jobs:
|
||||
goos: windows
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: wangyoucao577/go-release-action@v1.30
|
||||
- uses: wangyoucao577/go-release-action@v1.40
|
||||
with:
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
goos: ${{ matrix.goos }}
|
||||
|
||||
@@ -40,7 +40,9 @@ Download [latest release](https://github.com/lapwat/papeer/releases/latest) for
|
||||
|
||||
## MOBI support
|
||||
|
||||
Install kindlegen to convert websites, Linux only.
|
||||
> Kindle e-readers now support EPUB format
|
||||
|
||||
Install kindlegen to export websites to Kindle compatible ebooks, Linux only.
|
||||
|
||||
```sh
|
||||
TMPDIR=$(mktemp -d -t papeer-XXXXX)
|
||||
|
||||
11
book/link.go
11
book/link.go
@@ -1,10 +1,13 @@
|
||||
package book
|
||||
|
||||
import "time"
|
||||
|
||||
type link struct {
|
||||
Href string `json:"url"`
|
||||
Text string `json:"name"`
|
||||
Href string `json:"url"`
|
||||
Text string `json:"name"`
|
||||
Date *time.Time `json:"date"`
|
||||
}
|
||||
|
||||
func NewLink(href, text string) link {
|
||||
return link{href, text}
|
||||
func NewLink(href, text string, date *time.Time) link {
|
||||
return link{href, text, date}
|
||||
}
|
||||
|
||||
@@ -370,7 +370,7 @@ func GetLinks(url *urllib.URL, selector string, limit, offset int, reverse, incl
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
links = append(links, NewLink(u.String(), item.Title))
|
||||
links = append(links, NewLink(u.String(), item.Title, item.PublishedParsed))
|
||||
}
|
||||
|
||||
pathMax = "RSS"
|
||||
@@ -405,7 +405,7 @@ func GetLinks(url *urllib.URL, selector string, limit, offset int, reverse, incl
|
||||
// if selector is set, we use the selector specified by the user
|
||||
|
||||
key = selector
|
||||
pathLinks[key] = append(pathLinks[key], NewLink(href, text))
|
||||
pathLinks[key] = append(pathLinks[key], NewLink(href, text, &time.Time{}))
|
||||
pathCount[key] += 1
|
||||
pathMax = key
|
||||
|
||||
@@ -419,7 +419,7 @@ func GetLinks(url *urllib.URL, selector string, limit, offset int, reverse, incl
|
||||
|
||||
// we count this key if the link text is not empty
|
||||
if text != "" {
|
||||
pathLinks[key] = append(pathLinks[key], NewLink(href, text))
|
||||
pathLinks[key] = append(pathLinks[key], NewLink(href, text, &time.Time{}))
|
||||
pathCount[key] += len(text)
|
||||
|
||||
if pathCount[key] > pathCount[pathMax] {
|
||||
@@ -449,7 +449,7 @@ func GetLinks(url *urllib.URL, selector string, limit, offset int, reverse, incl
|
||||
|
||||
// include home page
|
||||
if include {
|
||||
l := NewLink(url.String(), home.Name())
|
||||
l := NewLink(url.String(), home.Name(), &time.Time{})
|
||||
links = append([]link{l}, links...)
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because one or more lines are too long
24
cmd/get.go
24
cmd/get.go
@@ -1,6 +1,7 @@
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
@@ -41,7 +42,7 @@ func init() {
|
||||
|
||||
getCmd.Flags().StringVarP(&getOpts.name, "name", "n", "", "book name (default: page title)")
|
||||
getCmd.Flags().StringVarP(&getOpts.author, "author", "a", "", "book author")
|
||||
getCmd.Flags().StringVarP(&getOpts.Format, "format", "f", "md", "file format [md, html, epub, mobi]")
|
||||
getCmd.Flags().StringVarP(&getOpts.Format, "format", "f", "md", "file format [md, json, html, epub, mobi]")
|
||||
getCmd.Flags().StringVarP(&getOpts.output, "output", "", "", "file name (default: book name)")
|
||||
getCmd.Flags().BoolVarP(&getOpts.stdout, "stdout", "", false, "print to standard output")
|
||||
getCmd.Flags().BoolVarP(&getOpts.images, "images", "", false, "retrieve images only")
|
||||
@@ -73,6 +74,7 @@ var getCmd = &cobra.Command{
|
||||
// check provided format is in list
|
||||
formatEnum := map[string]bool{
|
||||
"md": true,
|
||||
"json": true,
|
||||
"html": true,
|
||||
"epub": true,
|
||||
"mobi": true,
|
||||
@@ -182,6 +184,26 @@ var getCmd = &cobra.Command{
|
||||
}
|
||||
}
|
||||
|
||||
if getOpts.Format == "json" {
|
||||
filename := book.ToMarkdown(c, getOpts.output)
|
||||
|
||||
bytesRead, err := ioutil.ReadFile(filename)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
book := make(map[string]interface{})
|
||||
book["name"] = c.Name()
|
||||
book["content"] = string(bytesRead)
|
||||
|
||||
bookJson, err := json.Marshal(book)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
fmt.Println(string(bookJson))
|
||||
}
|
||||
|
||||
if getOpts.Format == "html" {
|
||||
filename := book.ToHtml(c, getOpts.output)
|
||||
|
||||
|
||||
@@ -14,6 +14,6 @@ var versionCmd = &cobra.Command{
|
||||
Use: "version",
|
||||
Short: "Print the version number of papeer",
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
fmt.Println("papeer v0.7.1")
|
||||
fmt.Println("papeer v0.8.1")
|
||||
},
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user