Fix for weekly 2011.12.02

This commit is contained in:
jim teeuwen 2011-12-02 12:50:42 +01:00
parent e31aff8084
commit e44514e2cb
1 changed files with 7 additions and 7 deletions

14
feed.go
View File

@ -130,8 +130,8 @@ func (this *Feed) Fetch(uri string) (err error) {
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.
utc := time.UTC() utc := time.Now().UTC()
if utc.Seconds()-this.lastupdate < int64(this.CacheTimeout*60) { if utc.UnixNano()-this.lastupdate < int64(this.CacheTimeout*60) {
return false return false
} }
@ -140,7 +140,7 @@ func (this *Feed) CanUpdate() bool {
if len(this.Channels) == 0 && this.Type == "rss" { if len(this.Channels) == 0 && this.Type == "rss" {
if this.EnforceCacheLimit && len(this.Channels[0].SkipDays) > 0 { if this.EnforceCacheLimit && len(this.Channels[0].SkipDays) > 0 {
for _, v := range this.Channels[0].SkipDays { for _, v := range this.Channels[0].SkipDays {
if v == utc.Weekday() { if time.Weekday(v) == utc.Weekday() {
return false return false
} }
} }
@ -148,22 +148,22 @@ func (this *Feed) CanUpdate() bool {
if this.EnforceCacheLimit && len(this.Channels[0].SkipHours) > 0 { if this.EnforceCacheLimit && len(this.Channels[0].SkipHours) > 0 {
for _, v := range this.Channels[0].SkipHours { for _, v := range this.Channels[0].SkipHours {
if v == utc.Hour { if v == utc.Hour() {
return false return false
} }
} }
} }
} }
this.lastupdate = utc.Seconds() this.lastupdate = utc.UnixNano()
return true return true
} }
// Returns the number of seconds needed to elapse // Returns the number of seconds needed to elapse
// before the feed should update. // before the feed should update.
func (this *Feed) SecondsTillUpdate() int64 { func (this *Feed) SecondsTillUpdate() int64 {
utc := time.UTC() utc := time.Now().UTC()
return int64(this.CacheTimeout*60) - (utc.Seconds() - this.lastupdate) return int64(this.CacheTimeout*60) - (utc.Unix() - this.lastupdate)
} }
func (this *Feed) buildFeed(doc *xmlx.Document) (err error) { func (this *Feed) buildFeed(doc *xmlx.Document) (err error) {