X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Fweather.rb;h=5da949e4d8787e6532ad3dd91bbd67451d0cfea2;hb=c31697b2d75aa46df9163ebce92ee68fd0f9ce7f;hp=b58354471e302101fe349c51d4b5622b2dc3f100;hpb=7c5c0101174090565bc079863fe3980e9f7752ee;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git
diff --git a/data/rbot/plugins/weather.rb b/data/rbot/plugins/weather.rb
index b5835447..5da949e4 100644
--- a/data/rbot/plugins/weather.rb
+++ b/data/rbot/plugins/weather.rb
@@ -67,6 +67,10 @@ private
end
class WeatherPlugin < Plugin
+
+ Config.register Config::BooleanValue.new('weather.advisory',
+ :default => true,
+ :desc => "Should the bot report special weather advisories when any is present?")
def help(plugin, topic="")
case topic
@@ -173,8 +177,9 @@ class WeatherPlugin < Plugin
m.reply "no such station found (#{where})"
return
when /
(.*?)<\/table>/m
- data = $1
+ data = $1.dup
m.reply wu_weather_filter(data)
+ wu_out_special(m, xml)
else
debug xml
m.reply "something went wrong with the data for #{where}..."
@@ -202,6 +207,7 @@ class WeatherPlugin < Plugin
else
m.reply "couldn't parse weather data from #{where}"
end
+ wu_out_special(m, xml)
when /(.*?)<\/a>\s*:\s*(.*?)<\/td>/m)
+ # debug xml
+ stations = xml.scan(/\s*(?:]*>]+><\/a>\s*)?(.*?)<\/a>\s*:\s*(.*?)<\/td>/m)
+ # debug stations
m.reply "multiple stations available, use 'weather station ' or 'weather ' as appropriate, for one of the following (current temp shown):"
stations.map! { |ar|
- if ar.first # US state
- "%s, %s (%s): %s" % [ar[1], ar[0], ar[2], wu_clean(ar[3])]
+ warning = ar[0]
+ loc = ar[2]
+ state = ar[1]
+ par = ar[3]
+ w = ar[4]
+ if state # US station
+ (warning ? "*" : "") + ("%s, %s (%s): %s" % [loc, state, par, wu_clean(w)])
else # non-US station
- "station %s (%s): %s" % [ar[1], ar[2], wu_clean(ar[3])]
+ (warning ? "*" : "") + ("station %s (%s): %s" % [loc, par, wu_clean(w)])
end
}
m.reply stations.join("; ")
end
+ def wu_check_special(xml)
+ specials = []
+ # We only scan the first half to prevent getting the advisories twice
+ xml[0,xml.length/2].scan(%r{]*>([^<]+)}) do
+ special = {
+ :url => "http://mobile.wunderground.com"+$1,
+ :type => $2.dup,
+ :special => $3.dup
+ }
+ spec_rx = Regexp.new("(?:.+?)\\s+(.+?)\\s+ | \\s+\\s+ |
", Regexp::MULTILINE)
+ spec_xml = @bot.httputil.get(special[:url])
+ if spec_xml and spec_td = spec_xml.match(spec_rx)
+ special.merge!(:text => spec_td.captures.first.ircify_html)
+ end
+ specials << special
+ end
+ return specials
+ end
+
+ def wu_out_special(m, xml)
+ return unless @bot.config['weather.advisory']
+ specials = wu_check_special(xml)
+ debug specials
+ specials.each do |special|
+ special.merge!(:underline => Underline)
+ if special[:text]
+ m.reply("%{underline}%{special}%{underline}: %{text}" % special)
+ else
+ m.reply("%{underline}%{special}%{underline} @ %{url}" % special)
+ end
+ end
+ end
+
def wu_weather_filter(stuff)
txt = wu_clean(stuff)