X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Ffish.rb;h=5b24d2417f5fb71403a2cd1231787446de8d288b;hb=9e1d8a083f3b0cca42ddcc63c61393dc7377a9f3;hp=57bbefd06761b2717dd61446b5bd65fbbf4415c8;hpb=a7bcb8ab77dd2f6e5f5297d33dcbca53b8f841b7;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/fish.rb b/data/rbot/plugins/fish.rb
index 57bbefd0..5b24d241 100644
--- a/data/rbot/plugins/fish.rb
+++ b/data/rbot/plugins/fish.rb
@@ -1,14 +1,11 @@
-require 'net/http'
-require 'uri/common'
-Net::HTTP.version_1_2
-
 class BabelPlugin < Plugin
   LANGS = %w{en fr de it pt es nl ru zh zt el ja ko}
+  BASEURL = 'http://babelfish.yahoo.com'
 
-  BotConfig.register BotConfigEnumValue.new('translate.default_from',
+  Config.register Config::EnumValue.new('translate.default_from',
     :values => LANGS, :default => 'en',
     :desc => "Default language to translate from")
-  BotConfig.register BotConfigEnumValue.new('translate.default_to',
+  Config.register Config::EnumValue.new('translate.default_to',
     :values => LANGS, :default => 'en',
     :desc => "Default language to translate to")
 
@@ -35,14 +32,17 @@ class BabelPlugin < Plugin
       return
     end
 
-    data_text = URI.escape trans_text
+    data_text = CGI.escape trans_text
     trans_pair = "#{trans_from}_#{trans_to}"
 
     if (trans_text =~ /^http:\/\//) && (URI.parse(trans_text) rescue nil)
-      url = 'http://babelfish.altavista.com/babelfish/trurl_pagecontent' +
-        "?lp=#{trans_pair}&url=#{data_text}"
-
-      return Utils.get_first_pars([url], 1, :message => m)
+      m.reply 'webpage translation is not currently supported'
+      return
+      # TODO FIXME
+      # url = BASEURL+'/translate_url' +
+      #   "?lp=#{trans_pair}&trurl=#{data_text}"
+      #
+      # return Utils.get_first_pars([url], 1, :message => m)
     end
 
     data = "lp=#{trans_pair}&doit=done&intl=1&tt=urltext&urltext=#{data_text}"
@@ -57,10 +57,10 @@ class BabelPlugin < Plugin
       "content-type" => "application/x-www-form-urlencoded; charset=utf-8"
     }
 
-    query = "/babelfish/tr"
+    query = "/translate_txt"
 
     begin
-      body = @bot.httputil.get('http://babelfish.altavista.com'+query,
+      body = @bot.httputil.get(BASEURL+query,
                                :method => :post,
                                :body => data,
                                :headers => headers)
@@ -72,8 +72,8 @@ class BabelPlugin < Plugin
     case body
     when nil
       m.reply "couldn't talk to babelfish :("
-    when /^\s+<td bgcolor=white class=s><div style=padding:10px;>(.*)<\/div><\/td>\s*<\/tr>/m
-      answer = $1.gsub(/\s*[\r\n]+\s*/,' ')
+    when /^\s*<div id="result"><div style="[^"]*">(.*?)<\/div><\/div>\s*$/
+      answer = $1
       # cache the answer
       if(answer.length > 0)
         @registry["#{trans_pair}/#{data_text}"] = answer
@@ -114,8 +114,8 @@ plugin = BabelPlugin.new
 
 plugin.default_auth('cache', false)
 
-plugin.map 'translate to :tolang *phrase'
-plugin.map 'translate from :fromlang *phrase'
+plugin.map 'translate to :tolang *phrase', :thread => true
+plugin.map 'translate from :fromlang *phrase', :thread => true
 plugin.map 'translate cache :cmd', :action => :cache_mgmt, :auth_path => 'cache!', :requirements => { :cmd => /view|clear/ }
-plugin.map 'translate :fromlang :tolang *phrase'
+plugin.map 'translate :fromlang :tolang *phrase', :thread => true