1 Commits

Author SHA1 Message Date
lapwat
8fd0a12620 [list] print absolute url in json output 2023-02-18 00:01:48 +01:00
4 changed files with 15 additions and 5 deletions

View File

@@ -141,7 +141,7 @@ go install github.com/lapwat/papeer@latest
```sh ```sh
# use platform=darwin for MacOS # use platform=darwin for MacOS
platform=linux platform=linux
release=0.6.1 release=0.6.2
# download and extract # download and extract
curl -L https://github.com/lapwat/papeer/releases/download/v$release/papeer-v$release-$platform-amd64.tar.gz > papeer.tar.gz curl -L https://github.com/lapwat/papeer/releases/download/v$release/papeer-v$release-$platform-amd64.tar.gz > papeer.tar.gz

View File

@@ -1,7 +1,7 @@
package book package book
type link struct { type link struct {
Href string `json:"href"` Href string `json:"url"`
Text string `json:"name"` Text string `json:"name"`
} }

View File

@@ -365,7 +365,12 @@ func GetLinks(url *urllib.URL, selector string, limit, offset int, reverse, incl
// RSS feed // RSS feed
for _, item := range feed.Items { for _, item := range feed.Items {
links = append(links, NewLink(item.Link, item.Title)) u, err := url.Parse(item.Link)
if err != nil {
log.Fatal(err)
}
links = append(links, NewLink(u.String(), item.Title))
} }
pathMax = "RSS" pathMax = "RSS"
@@ -385,11 +390,16 @@ func GetLinks(url *urllib.URL, selector string, limit, offset int, reverse, incl
// visit and count link classes // visit and count link classes
c := colly.NewCollector() c := colly.NewCollector()
c.OnHTML(selector, func(e *colly.HTMLElement) { c.OnHTML(selector, func(e *colly.HTMLElement) {
href := e.Attr("href")
text := strings.TrimSpace(e.Text) text := strings.TrimSpace(e.Text)
path := GetPath(e.DOM) path := GetPath(e.DOM)
key := path key := path
u, err := url.Parse(e.Attr("href"))
if err != nil {
log.Fatal(err)
}
href := u.String()
if selectorSet { if selectorSet {
// if selector is set, we use the selector specified by the user // if selector is set, we use the selector specified by the user

View File

@@ -14,6 +14,6 @@ var versionCmd = &cobra.Command{
Use: "version", Use: "version",
Short: "Print the version number of papeer", Short: "Print the version number of papeer",
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
fmt.Println("papeer v0.6.1") fmt.Println("papeer v0.6.2")
}, },
} }