plugin(points): forgot one special case, see #34

[user/henk/code/ruby/rbot.git] / data / rbot / plugins / markov.rb

diff --git a/data/rbot/plugins/markov.rb b/data/rbot/plugins/markov.rb
old mode 100755 (executable)
new mode 100644 (file)
index 8ccb0ca..abb1017
--- a/data/rbot/plugins/markov.rb
+++ b/data/rbot/plugins/markov.rb
@@ -183,6 +183,9 @@ class MarkovPlugin < Plugin
     @upgrade_queue.push nil
 
     @upgrade_thread = Thread.new do
+      @registry.recovery = Proc.new { |val|
+        return [val]
+      }
       logfile = File.open(@bot.path('markov-conversion.log'), 'a')
       logfile.puts "=== conversion thread started #{Time.now} ==="
       while k = @upgrade_queue.pop
@@ -199,6 +202,7 @@ class MarkovPlugin < Plugin
       end
       logfile.puts "=== conversion thread stopped #{Time.now} ==="
       logfile.close
+      @registry.recovery = nil
     end
     @upgrade_thread.priority = -1
   end
@@ -226,6 +230,8 @@ class MarkovPlugin < Plugin
     @chains.set_default([])
     @rchains = @registry.sub_registry('v2r')
     @rchains.set_default([])
+    @chains_mutex = Mutex.new
+    @rchains_mutex = Mutex.new
 
     @upgrade_queue = Queue.new
     @upgrade_thread = nil
@@ -360,8 +366,12 @@ class MarkovPlugin < Plugin
       else
         "markov chat => try to say something intelligent"
       end
+    when "learn"
+      ["markov learn from <file> [testing [<num> lines]] [using pattern <pattern>]:",
+       "learn from the text in the specified <file>, optionally using the given <pattern> to filter the text.",
+       "you can sample what would be learned by specifying 'testing <num> lines'"].join(' ')
     else
-      "markov plugin: listens to chat to build a markov chain, with which it can (perhaps) attempt to (inanely) contribute to 'discussion'. Sort of.. Will get a *lot* better after listening to a lot of chat. Usage: 'chat' to attempt to say something relevant to the last line of chat, if it can -- help topics: ignore, readonly, delay, status, probability, chat, chat about"
+      "markov plugin: listens to chat to build a markov chain, with which it can (perhaps) attempt to (inanely) contribute to 'discussion'. Sort of.. Will get a *lot* better after listening to a lot of chat. Usage: 'chat' to attempt to say something relevant to the last line of chat, if it can -- help topics: ignore, readonly, delay, status, probability, chat, chat about, learn"
     end
   end
 
@@ -381,7 +391,7 @@ class MarkovPlugin < Plugin
 
   def status(m,params)
     if @bot.config['markov.enabled']
-      reply = _("markov is currently enabled, %{p}% chance of chipping in") % { :p => probability? }
+      reply = _("markov is currently enabled, %{p}%% chance of chipping in") % { :p => probability? }
       l = @learning_queue.length
       reply << (_(", %{l} messages in queue") % {:l => l}) if l > 0
       l = @upgrade_queue.length
@@ -484,7 +494,7 @@ class MarkovPlugin < Plugin
       @bot.config['markov.probability'] = params[:probability].to_i
       m.okay
     else
-      m.reply _("markov has a %{prob}% chance of chipping in") % { :prob => probability? }
+      m.reply _("markov has a %{prob}%% chance of chipping in") % { :prob => probability? }
     end
   end
 
@@ -611,33 +621,37 @@ class MarkovPlugin < Plugin
   def learn_triplet(word1, word2, word3)
       k = "#{word1} #{word2}"
       rk = "#{word2} #{word3}"
-      total = 0
-      hash = Hash.new(0)
-      if @chains.key? k
-        t2, h2 = @chains[k]
-        total += t2
-        hash.update h2
+      @chains_mutex.synchronize do
+        total = 0
+        hash = Hash.new(0)
+        if @chains.key? k
+          t2, h2 = @chains[k]
+          total += t2
+          hash.update h2
+        end
+        hash[word3] += 1
+        total += 1
+        @chains[k] = [total, hash]
       end
-      hash[word3] += 1
-      total += 1
-      @chains[k] = [total, hash]
-      # Reverse
-      total = 0
-      hash = Hash.new(0)
-      if @rchains.key? rk
-        t2, h2 = @rchains[rk]
-        total += t2
-        hash.update h2
+      @rchains_mutex.synchronize do
+        # Reverse
+        total = 0
+        hash = Hash.new(0)
+        if @rchains.key? rk
+          t2, h2 = @rchains[rk]
+          total += t2
+          hash.update h2
+        end
+        hash[word1] += 1
+        total += 1
+        @rchains[rk] = [total, hash]
       end
-      hash[word1] += 1
-      total += 1
-      @rchains[rk] = [total, hash]
   end
 
 
   def learn_line(message)
     # debug "learning #{message.inspect}"
-    wordlist = message.split(/\s+/).reject do |w|
+    wordlist = message.strip.split(/\s+/).reject do |w|
       @bot.config['markov.ignore_patterns'].map do |pat|
         w =~ Regexp.new(pat.to_s)
       end.select{|v| v}.size != 0
@@ -735,9 +749,10 @@ plugin.map 'markov enable', :action => "enable"
 plugin.map 'markov disable', :action => "disable"
 plugin.map 'markov status', :action => "status"
 plugin.map 'markov stats', :action => "stats"
-plugin.map 'chat about :seed1 [:seed2]', :action => "chat"
+plugin.map 'chat about :seed1 [:seed2]', :action => "chat", :defaults => {:seed2 => nil}
 plugin.map 'chat', :action => "rand_chat"
 plugin.map 'markov probability [:probability]', :action => "probability",
+           :defaults => {:probability => nil},
            :requirements => {:probability => /^\d+%?$/}
 plugin.map 'markov learn from :file [:testing [:lines lines]] [using pattern *pattern]', :action => "learn_from", :thread => true,
            :requirements => {