@feeds.delete(k)\r
}\r
@feeds.each { |k, f|\r
- f.mutex = Mutex.new unless f.mutex\r
+ f.mutex = Mutex.new\r
f.sanitize_watchers\r
parseRss(f) if f.xml\r
}\r
\r
def cleanup\r
stop_watches\r
+ super\r
end\r
\r
def save\r
\r
m.reply "lemme fetch it..."\r
title = items = nil\r
- fetched = fetchRss(feed, m, false)\r
+ we_were_watching = false\r
+\r
+ if @watch.key?(feed.handle)\r
+ # If a feed is being watched, we run the watcher thread\r
+ # so that all watchers can be informed of changes to\r
+ # the feed. Before we do that, though, we remove the\r
+ # show requester from the watchlist, if present, lest\r
+ # he gets the update twice.\r
+ if feed.watched_by?(m.replyto)\r
+ we_were_watching = true\r
+ feed.rm_watch(m.replyto)\r
+ end\r
+ @bot.timer.reschedule(@watch[feed.handle], 0)\r
+ if we_were_watching\r
+ feed.add_watch(m.replyto)\r
+ end\r
+ else\r
+ fetched = fetchRss(feed, m, false)\r
+ end\r
return unless fetched or feed.xml\r
if not fetched and feed.items\r
m.reply "using old data"\r
\r
def del_rss(m, params, pass=false)\r
feed = unwatch_rss(m, params, true)\r
+ return unless feed\r
if feed.watched?\r
m.reply "someone else is watching #{feed.handle}, I won't remove it from my list"\r
return\r
status = Hash.new\r
status[:failures] = 0\r
status[:first_run] = true\r
- @watch[feed.handle] = @bot.timer.add(0, status) {\r
+ @watch[feed.handle] = @bot.timer.add(0) {\r
debug "watcher for #{feed} started"\r
failures = status[:failures]\r
first_run = status.delete(:first_run)\r
else\r
debug "accepting new #{uid} #{item.inspect}"\r
debug [uid, txt].inspect\r
- warn "same text! #{txt}" if otxt.include?(txt)\r
+ warning "same text! #{txt}" if otxt.include?(txt)\r
false\r
end\r
}\r
\r
status[:failures] = failures\r
\r
+ timer = nil\r
+ seconds = @bot.config['rss.thread_sleep']\r
feed.mutex.synchronize do\r
- seconds = (feed.refresh_rate || @bot.config['rss.thread_sleep']) * (failures + 1)\r
- seconds += seconds * (rand(100)-50)/100\r
- debug "watcher for #{feed} going to sleep #{seconds} seconds.."\r
- @bot.timer.reschedule(@watch[feed.handle], seconds)\r
+ timer = @watch[feed.handle]\r
+ seconds = feed.refresh_rate if feed.refresh_rate\r
end\r
+ seconds *= failures + 1\r
+ seconds += seconds * (rand(100)-50)/100\r
+ debug "watcher for #{feed} going to sleep #{seconds} seconds.."\r
+ @bot.timer.reschedule(timer, seconds) rescue warning "watcher for #{feed} failed to reschedule: #{$!.inspect}"\r
}\r
debug "watcher for #{feed} added"\r
end\r