noham/papeer
1
0
Fork 0
mirror of https://github.com/NohamR/papeer.git synced 2026-05-25 04:17:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: default depth when limit is specified

Browse Source
This commit is contained in:
lapwat
2022-05-10 15:09:07 +02:00
parent 740b66669f
commit 6d795f3033
5 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
cmd/get.go
View File

@@ -3,9 +3,9 @@ package cmd
import (
"errors"
"fmt"
"io/ioutil"
"log"
"strings"
"io/ioutil"
"github.com/spf13/cobra"
@@ -73,9 +73,9 @@ var getCmd = &cobra.Command{
}
formatEnum := map[string]bool{
"md": true,
"epub": true,
"mobi": true,
"md": true,
"epub": true,
"mobi": true,
}
if formatEnum[getOpts.Format] != true {
@@ -89,12 +89,19 @@ var getCmd = &cobra.Command{
}
}
if cmd.Flags().Changed("include") && getOpts.depth == 0 && len(getOpts.Selector) == 0 {
return errors.New("cannot use include option if depth/selector is not specified")
// increase depth to match limit
if cmd.Flags().Changed("limit") && getOpts.depth == 0 {
getOpts.depth = 1
}
if cmd.Flags().Changed("limit") && getOpts.depth == 0 && len(getOpts.Selector) == 0 {
return errors.New("cannot use limit option if depth/selector is not specified")
// fill selector array with empty selectors to match depth
getOpts.Selector = append(getOpts.Selector, "")
for len(getOpts.Selector) < getOpts.depth+1 {
getOpts.Selector = append(getOpts.Selector, "")
}
if cmd.Flags().Changed("include") && getOpts.depth == 0 && len(getOpts.Selector) == 0 {
return errors.New("cannot use include option if depth/selector is not specified")
}
if cmd.Flags().Changed("offset") && getOpts.depth == 0 && len(getOpts.Selector) == 0 {
@@ -126,12 +133,6 @@ var getCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
url := args[0]
// fill selector array with empty selectors to match depth
getOpts.Selector = append(getOpts.Selector, "")
for len(getOpts.Selector) < getOpts.depth+1 {
getOpts.Selector = append(getOpts.Selector, "")
}
// generate config for each level
configs := make([]*book.ScrapeConfig, len(getOpts.Selector))
for index, s := range getOpts.Selector {

2
cmd/version.go
View File

@@ -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.5.3")
fmt.Println("papeer v0.5.4")
},
}