X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Ffish.rb;h=3bafd03ef44d90f64d4787f41794cad31a6380e9;hb=43475d2d90769a06df3b6b583683cfd474f6547e;hp=52f30d69598f202cddd7705468f483f57b0d7ea0;hpb=fdb2d8d9f1fb0262324f10985aabc99d911797c2;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/fish.rb b/data/rbot/plugins/fish.rb
index 52f30d69..3bafd03e 100644
--- a/data/rbot/plugins/fish.rb
+++ b/data/rbot/plugins/fish.rb
@@ -1,21 +1,22 @@
-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}
 
-  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,7 +31,7 @@ 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)
@@ -55,43 +56,62 @@ class BabelPlugin < Plugin
     query = "/babelfish/tr"
 
     begin
-      resp = @bot.httputil.get_response('http://babelfish.altavista.com'+query,
-                                        :method => :post,
-                                        :body => data,
-                                        :headers => headers)
+      body = @bot.httputil.get('http://babelfish.altavista.com'+query,
+                               :method => :post,
+                               :body => data,
+                               :headers => headers)
     rescue Exception => e
       m.reply "http error: #{e.message}"
       return
     end
 
-    if (resp.code == "200")
-      lines = Array.new
-      resp.body.each_line { |l| lines.push l }
-
-      l = lines.join(" ")
-      debug "babelfish response: #{l}"
-
-      case l
-      when /^\s+<td bgcolor=white class=s><div style=padding:10px;>(.*)<\/div>/
-        answer = $1
-        # cache the answer
-        if(answer.length > 0)
-          @registry["#{trans_pair}/#{data_text}"] = answer
-        end
-        m.reply answer
-        return
-      when /^\s+<option value="#{trans_pair}"\s+SELECTED>/
-        m.reply "couldn't parse babelfish response html :("
-      else
-        m.reply "babelfish doesn't support translation from #{trans_from} to #{trans_to}"
+    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*/,' ')
+      # cache the answer
+      if(answer.length > 0)
+        @registry["#{trans_pair}/#{data_text}"] = answer
       end
+      m.reply answer
+      return
+    when /^\s+<option value="#{trans_pair}"\s+SELECTED>/
+      m.reply "couldn't parse babelfish response html :("
     else
-      m.reply "couldn't talk to babelfish :("
+      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