From a3b72a22b1d31b86c3f0d4e79df38077d0b1a2ef Mon Sep 17 00:00:00 2001 From: Andreas Neue Date: Fri, 22 Jan 2016 23:18:31 +0100 Subject: [PATCH] Fixed a module name collision in rss mod. --- modules/rss/rss.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/rss/rss.go b/modules/rss/rss.go index d14bc19..0de2040 100644 --- a/modules/rss/rss.go +++ b/modules/rss/rss.go @@ -1,4 +1,4 @@ -// vim:ts=4:sts=4:sw=4:noet:tw=72 +// vi:ts=4:sts=4:sw=4:noet:tw=72 // // This code is mostly derived from the example code by Jim Teeuwen // and is subject to the CC0 1.0 Universal (CC0 1.0) Public Domain Dedication @@ -15,7 +15,7 @@ import ( "os" "time" - rss "github.com/jteeuwen/go-pkg-rss" + gorss "github.com/jteeuwen/go-pkg-rss" "github.com/jteeuwen/go-pkg-xmlx" ) @@ -43,7 +43,7 @@ func Init(ch chan string, path string) { } func PollFeed(uri string, timeout int, cr xmlx.CharsetFunc) { - feed := rss.New(timeout, true, chanHandler, itemHandler) + feed := gorss.New(timeout, true, chanHandler, itemHandler) for { log.Printf("Polling feed: %s", uri) if err := feed.Fetch(uri, cr); err != nil { @@ -55,11 +55,11 @@ func PollFeed(uri string, timeout int, cr xmlx.CharsetFunc) { } } -func chanHandler(feed *rss.Feed, newchannels []*rss.Channel) { +func chanHandler(feed *gorss.Feed, newchannels []*gorss.Channel) { //sayCh <- fmt.Sprintf("%s\n%d new channel(s) in %s", "*", len(newchannels), feed.Url) } -func itemHandler(feed *rss.Feed, ch *rss.Channel, newitems []*rss.Item) { +func itemHandler(feed *gorss.Feed, ch *gorss.Channel, newitems []*gorss.Item) { if hideOutput { return }