X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Fsearch.rb;h=28e3c8a3655c034f3e555644f65dff08b80ac1d1;hb=1fa68bb86705b0e1e70d9d655bbfd8e1e13eb093;hp=e94d915baf58759b31a221030e9bce988d76bb11;hpb=5ad543d921116629dcfb9abc9bf25bdfbd53dbfd;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git diff --git a/data/rbot/plugins/search.rb b/data/rbot/plugins/search.rb index e94d915b..28e3c8a3 100644 --- a/data/rbot/plugins/search.rb +++ b/data/rbot/plugins/search.rb @@ -15,20 +15,23 @@ # TODO:: support localized uncyclopedias -- not easy because they have different names # for most languages +GOOGLE_SEARCH = "http://www.google.com/search?oe=UTF-8&q=" +GOOGLE_WAP_SEARCH = "http://www.google.com/wml/search?hl=en&q=" GOOGLE_WAP_LINK = /(.*?)<\/a>/im -GOOGLE_CALC_RESULT = %r{

} +GOOGLE_DEF_RESULT = %r{

(Web definitions for .*?)
(.*?)
(.*?)\s-\s+ 3, :desc => "Number of hits to return from Google searches") - BotConfig.register BotConfigIntegerValue.new('google.first_par', + Config.register Config::IntegerValue.new('google.first_par', :default => 0, :desc => "When set to n > 0, the bot will return the first paragraph from the first n search hits") - BotConfig.register BotConfigIntegerValue.new('wikipedia.hits', + Config.register Config::IntegerValue.new('wikipedia.hits', :default => 3, :desc => "Number of hits to return from Wikipedia searches") - BotConfig.register BotConfigIntegerValue.new('wikipedia.first_par', + Config.register Config::IntegerValue.new('wikipedia.first_par', :default => 1, :desc => "When set to n > 0, the bot will return the first paragraph from the first n wikipedia search hits") @@ -38,6 +41,8 @@ class SearchPlugin < Plugin "#{topic} => search google for " when "gcalc" "gcalc => use the google calculator to find the answer to " + when "gdef" + "gdef => use the google define mechanism to find a definition of " when "wp" "wp [] => search for on Wikipedia. You can select a national to only search the national Wikipedia" when "unpedia" @@ -60,10 +65,14 @@ class SearchPlugin < Plugin # e.g.: "Wikipedia, the free encyclopedia" when doing Wikipedia searches filter = params[:filter] || "" - url = "http://www.google.com/wml/search?q=#{site}#{searchfor}" + url = GOOGLE_WAP_SEARCH + site + searchfor hits = params[:hits] || @bot.config['google.hits'] + first_pars = params[:firstpar] || @bot.config['google.first_par'] + + single = (hits == 1 and first_pars == 1) + begin wml = @bot.httputil.get(url) raise unless wml @@ -76,18 +85,23 @@ class SearchPlugin < Plugin m.reply "no results found for #{what}" return end + single ||= (results.length==1) urls = Array.new results = results[0...hits].map { |res| n = res[0] t = Utils.decode_html_entities res[2].gsub(filter, '').strip u = URI.unescape res[1] urls.push(u) - "#{n}. #{Bold}#{t}#{Bold}: #{u}" + single ? u : "#{n}. #{Bold}#{t}#{Bold}: #{u}" }.join(" | ") - m.reply "Results for #{what}: #{results}", :split_at => /\s+\|\s+/ + # If we return a single, full result, change the output to a more compact representation + if single + m.reply "Result for %s: %s -- %s" % [what, results, Utils.get_first_pars(urls, first_pars)], :overlong => :truncate + return + end - first_pars = params[:firstpar] || @bot.config['google.first_par'] + m.reply "Results for #{what}: #{results}", :split_at => /\s+\|\s+/ return unless first_pars > 0 @@ -100,7 +114,7 @@ class SearchPlugin < Plugin searchfor = CGI.escape(what) debug "Getting gcalc thing: #{searchfor.inspect}" - url = "http://www.google.com/search?q=#{searchfor}" + url = GOOGLE_SEARCH + searchfor begin html = @bot.httputil.get(url) @@ -124,6 +138,35 @@ class SearchPlugin < Plugin m.reply "#{result}" end + def gdef(m, params) + what = params[:words].to_s + searchfor = CGI.escape("define " + what) + + debug "Getting gdef thing: #{searchfor.inspect}" + url = GOOGLE_WAP_SEARCH + searchfor + + begin + html = @bot.httputil.get(url) + rescue => e + m.reply "error googledefining #{what}" + return + end + + debug html + results = html.scan(GOOGLE_DEF_RESULT) + debug "results: #{results.inspect}" + + if results.length != 1 + m.reply "couldn't find a definition for #{what} on Google" + return + end + + head = results[0][0].ircify_html + text = results[0][1].ircify_html + link = results[0][2] + m.reply "#{head} -- #{link}\n#{text}" + end + def wikipedia(m, params) lang = params[:lang] site = "#{lang.nil? ? '' : lang + '.'}wikipedia.org" @@ -148,10 +191,11 @@ end plugin = SearchPlugin.new -plugin.map "search *words", :action => 'google' -plugin.map "google *words", :action => 'google' -plugin.map "gcalc *words", :action => 'gcalc' -plugin.map "wp :lang *words", :action => 'wikipedia', :requirements => { :lang => /^\w\w\w?$/ } -plugin.map "wp *words", :action => 'wikipedia' -plugin.map "unpedia *words", :action => 'unpedia' +plugin.map "search *words", :action => 'google', :threaded => true +plugin.map "google *words", :action => 'google', :threaded => true +plugin.map "gcalc *words", :action => 'gcalc', :threaded => true +plugin.map "gdef *words", :action => 'gdef', :threaded => true +plugin.map "wp :lang *words", :action => 'wikipedia', :requirements => { :lang => /^\w\w\w?$/ }, :threaded => true +plugin.map "wp *words", :action => 'wikipedia', :threaded => true +plugin.map "unpedia *words", :action => 'unpedia', :threaded => true

 (.+)
} +GOOGLE_CALC_RESULT = %r{ (?:

)?(.+)(?:

)?