peter/ekster
1
0
Fork 0
Code Issues 3 Pull Requests Projects 3 Releases 1 Wiki Activity

Merge pull request 'Also check for xmlUrl while importing OPML' (#1) from urlxml-in-opml-import into master
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
Reviewed-on: #1
This commit is contained in:
Peter Stuifzand 2020-10-03 22:10:26 +00:00
commit 01a11e52fb
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/ek/main.go
View File

@ -554,18 +554,27 @@ func importOPMLIntoMicrosub(sub microsub.Microsub, filename string) {
}
for _, f := range c.Outlines {
if f.HTMLURL == "" {
log.Println("Missing url on second row item")
var url string
if f.HTMLURL != "" {
url = f.HTMLURL
} else if f.XMLURL != "" {
url = f.XMLURL
} else {
log.Println("Missing htmlUrl and xmlUrl attributes")
continue
}
if _, e := feedMap[f.HTMLURL]; !e {
_, err := sub.FollowURL(uid, f.HTMLURL)
if _, e := feedMap[url]; !e {
_, err := sub.FollowURL(uid, url)
if err != nil {
log.Printf("An error occurred: %q\n", err)
log.Printf("An error occurred while following feed %s: %q\n", url, err)
continue
}
log.Printf("Feed followed: %s\n", f.HTMLURL)
log.Printf("Feed followed: %s\n", url)
} else {
log.Printf("Feed not followed: %s\n", url)
}
}
}