an
/
rss
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use more flexible go-pkg-xmlx. 

If/when the changes are pulled into jteeuwen's branch I can change the
path back.
This commit is contained in:
Anschel Schaffer-Cohen 2013-03-19 10:03:21 -04:00
parent 6f6d1c9b3a
commit 069bcf4dc8
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
atom.go
View File

@ -1,6 +1,6 @@
package feeder package feeder
import xmlx "github.com/jteeuwen/go-pkg-xmlx" import xmlx "github.com/anschelsc/go-pkg-xmlx"
func (this *Feed) readAtom(doc *xmlx.Document) (err error) { func (this *Feed) readAtom(doc *xmlx.Document) (err error) {
ns := "http://www.w3.org/2005/Atom" ns := "http://www.w3.org/2005/Atom"

22
feed.go
View File

@ -1,6 +1,6 @@
/* /*
Author: jim teeuwen <jimteeuwen@gmail.com> Author: jim teeuwen <jimteeuwen@gmail.com>
Dependencies: go-pkg-xmlx (http://github.com/jteeuwen/go-pkg-xmlx) Dependencies: go-pkg-xmlx (http://github.com/anschelsc/go-pkg-xmlx)
This package allows us to fetch Rss and Atom feeds from the internet. This package allows us to fetch Rss and Atom feeds from the internet.
They are parsed into an object tree which is a hyvrid of both the RSS and Atom They are parsed into an object tree which is a hyvrid of both the RSS and Atom
@ -28,7 +28,8 @@ package feeder
import ( import (
"errors" "errors"
"fmt" "fmt"
xmlx "github.com/jteeuwen/go-pkg-xmlx" xmlx "github.com/anschelsc/go-pkg-xmlx"
"net/http"
"strconv" "strconv"
"strings" "strings"
"time" "time"
@ -90,7 +91,22 @@ func (this *Feed) LastUpdate() int64 { return this.lastupdate }
// This allows us to specify a custom character encoding conversion // This allows us to specify a custom character encoding conversion
// routine when dealing with non-utf8 input. Supply 'nil' to use the // routine when dealing with non-utf8 input. Supply 'nil' to use the
// default from Go's xml package. // default from Go's xml package.
//
// This is equivalent to calling FetchClient with http.DefaultClient
func (this *Feed) Fetch(uri string, charset xmlx.CharsetFunc) (err error) { func (this *Feed) Fetch(uri string, charset xmlx.CharsetFunc) (err error) {
return this.FetchClient(uri, http.DefaultClient, charset)
}
// Fetch retrieves the feed's latest content if necessary.
//
// The charset parameter overrides the xml decoder's CharsetReader.
// This allows us to specify a custom character encoding conversion
// routine when dealing with non-utf8 input. Supply 'nil' to use the
// default from Go's xml package.
//
// The client parameter allows the use of arbitrary network connections, for
// example the Google App Engine "URL Fetch" service.
func (this *Feed) FetchClient(uri string, client *http.Client, charset xmlx.CharsetFunc) (err error) {
if !this.CanUpdate() { if !this.CanUpdate() {
return return
} }
@ -101,7 +117,7 @@ func (this *Feed) Fetch(uri string, charset xmlx.CharsetFunc) (err error) {
// function parse it (rss 0.91, rss 0.92, rss 2, atom etc). // function parse it (rss 0.91, rss 0.92, rss 2, atom etc).
doc := xmlx.New() doc := xmlx.New()
if err = doc.LoadUri(uri, charset); err != nil { if err = doc.LoadUriClient(uri, client, charset); err != nil {
return return
} }
this.Type, this.Version = this.GetVersionInfo(doc) this.Type, this.Version = this.GetVersionInfo(doc)

2
rss.go
View File

@ -1,6 +1,6 @@
package feeder package feeder
import xmlx "github.com/jteeuwen/go-pkg-xmlx" import xmlx "github.com/anschelsc/go-pkg-xmlx"
func (this *Feed) readRss2(doc *xmlx.Document) (err error) { func (this *Feed) readRss2(doc *xmlx.Document) (err error) {
days := make(map[string]int) days := make(map[string]int)