Merge pull request #56 from michael-k/fixup

Fixup
This commit is contained in:
Jim Teeuwen 2014-11-29 01:46:14 +01:00
commit 975dd7ebf4
1 changed files with 4 additions and 2 deletions

View File

@ -227,7 +227,7 @@ func (this *Feed) notifyListeners() {
func (this *Feed) CanUpdate() bool { func (this *Feed) CanUpdate() bool {
// Make sure we are not within the specified cache-limit. // Make sure we are not within the specified cache-limit.
// This ensures we don't request data too often. // This ensures we don't request data too often.
if SecondsTillUpdate() > 0 { if this.SecondsTillUpdate() > 0 {
return false return false
} }
@ -266,7 +266,7 @@ func (this *Feed) SecondsTillUpdate() int64 {
// Returns the duration needed to elapse before the feed should update. // Returns the duration needed to elapse before the feed should update.
func (this *Feed) TillUpdate() (time.Duration, error) { func (this *Feed) TillUpdate() (time.Duration, error) {
return time.ParseDuration(fmt.Sprintf("%ds", SecondsTillUpdate())) return time.ParseDuration(fmt.Sprintf("%ds", this.SecondsTillUpdate()))
} }
func (this *Feed) buildFeed(doc *xmlx.Document) (err error) { func (this *Feed) buildFeed(doc *xmlx.Document) (err error) {
@ -298,6 +298,8 @@ func (this *Feed) testVersions() bool {
return true return true
} }
// Returns the type of the feed, ie. "atom" or "rss", and the version number as an array.
// The first item in the array is the major and the second the minor version number.
func (this *Feed) GetVersionInfo(doc *xmlx.Document) (ftype string, fversion [2]int) { func (this *Feed) GetVersionInfo(doc *xmlx.Document) (ftype string, fversion [2]int) {
var node *xmlx.Node var node *xmlx.Node