Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Update Parse method to skip parsing URIs #13

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[WIP] Update Parse method to skip parsing URIs #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd99cdd
add logic for skipping parse request uri method call if a page url is…
Jun 20, 2019
700c4dd
temporarily use Sirupsen instead of sirupsen as a dep
Jun 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.12
require (
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/sergi/go-diff v1.0.0
github.com/sirupsen/logrus v1.4.2
github.com/Sirupsen/logrus v1.4.2
github.com/spf13/cobra v0.0.4
github.com/stretchr/testify v1.3.0 // indirect
golang.org/x/net v0.0.0-20190520210107-018c4d40a106
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/Sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
github.com/Sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
github.com/spf13/cobra v0.0.4 h1:S0tLZ3VOKl2Te0hpq8+ke0eSJPfCnNTPiDlsfwi1/NE=
Expand Down
10 changes: 6 additions & 4 deletions parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1682,11 +1682,13 @@ func (ps *Parser) Parse(input io.Reader, pageURL string) (Article, error) {
cleanConditionally: true,
}

// Parse page url
var err error
ps.documentURI, err = nurl.ParseRequestURI(pageURL)
if err != nil {
return Article{}, fmt.Errorf("failed to parse URL: %v", err)
// If a pageURL is passed, parse the page url
if pageURL != "" {
ps.documentURI, err = nurl.ParseRequestURI(pageURL)
if err != nil {
return Article{}, fmt.Errorf("failed to parse URL: %v", err)
}
}

// Parse input
Expand Down
2 changes: 1 addition & 1 deletion scripts/generate-test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
fp "path/filepath"
"time"

"github.com/Sirupsen/logrus"
readability "github.com/go-shiori/go-readability"
"github.com/sirupsen/logrus"
"golang.org/x/net/html"
)

Expand Down
2 changes: 1 addition & 1 deletion utils-common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"strings"

"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"golang.org/x/net/html"
)

Expand Down