reaction: fix trigger regex to work with non-alphanumeric start/end.

[user/henk/code/ruby/rbot.git] / lib / rbot / registry.rb

diff --git a/lib/rbot/registry.rb b/lib/rbot/registry.rb
index 41f9747f1801d96664a032afed2559d85c2c8853..4d52bff22e35d501764f73c8ef19fff0e4d75728 100644 (file)
--- a/lib/rbot/registry.rb
+++ b/lib/rbot/registry.rb
@@ -16,30 +16,30 @@ class Bot
     # NB this function is called _early_ in init(), pretty much all you have to
     # work with is @bot.botclass.
     def upgrade_data
-      if File.exist?("#{@bot.botclass}/registry.db")
+      oldreg = @bot.path 'registry.db'
+      newreg = @bot.path 'plugin_registry.db'
+      if File.exist?(oldreg)
         log _("upgrading old-style (rbot 0.9.5 or earlier) plugin registry to new format")
-        old = BDB::Hash.open("#{@bot.botclass}/registry.db", nil,
-                             "r+", 0600)
-        new = BDB::CIBtree.open("#{@bot.botclass}/plugin_registry.db", nil,
-                                BDB::CREATE | BDB::EXCL,
-                                0600)
+        old = BDB::Hash.open(oldreg, nil, "r+", 0600)
+        new = BDB::CIBtree.open(newreg, nil, BDB::CREATE | BDB::EXCL, 0600)
         old.each {|k,v|
           new[k] = v
         }
         old.close
         new.close
-        File.rename("#{@bot.botclass}/registry.db", "#{@bot.botclass}/registry.db.old")
+        File.rename(oldreg, oldreg + ".old")
       end
     end
 
     def upgrade_data2
-      if File.exist?("#{@bot.botclass}/plugin_registry.db")
-        Dir.mkdir("#{@bot.botclass}/registry") unless File.exist?("#{@bot.botclass}/registry")
-        env = BDB::Env.open("#{@bot.botclass}", BDB::INIT_TRANSACTION | BDB::CREATE | BDB::RECOVER)# | BDB::TXN_NOSYNC)
+      oldreg = @bot.path 'plugin_registry.db'
+      newdir = @bot.path 'registry'
+      if File.exist?(oldreg)
+        Dir.mkdir(newdir) unless File.exist?(newdir)
+        env = BDB::Env.open(@bot.botclass, BDB::INIT_TRANSACTION | BDB::CREATE | BDB::RECOVER)# | BDB::TXN_NOSYNC)
         dbs = Hash.new
         log _("upgrading previous (rbot 0.9.9 or earlier) plugin registry to new split format")
-        old = BDB::CIBtree.open("#{@bot.botclass}/plugin_registry.db", nil,
-          "r+", 0600, "env" => env)
+        old = BDB::CIBtree.open(oldreg, nil, "r+", 0600, "env" => env)
         old.each {|k,v|
           prefix,key = k.split("/", 2)
           prefix.downcase!
@@ -64,7 +64,7 @@ class Bot
           dbs[prefix][key] = v
         }
         old.close
-        File.rename("#{@bot.botclass}/plugin_registry.db", "#{@bot.botclass}/plugin_registry.db.old")
+        File.rename(oldreg, oldreg + ".old")
         dbs.each {|k,v|
           log _("closing db #{k}")
           v.close
@@ -100,7 +100,7 @@ class Bot
   #   blah = @registry[:blah]
   #   blah[:foo] = "flump"
   #   @registry[:blah] = blah
-
+  #
   # If you don't need to store objects, and strictly want a persistant hash of
   # strings, you can override the store/restore methods to suit your needs, for
   # example (in your plugin):
@@ -126,7 +126,7 @@ class Bot
     def initialize(bot, name)
       @bot = bot
       @name = name.downcase
-      @filename = "#{@bot.botclass}/registry/#{@name}"
+      @filename = @bot.path 'registry', @name
       dirs = File.dirname(@filename).split("/")
       dirs.length.times { |i|
         dir = dirs[0,i+1].join("/")+"/"
@@ -216,29 +216,29 @@ class Bot
     end
 
     def default
-      @default && (@default.dup rescue default)
+      @default && (@default.dup rescue @default)
     end
 
     # just like Hash#each
-    def each(&block)
+    def each(set=nil, bulk=0, &block)
       return nil unless File.exist?(@filename)
-      registry.each {|key,value|
+      registry.each(set, bulk) {|key,value|
         block.call(key, restore(value))
       }
     end
 
     # just like Hash#each_key
-    def each_key(&block)
+    def each_key(set=nil, bulk=0, &block)
       return nil unless File.exist?(@filename)
-      registry.each {|key, value|
+      registry.each_key(set, bulk) {|key|
         block.call(key)
       }
     end
 
     # just like Hash#each_value
-    def each_value(&block)
+    def each_value(set=nil, bulk=0, &block)
       return nil unless File.exist?(@filename)
-      registry.each {|key, value|
+      registry.each_value(set, bulk) { |value|
         block.call(restore(value))
       }
     end