+#-- vim:sw=2:et\r
+#++\r
+#\r
# RSS feed plugin for RubyBot\r
# (c) 2004 Stanislav Karchebny <berkus@madfire.net>\r
# (c) 2005 Ian Monroe <ian@monroe.nu>\r
# (c) 2005 Mark Kretschmann <markey@web.de>\r
+# (c) 2006 Giuseppe Bilotta <giuseppe.bilotta@gmail.com>\r
+#\r
# Licensed under MIT License.\r
\r
require 'rss/parser'\r
require 'rss/1.0'\r
require 'rss/2.0'\r
require 'rss/dublincore'\r
-begin\r
- # require 'rss/dublincore/2.0'\r
-rescue\r
- warning "Unable to load RSS libraries, RSS plugin functionality crippled"\r
-end\r
-\r
-class ::String\r
- def shorten(limit)\r
- if self.length > limit\r
- self+". " =~ /^(.{#{limit}}[^.!;?]*[.!;?])/mi\r
- return $1\r
- end\r
- self\r
- end\r
-\r
- def riphtml\r
- self.gsub(/<[^>]+>/, '').gsub(/&/,'&').gsub(/"/,'"').gsub(/</,'<').gsub(/>/,'>').gsub(/&ellip;/,'...').gsub(/'/, "'").gsub("\n",'')\r
- end\r
-\r
- def mysqlize\r
- self.gsub(/'/, "''")\r
- end\r
-end\r
+# begin\r
+# require 'rss/dublincore/2.0'\r
+# rescue\r
+# warning "Unable to load RSS libraries, RSS plugin functionality crippled"\r
+# end\r
\r
class ::RssBlob\r
- attr :url\r
- attr :handle\r
- attr :type\r
+ attr_accessor :url\r
+ attr_accessor :handle\r
+ attr_accessor :type\r
attr :watchers\r
+ attr_accessor :refresh_rate\r
+ attr_accessor :xml\r
+ attr_accessor :title\r
+ attr_accessor :items\r
+ attr_accessor :mutex\r
\r
- def initialize(url,handle=nil,type=nil,watchers=[])\r
+ def initialize(url,handle=nil,type=nil,watchers=[], xml=nil)\r
@url = url\r
if handle\r
@handle = handle\r
@handle = url\r
end\r
@type = type\r
- @watchers = watchers\r
+ @watchers=[]\r
+ @refresh_rate = nil\r
+ @xml = xml\r
+ @title = nil\r
+ @items = nil\r
+ @mutex = Mutex.new\r
+ sanitize_watchers(watchers)\r
+ end\r
+\r
+ def dup\r
+ self.class.new(@url,\r
+ @handle,\r
+ @type ? @type.dup : nil,\r
+ @watchers.dup,\r
+ @xml ? @xml.dup : nil)\r
+ end\r
+\r
+ # Downcase all watchers, possibly turning them into Strings if they weren't\r
+ def sanitize_watchers(list=@watchers)\r
+ ls = list.dup\r
+ @watchers.clear\r
+ ls.each { |w|\r
+ add_watch(w)\r
+ }\r
end\r
\r
def watched?\r
end\r
\r
def watched_by?(who)\r
- @watchers.include?(who)\r
+ @watchers.include?(who.downcase)\r
end\r
\r
def add_watch(who)\r
if watched_by?(who)\r
return nil\r
end\r
- @watchers << who unless watched_by?(who)\r
+ @watchers << who.downcase\r
return who\r
end\r
\r
def rm_watch(who)\r
- @watchers.delete(who)\r
+ @watchers.delete(who.downcase)\r
end\r
\r
def to_a\r
- [@handle,@url,@type,@watchers]\r
+ [@handle,@url,@type,@refresh_rate,@watchers]\r
end\r
\r
def to_s(watchers=false)\r
else\r
a = self.to_a[0,3]\r
end\r
- a.join(" | ")\r
+ a.compact.join(" | ")\r
end\r
end\r
\r
:desc => "How many characters to use of a RSS item text")\r
\r
BotConfig.register BotConfigIntegerValue.new('rss.thread_sleep',\r
- :default => 120, :validate => Proc.new{|v| v > 30},\r
- :desc => "How many characters to use of a RSS item text")\r
-\r
- @@watchThreads = Hash.new\r
- @@mutex = Mutex.new\r
+ :default => 300, :validate => Proc.new{|v| v > 30},\r
+ :desc => "How many seconds to sleep before checking RSS feeds again")\r
\r
def initialize\r
super\r
- kill_threads\r
if @registry.has_key?(:feeds)\r
@feeds = @registry[:feeds]\r
+ @feeds.keys.grep(/[A-Z]/) { |k|\r
+ @feeds[k.downcase] = @feeds[k]\r
+ @feeds.delete(k)\r
+ }\r
+ @feeds.each { |k, f|\r
+ f.mutex = Mutex.new unless f.mutex\r
+ f.sanitize_watchers\r
+ parseRss(f) if f.xml\r
+ }\r
else\r
@feeds = Hash.new\r
end\r
+ @watch = Hash.new\r
rewatch_rss\r
end\r
\r
+ def name\r
+ "rss"\r
+ end\r
+\r
def watchlist\r
@feeds.select { |h, f| f.watched? }\r
end\r
\r
def cleanup\r
- kill_threads\r
+ stop_watches\r
end\r
\r
def save\r
- @registry[:feeds] = @feeds\r
+ unparsed = Hash.new()\r
+ @feeds.each { |k, f|\r
+ f.mutex.synchronize do\r
+ unparsed[k] = f.dup\r
+ end\r
+ }\r
+ unparsed.each { |k, f|\r
+ debug f.inspect\r
+ }\r
+ @registry[:feeds] = unparsed\r
end\r
\r
- def kill_threads\r
- @@mutex.synchronize {\r
- # Abort all running threads.\r
- @@watchThreads.each { |url, thread|\r
- debug "Killing thread for #{url}"\r
- thread.kill\r
- }\r
- @@watchThreads = Hash.new\r
+ def stop_watch(handle)\r
+ if @watch.has_key?(handle)\r
+ begin\r
+ debug "Stopping watch #{handle}"\r
+ @bot.timer.remove(@watch[handle])\r
+ @watch.delete(handle)\r
+ rescue => e\r
+ report_problem("Failed to stop watch for #{handle}", e, nil)\r
+ end\r
+ end\r
+ end\r
+\r
+ def stop_watches\r
+ @watch.each_key { |k|\r
+ stop_watch(k)\r
}\r
end\r
\r
def help(plugin,topic="")\r
case topic\r
when "show"\r
- "rss show #{Bold}handle#{Bold} [#{Bold}limit#{Bold}] : show #{Bold}limit#{Bold} (default: 5, max: 15) entries from rss #{Bold}handle#{Bold}"\r
+ "rss show #{Bold}handle#{Bold} [#{Bold}limit#{Bold}] : show #{Bold}limit#{Bold} (default: 5, max: 15) entries from rss #{Bold}handle#{Bold}; #{Bold}limit#{Bold} can also be in the form a..b, to display a specific range of items"\r
when "list"\r
"rss list [#{Bold}handle#{Bold}] : list all rss feeds (matching #{Bold}handle#{Bold})"\r
when "watched"\r
"rss watched [#{Bold}handle#{Bold}] : list all watched rss feeds (matching #{Bold}handle#{Bold})"\r
when "add"\r
"rss add #{Bold}handle#{Bold} #{Bold}url#{Bold} [#{Bold}type#{Bold}] : add a new rss called #{Bold}handle#{Bold} from url #{Bold}url#{Bold} (of type #{Bold}type#{Bold})"\r
+ when "change"\r
+ "rss change #{Bold}what#{Bold} of #{Bold}handle#{Bold} to #{Bold}new#{Bold} : change the #{Underline}handle#{Underline}, #{Underline}url#{Underline}, #{Underline}type#{Underline} or #{Underline}refresh#{Underline} rate of rss called #{Bold}handle#{Bold} to value #{Bold}new#{Bold}"\r
when /^(del(ete)?|rm)$/\r
"rss del(ete)|rm #{Bold}handle#{Bold} : delete rss feed #{Bold}handle#{Bold}"\r
when "replace"\r
when "rewatch"\r
"rss rewatch : restart threads that watch for changes in watched rss"\r
else\r
- "manage RSS feeds: rss show|list|watched|add|del(ete)|rm|(force)replace|watch|unwatch|rmwatch|rewatch"\r
+ "manage RSS feeds: rss show|list|watched|add|change|del(ete)|rm|(force)replace|watch|unwatch|rmwatch|rewatch"\r
end\r
end\r
\r
end\r
if e\r
debug e.inspect\r
- debug e.backtrace.join("\n") if e.class >= Exception\r
+ debug e.backtrace.join("\n") if e.respond_to?(:backtrace)\r
end\r
end\r
\r
def show_rss(m, params)\r
handle = params[:handle]\r
- limit = params[:limit].to_i\r
- limit = 15 if limit > 15\r
- limit = 1 if limit <= 0\r
- feed = @feeds.fetch(handle, nil)\r
+ lims = params[:limit].to_s.match(/(\d+)(?:..(\d+))?/)\r
+ debug lims.to_a.inspect\r
+ if lims[2]\r
+ ll = [[lims[1].to_i-1,lims[2].to_i-1].min, 0].max\r
+ ul = [[lims[1].to_i-1,lims[2].to_i-1].max, 14].min\r
+ rev = lims[1].to_i > lims[2].to_i\r
+ else\r
+ ll = 0\r
+ ul = [[lims[1].to_i-1, 0].max, 14].min\r
+ rev = false\r
+ end\r
+\r
+ feed = @feeds.fetch(handle.downcase, nil)\r
unless feed\r
m.reply "I don't know any feeds named #{handle}"\r
return\r
end\r
- m.reply("Please wait, querying...")\r
+\r
+ m.reply "lemme fetch it..."\r
title = items = nil\r
- @@mutex.synchronize {\r
- title, items = fetchRss(feed, m)\r
- }\r
- return unless items\r
- m.reply("Channel : #{title}")\r
- # TODO: optional by-date sorting if dates present\r
- items[0...limit].reverse.each do |item|\r
+ fetched = fetchRss(feed, m)\r
+ return unless fetched or feed.xml\r
+ if not fetched and feed.items\r
+ m.reply "using old data"\r
+ else\r
+ parsed = parseRss(feed, m)\r
+ m.reply "using old data" unless parsed\r
+ end\r
+ return unless feed.items\r
+ title = feed.title\r
+ items = feed.items\r
+\r
+ # We sort the feeds in freshness order (newer ones first)\r
+ items = freshness_sort(items)\r
+ disp = items[ll..ul]\r
+ disp.reverse! if rev\r
+\r
+ m.reply "Channel : #{title}"\r
+ disp.each do |item|\r
printFormattedRss(feed, item, {:places=>[m.replyto],:handle=>nil,:date=>true})\r
end\r
end\r
\r
+ def itemDate(item,ex=nil)\r
+ return item.pubDate if item.respond_to?(:pubDate) and item.pubDate\r
+ return item.date if item.respond_to?(:date) and item.date\r
+ return ex\r
+ end\r
+\r
+ def freshness_sort(items)\r
+ notime = Time.at(0)\r
+ items.sort { |a, b|\r
+ itemDate(b, notime) <=> itemDate(a, notime)\r
+ }\r
+ end\r
+\r
def list_rss(m, params)\r
wanted = params[:handle]\r
reply = String.new\r
- @@mutex.synchronize {\r
- @feeds.each { |handle, feed|\r
- next if wanted and !handle.match(wanted)\r
- reply << "#{feed.handle}: #{feed.url} (in format: #{feed.type ? feed.type : 'default'})"\r
- (reply << " (watched)") if feed.watched_by?(m.replyto)\r
- reply << "\n"\r
- }\r
+ @feeds.each { |handle, feed|\r
+ next if wanted and !handle.match(/#{wanted}/i)\r
+ reply << "#{feed.handle}: #{feed.url} (in format: #{feed.type ? feed.type : 'default'})"\r
+ (reply << " refreshing every #{Utils.secs_to_string(feed.refresh_rate)}") if feed.refresh_rate\r
+ (reply << " (watched)") if feed.watched_by?(m.replyto)\r
+ reply << "\n"\r
}\r
if reply.empty?\r
reply = "no feeds found"\r
def watched_rss(m, params)\r
wanted = params[:handle]\r
reply = String.new\r
- @@mutex.synchronize {\r
- watchlist.each { |handle, feed|\r
- next if wanted and !handle.match(wanted)\r
- next unless feed.watched_by?(m.replyto)\r
- reply << "#{feed.handle}: #{feed.url} (in format: #{feed.type ? feed.type : 'default'})\n"\r
- }\r
+ watchlist.each { |handle, feed|\r
+ next if wanted and !handle.match(/#{wanted}/i)\r
+ next unless feed.watched_by?(m.replyto)\r
+ reply << "#{feed.handle}: #{feed.url} (in format: #{feed.type ? feed.type : 'default'})"\r
+ (reply << " refreshing every #{Utils.secs_to_string(feed.refresh_rate)}") if feed.refresh_rate\r
+ reply << "\n"\r
}\r
if reply.empty?\r
reply = "no watched feeds"\r
return\r
end\r
type = params[:type]\r
- if @feeds.fetch(handle, nil) && !force\r
- m.reply "There is already a feed named #{handle} (URL: #{@feeds[handle].url})"\r
+ if @feeds.fetch(handle.downcase, nil) && !force\r
+ m.reply "There is already a feed named #{handle} (URL: #{@feeds[handle.downcase].url})"\r
return\r
end\r
unless url\r
m.reply "You must specify both a handle and an url to add an RSS feed"\r
return\r
end\r
- @@mutex.synchronize {\r
- @feeds[handle] = RssBlob.new(url,handle,type)\r
- }\r
+ @feeds[handle.downcase] = RssBlob.new(url,handle,type)\r
reply = "Added RSS #{url} named #{handle}"\r
if type\r
reply << " (format: #{type})"\r
return handle\r
end\r
\r
+ def change_rss(m, params)\r
+ handle = params[:handle].downcase\r
+ feed = @feeds.fetch(handle, nil)\r
+ unless feed\r
+ m.reply "No such feed with handle #{handle}"\r
+ return\r
+ end\r
+ case params[:what].intern\r
+ when :handle\r
+ new = params[:new].downcase\r
+ if @feeds.key?(new) and @feeds[new]\r
+ m.reply "There already is a feed with handle #{new}"\r
+ return\r
+ else\r
+ feed.mutex.synchronize do\r
+ @feeds[new] = feed\r
+ @feeds.delete(handle)\r
+ feed.handle = new\r
+ end\r
+ handle = new\r
+ end\r
+ when :url\r
+ new = params[:new]\r
+ feed.mutex.synchronize do\r
+ feed.url = new\r
+ end\r
+ when :format, :type\r
+ new = params[:new]\r
+ new = nil if new == 'default'\r
+ feed.mutex.synchronize do\r
+ feed.type = new\r
+ end\r
+ when :refresh\r
+ new = params[:new].to_i\r
+ new = nil if new == 0\r
+ feed.mutex.synchronize do\r
+ feed.refresh_rate = new\r
+ end\r
+ else\r
+ m.reply "Don't know how to change #{params[:what]} for feeds"\r
+ return\r
+ end\r
+ m.reply "Feed changed:"\r
+ list_rss(m, {:handle => handle})\r
+ end\r
+\r
def del_rss(m, params, pass=false)\r
feed = unwatch_rss(m, params, true)\r
if feed.watched?\r
m.reply "someone else is watching #{feed.handle}, I won't remove it from my list"\r
return\r
end\r
- @@mutex.synchronize {\r
- @feeds.delete(feed.handle)\r
- }\r
+ @feeds.delete(feed.handle.downcase)\r
m.okay unless pass\r
return\r
end\r
\r
def replace_rss(m, params)\r
handle = params[:handle]\r
- if @feeds.key?(handle)\r
+ if @feeds.key?(handle.downcase)\r
del_rss(m, {:handle => handle}, true)\r
end\r
- if @feeds.key?(handle)\r
+ if @feeds.key?(handle.downcase)\r
m.reply "can't replace #{feed.handle}"\r
else\r
add_rss(m, params, true)\r
if url\r
add_rss(m, params)\r
end\r
- feed = nil\r
- @@mutex.synchronize {\r
- feed = @feeds.fetch(handle, nil)\r
- }\r
+ feed = @feeds.fetch(handle.downcase, nil)\r
if feed\r
- @@mutex.synchronize {\r
- if feed.add_watch(m.replyto)\r
- watchRss(feed, m)\r
- m.okay\r
- else\r
- m.reply "Already watching #{feed.handle}"\r
- end\r
- }\r
+ if feed.add_watch(m.replyto)\r
+ watchRss(feed, m)\r
+ m.okay\r
+ else\r
+ m.reply "Already watching #{feed.handle}"\r
+ end\r
else\r
m.reply "Couldn't watch feed #{handle} (no such feed found)"\r
end\r
end\r
\r
def unwatch_rss(m, params, pass=false)\r
- handle = params[:handle]\r
+ handle = params[:handle].downcase\r
unless @feeds.has_key?(handle)\r
m.reply("dunno that feed")\r
return\r
m.reply("#{m.replyto} wasn't watching #{feed.handle}") unless pass\r
end\r
if !feed.watched?\r
- @@mutex.synchronize {\r
- if @@watchThreads[handle].kind_of? Thread\r
- @@watchThreads[handle].kill\r
- debug "rmwatch: Killed thread for #{handle}"\r
- @@watchThreads.delete(handle)\r
- end\r
- }\r
+ stop_watch(handle)\r
end\r
return feed\r
end\r
\r
- def rewatch_rss(m=nil)\r
- kill_threads\r
+ def rewatch_rss(m=nil, params=nil)\r
+ stop_watches\r
\r
# Read watches from list.\r
watchlist.each{ |handle, feed|\r
\r
private\r
def watchRss(feed, m=nil)\r
- if @@watchThreads.has_key?(feed.handle)\r
+ if @watch.has_key?(feed.handle)\r
report_problem("watcher thread for #{feed.handle} is already running", nil, m)\r
return\r
end\r
- @@watchThreads[feed.handle] = Thread.new do\r
+ status = Hash.new\r
+ status[:failures] = 0\r
+ @watch[feed.handle] = @bot.timer.add(0, status) {\r
debug "watcher for #{feed} started"\r
- oldItems = []\r
- firstRun = true\r
- loop do\r
- begin\r
- debug "fetching #{feed}"\r
- title = newItems = nil\r
- @@mutex.synchronize {\r
- title, newItems = fetchRss(feed)\r
- }\r
- unless newItems\r
- m.reply "no items in feed"\r
- break\r
- end\r
- debug "Checking if new items are available for #{feed}"\r
- if firstRun\r
- debug "First run, we'll see next time"\r
- firstRun = false\r
+ failures = status[:failures]\r
+ begin\r
+ debug "fetching #{feed}"\r
+ oldxml = feed.xml ? feed.xml.dup : nil\r
+ unless fetchRss(feed)\r
+ failures += 1\r
+ else\r
+ if oldxml and oldxml == feed.xml\r
+ debug "xml for #{feed} didn't change"\r
+ failures -= 1 if failures > 0\r
else\r
- otxt = oldItems.map { |item| item.to_s }\r
- dispItems = newItems.reject { |item|\r
- otxt.include?(item.to_s)\r
- }\r
- if dispItems.length > 0\r
- debug "Found #{dispItems.length} new items in #{feed}"\r
- dispItems.each { |item|\r
- @@mutex.synchronize {\r
- printFormattedRss(feed, item)\r
- }\r
- }\r
+ if not feed.items\r
+ debug "no previous items in feed #{feed}"\r
+ parseRss(feed)\r
+ failures -= 1 if failures > 0\r
else\r
- debug "No new items found in #{feed}"\r
+ otxt = feed.items.map { |item| item.to_s }\r
+ unless parseRss(feed)\r
+ debug "no items in feed #{feed}"\r
+ failures += 1\r
+ else\r
+ debug "Checking if new items are available for #{feed}"\r
+ failures -= 1 if failures > 0\r
+ dispItems = feed.items.reject { |item|\r
+ otxt.include?(item.to_s)\r
+ }\r
+ if dispItems.length > 0\r
+ debug "Found #{dispItems.length} new items in #{feed}"\r
+ # When displaying watched feeds, publish them from older to newer\r
+ dispItems.reverse.each { |item|\r
+ printFormattedRss(feed, item)\r
+ }\r
+ else\r
+ debug "No new items found in #{feed}"\r
+ end\r
+ end\r
end\r
end\r
- oldItems = newItems.dup\r
- rescue Exception => e\r
- error "IO failed: #{e.inspect}"\r
- debug e.backtrace.join("\n")\r
end\r
+ rescue Exception => e\r
+ error "Error watching #{feed}: #{e.inspect}"\r
+ debug e.backtrace.join("\n")\r
+ failures += 1\r
+ end\r
\r
- seconds = @bot.config['rss.thread_sleep']\r
- seconds += seconds * rand(50)/100\r
+ status[:failures] = failures\r
+\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
- sleep seconds\r
+ @bot.timer.reschedule(@watch[feed.handle], seconds)\r
end\r
- end\r
+ }\r
+ debug "watcher for #{feed} added"\r
end\r
\r
def printFormattedRss(feed, item, opts=nil)\r
if opts\r
places = opts[:places] if opts.key?(:places)\r
handle = opts[:handle].to_s if opts.key?(:handle)\r
- date = item.pubDate.strftime("%Y/%m/%d %H.%M.%S") + " :: " if (opts.key?(:date) && opts[:date] && item.pubDate)\r
+ if opts.key?(:date) && opts[:date]\r
+ if item.respond_to?(:pubDate) \r
+ if item.pubDate.class <= Time\r
+ date = item.pubDate.strftime("%Y/%m/%d %H.%M.%S")\r
+ else\r
+ date = item.pubDate.to_s\r
+ end\r
+ elsif item.respond_to?(:date)\r
+ if item.date.class <= Time\r
+ date = item.date.strftime("%Y/%m/%d %H.%M.%S")\r
+ else\r
+ date = item.date.to_s\r
+ end\r
+ else\r
+ date = "(no date)"\r
+ end\r
+ date += " :: "\r
+ end\r
end\r
title = "#{Bold}#{item.title.chomp.riphtml}#{Bold}" if item.title\r
- desc = item.description.gsub(/\s+/,' ').strip.riphtml.shorten(@bot.config['rss.text_max']) if item.description\r
+ desc = item.description.gsub(/\s+/,' ').strip.riphtml if item.description\r
link = item.link.chomp if item.link\r
- places.each { |loc|\r
- case feed.type\r
- when 'blog'\r
- @bot.say loc, "#{handle}#{date}#{item.category.content} blogged at #{link}"\r
- @bot.say loc, "#{handle}#{title} - #{desc}"\r
- when 'forum'\r
- @bot.say loc, "#{handle}#{date}#{title}#{' @ ' if item.title && item.link}#{link}"\r
- when 'wiki'\r
- @bot.say loc, "#{handle}#{date}#{item.title} has been edited by #{item.dc_creator}. #{desc} #{link}"\r
- when 'gmame'\r
- @bot.say loc, "#{handle}#{date}Message #{title} sent by #{item.dc_creator}. #{desc}"\r
- when 'trac'\r
- @bot.say loc, "#{handle}#{date}#{title} @ #{link}"\r
- unless item.title =~ /^Changeset \[(\d+)\]/\r
- @bot.say loc, "#{handle}#{desc}"\r
- end\r
- else\r
- @bot.say loc, "#{handle}#{date}#{title}#{' @ ' if item.title && item.link}#{link}"\r
+ line1 = nil\r
+ line2 = nil\r
+ case feed.type\r
+ when 'blog'\r
+ line1 = "#{handle}#{date}#{item.category.content} blogged at #{link}"\r
+ line2 = "#{handle}#{title} - #{desc}"\r
+ when 'forum'\r
+ line1 = "#{handle}#{date}#{title}#{' @ ' if item.title && item.link}#{link}"\r
+ when 'wiki'\r
+ line1 = "#{handle}#{date}#{title}#{' @ ' if item.title && item.link}#{link} has been edited by #{item.dc_creator}. #{desc}"\r
+ when 'gmane'\r
+ line1 = "#{handle}#{date}Message #{title} sent by #{item.dc_creator}. #{desc}"\r
+ when 'trac'\r
+ line1 = "#{handle}#{date}#{title} @ #{link}"\r
+ unless item.title =~ /^Changeset \[(\d+)\]/\r
+ line2 = "#{handle}#{date}#{desc}"\r
end\r
+ else\r
+ line1 = "#{handle}#{date}#{title}#{' @ ' if item.title && item.link}#{link}"\r
+ end\r
+ places.each { |loc|\r
+ @bot.say loc, line1, :overlong => :truncate\r
+ next unless line2\r
+ @bot.say loc, line2, :overlong => :truncate\r
}\r
end\r
\r
def fetchRss(feed, m=nil)\r
begin\r
# Use 60 sec timeout, cause the default is too low\r
- xml = @bot.httputil.get_cached(feed.url,60,60)\r
+ xml = @bot.httputil.get_cached(feed.url, 60, 60)\r
rescue URI::InvalidURIError, URI::BadURIError => e\r
report_problem("invalid rss feed #{feed.url}", e, m)\r
- return\r
+ return nil\r
+ rescue => e\r
+ report_problem("error getting #{feed.url}", e, m)\r
+ return nil\r
end\r
debug "fetched #{feed}"\r
unless xml\r
report_problem("reading feed #{feed} failed", nil, m)\r
- return\r
+ return nil\r
+ end\r
+ feed.mutex.synchronize do\r
+ feed.xml = xml\r
end\r
+ return true\r
+ end\r
\r
- begin\r
- ## do validate parse\r
- rss = RSS::Parser.parse(xml)\r
- debug "parsed #{feed}"\r
- rescue RSS::InvalidRSSError\r
- ## do non validate parse for invalid RSS 1.0\r
+ def parseRss(feed, m=nil)\r
+ return nil unless feed.xml\r
+ feed.mutex.synchronize do\r
+ xml = feed.xml\r
begin\r
- rss = RSS::Parser.parse(xml, false)\r
+ ## do validate parse\r
+ rss = RSS::Parser.parse(xml)\r
+ debug "parsed #{feed}"\r
+ rescue RSS::InvalidRSSError\r
+ ## do non validate parse for invalid RSS 1.0\r
+ begin\r
+ rss = RSS::Parser.parse(xml, false)\r
+ rescue RSS::Error => e\r
+ report_problem("parsing rss stream failed, whoops =(", e, m)\r
+ return nil\r
+ end\r
rescue RSS::Error => e\r
- report_problem("parsing rss stream failed, whoops =(", e, m)\r
- return\r
+ report_problem("parsing rss stream failed, oioi", e, m)\r
+ return nil\r
+ rescue => e\r
+ report_problem("processing error occured, sorry =(", e, m)\r
+ return nil\r
end\r
- rescue RSS::Error => e\r
- report_problem("parsing rss stream failed, oioi", e, m)\r
- return\r
- rescue => e\r
- report_problem("processing error occured, sorry =(", e, m)\r
- return\r
- end\r
- items = []\r
- if rss.nil?\r
- report_problem("#{feed} does not include RSS 1.0 or 0.9x/2.0", nil, m)\r
- else\r
- begin\r
- rss.output_encoding = 'UTF-8'\r
- rescue RSS::UnknownConvertMethod => e\r
- report_problem("bah! something went wrong =(", e, m)\r
- return\r
- end\r
- rss.channel.title ||= "Unknown"\r
- title = rss.channel.title\r
- rss.items.each do |item|\r
- item.title ||= "Unknown"\r
- items << item\r
+ items = []\r
+ if rss.nil?\r
+ report_problem("#{feed} does not include RSS 1.0 or 0.9x/2.0", nil, m)\r
+ else\r
+ begin\r
+ rss.output_encoding = 'UTF-8'\r
+ rescue RSS::UnknownConvertMethod => e\r
+ report_problem("bah! something went wrong =(", e, m)\r
+ return nil\r
+ end\r
+ rss.channel.title ||= "Unknown"\r
+ title = rss.channel.title\r
+ rss.items.each do |item|\r
+ item.title ||= "Unknown"\r
+ items << item\r
+ end\r
end\r
- end\r
\r
- if items.empty?\r
- report_problem("no items found in the feed, maybe try weed?", e, m)\r
- return\r
+ if items.empty?\r
+ report_problem("no items found in the feed, maybe try weed?", e, m)\r
+ return nil\r
+ end\r
+ feed.title = title\r
+ feed.items = items\r
+ return true\r
end\r
- return [title, items]\r
end\r
end\r
\r
\r
plugin.map 'rss show :handle :limit',\r
:action => 'show_rss',\r
- :requirements => {:limit => /^\d+$/},\r
+ :requirements => {:limit => /^\d+(?:\.\.\d+)?$/},\r
:defaults => {:limit => 5}\r
plugin.map 'rss list :handle',\r
:action => 'list_rss',\r
plugin.map 'rss add :handle :url :type',\r
:action => 'add_rss',\r
:defaults => {:type => nil}\r
+plugin.map 'rss change :what of :handle to :new',\r
+ :action => 'change_rss',\r
+ :requirements => { :what => /handle|url|format|type|refresh/ }\r
+plugin.map 'rss change :what for :handle to :new',\r
+ :action => 'change_rss',\r
+ :requirements => { :what => /handle|url|format|type|refesh/ }\r
plugin.map 'rss del :handle',\r
:action => 'del_rss'\r
plugin.map 'rss delete :handle',\r
:action => 'unwatch_rss'\r
plugin.map 'rss rmwatch :handle',\r
:action => 'unwatch_rss'\r
-plugin.map 'rss rewatch :handle',\r
+plugin.map 'rss rewatch',\r
:action => 'rewatch_rss'\r
+\r
projects / user / henk / code / ruby / rbot.git / blobdiff