X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Ffish.rb;h=5b24d2417f5fb71403a2cd1231787446de8d288b;hb=a7a0a9c61c1ab221b057c5076d62c60070aa4667;hp=76555a347b764075b61aa97c975fab92938e4a76;hpb=550754633ba85f5bd633dc81aeee686ead45774d;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/fish.rb b/data/rbot/plugins/fish.rb
index 76555a34..5b24d241 100644
--- a/data/rbot/plugins/fish.rb
+++ b/data/rbot/plugins/fish.rb
@@ -1,21 +1,23 @@
-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")
 
   def help(plugin, topic="")
-    from = @bot.config['translate.default_from']
-    to = @bot.config['translate.default_to']
-    "translate to <lang> <string> => translate from #{from} to <lang>, translate from <lang> <string> => translate to #{to} from <lang>, translate <fromlang> <tolang> <string> => translate from <fromlang> to <tolang>. If <string> is an http url, translates the referenced webpage and returns the 1st content paragraph. Languages: #{LANGS.join(', ')}"
+    case topic
+    when 'cache'
+      "translate cache [view|clear] => view or clear the translate cache contents"
+    else
+      from = @bot.config['translate.default_from']
+      to = @bot.config['translate.default_to']
+      "translate to <lang> <string> => translate from #{from} to <lang>, translate from <lang> <string> => translate to #{to} from <lang>, translate <fromlang> <tolang> <string> => translate from <fromlang> to <tolang>. If <string> is an http url, translates the referenced webpage and returns the 1st content paragraph. Languages: #{LANGS.join(', ')}. Other topics: cache"
+    end
   end
 
   def translate(m, params)
@@ -30,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}"
@@ -52,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)
@@ -67,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
@@ -81,10 +86,36 @@ class BabelPlugin < Plugin
       m.reply "babelfish doesn't support translation from #{trans_from} to #{trans_to}"
     end
   end
+
+  def cache_mgmt(m, params)
+    cmd = params[:cmd].intern
+    case cmd
+    when :view
+      cache = []
+      @registry.each { |key, val|
+        cache << "%s => %s" % [key, val]
+      }
+      m.reply "translate cache: #{cache.inspect}"
+    when :clear
+      keys = []
+      @registry.each { |key, val|
+        keys << key
+      }
+      keys.each { |key|
+        @registry.delete(key)
+      }
+      cache_mgmt(m, :cmd => 'view')
+    end
+  end
+
 end
 
 plugin = BabelPlugin.new
-plugin.map 'translate to :tolang *phrase'
-plugin.map 'translate from :fromlang *phrase'
-plugin.map 'translate :fromlang :tolang *phrase'
+
+plugin.default_auth('cache', false)
+
+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', :thread => true