X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Ftranslator.rb;h=6bd4dc226018ac9650ae2d40e5513a8f22e29164;hb=27cb79be57f9377d8c13dab2d7d0776e80dfd115;hp=0a1dc22d435538f0c7356261a16e77dfc90ca771;hpb=dc037235e33a99242e612f9465398cbecdfbc173;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/translator.rb b/data/rbot/plugins/translator.rb
index 0a1dc22d..6bd4dc22 100644
--- a/data/rbot/plugins/translator.rb
+++ b/data/rbot/plugins/translator.rb
@@ -8,6 +8,11 @@
 # License:: GPLv2
 #
 # This plugin allows using rbot to translate text on a few translation services
+#
+# TODO
+#
+# * Configuration for whether to show translation engine
+# * Optionally sync default translators with karma.rb ranking
 
 require 'set'
 require 'timeout'
@@ -209,7 +214,7 @@ class BabelfishTranslator < Translator
 
   def initialize(cache)
     require 'mechanize'
-    
+
     @form = WWW::Mechanize.new.get('http://babelfish.altavista.com/babelfish/').
             forms.name('frmTrText').first
     @lang_list = @form.fields.name('lp')
@@ -252,37 +257,46 @@ class WorldlingoTranslator < Translator
 end
 
 class TranslatorPlugin < Plugin
-  BotConfig.register BotConfigIntegerValue.new('translate.timeout',
+  Config.register Config::IntegerValue.new('translator.timeout',
     :default => 30, :validate => Proc.new{|v| v > 0},
     :desc => _("Number of seconds to wait for the translation service before timeout"))
 
+  TRANSLATORS = {
+    'nifty' => NiftyTranslator,
+    'excite' => ExciteTranslator,
+    'google_translate' => GoogleTranslator,
+    'babelfish' => BabelfishTranslator,
+    'worldlingo' => WorldlingoTranslator,
+  }
+
   def initialize
     super
-    translator_classes = {
-      'nifty' => NiftyTranslator,
-      'excite' => ExciteTranslator,
-      'google_translate' => GoogleTranslator,
-      'babelfish' => BabelfishTranslator,
-      'worldlingo' => WorldlingoTranslator,
-    }
 
     @translators = {}
-
-    translator_classes.each_pair do |name, c|
+    TRANSLATORS.each_pair do |name, c|
       begin
         @translators[name] = c.new(@registry.sub_registry(name))
-        map "#{name} :from :to *phrase", :action => :cmd_translate
-      rescue
+        map "#{name} :from :to *phrase",
+          :action => :cmd_translate, :thread => true
+      rescue Exception
         warning _("Translator %{name} cannot be used: %{reason}") %
                {:name => name, :reason => $!}
       end
     end
+
+    Config.register Config::ArrayValue.new('translator.default_list',
+      :default => TRANSLATORS.keys,
+      :validate => Proc.new {|l| l.all? {|t| TRANSLATORS.has_key?(t)}},
+      :desc => _("List of translators to try in order when translator name not specified"),
+      :on_change => Proc.new {|bot, v| update_default})
+    update_default
   end
 
   def help(plugin, topic=nil)
-    if @translators.has_key?(topic)
-      translator = @translators[topic]
-      _('%{info}, supported directions of translation: %{directions}') % {
+    if @translators.has_key?(plugin)
+      translator = @translators[plugin]
+      _('%{translator} <from> <to> <phrase> => Look up phrase using %{info}, supported from -> to languages: %{directions}') % {
+        :translator => plugin,
         :info => translator.class::INFO,
         :directions => translator.directions.map do |source, targets|
                          _('%{source} -> %{targets}') %
@@ -290,25 +304,45 @@ class TranslatorPlugin < Plugin
                        end.join(' | ')
       }
     else
-      _('Command: <translator> <from> <to> <phrase>, where <translator> is one of: %{translators}. Use "help translator <translator>" to look up supported from and to languages') %
+      _('Command: <translator> <from> <to> <phrase>, where <translator> is one of: %{translators}. If "translator" is used in place of the translator name, the first translator in translator.default_list which supports the specified direction will be picked automatically. Use "help <translator>" to look up supported from and to languages') %
         {:translators => @translators.keys.join(', ')}
     end
   end
 
+  def update_default
+    @default_translators = bot.config['translator.default_list'] & @translators.keys 
+  end
+
+  def cmd_translator(m, params)
+    from, to = params[:from], params[:to]
+    translator = @default_translators.find {|t| @translators[t].support?(from, to)}
+    if translator
+      cmd_translate m, params.merge({:translator => translator, :show_provider => true})
+    else
+      m.reply _('None of the default translators (translator.default_list) supports translating from %{source} to %{target}') % {:source => from, :target => to}
+    end
+  end
+
   def cmd_translate(m, params)
     # get the first word of the command
-    tname = m.message[/\A(\w+)\s/, 1]
+    tname = params[:translator] || m.message[/\A(\w+)\s/, 1]
     translator = @translators[tname]
     from, to, phrase = params[:from], params[:to], params[:phrase].to_s
     if translator
       begin
-          translation = Timeout.timeout(@bot.config['translate.timeout']) do
-            translator.translate(phrase, from, to)
-          end
-          m.reply translation
+        translation = Timeout.timeout(@bot.config['translator.timeout']) do
+          translator.translate(phrase, from, to)
+        end
+        m.reply(if params[:show_provider]
+                  _('%{translation} (provided by %{translator})') %
+                    {:translation => translation, :translator => tname}
+                else
+                  translation
+                end)
+
       rescue Translator::UnsupportedDirectionError
-          m.reply _("%{translator} doesn't support translating from %{source} to %{target}") %
-                  {:translator => tname, :source => from, :target => to}
+        m.reply _("%{translator} doesn't support translating from %{source} to %{target}") %
+                {:translator => tname, :source => from, :target => to}
       rescue Translator::NoTranslationError
         m.reply _('%{translator} failed to provide a translation') %
                 {:translator => tname}
@@ -322,4 +356,5 @@ class TranslatorPlugin < Plugin
 end
 
 plugin = TranslatorPlugin.new
-
+plugin.map 'translator :from :to *phrase',
+           :action => :cmd_translator, :thread => true