* apparently, synthetic privmsgs for remotectl are hard. may need some massive rework...

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

diff --git a/lib/rbot/registry.rb b/lib/rbot/registry.rb
index d86850d41fc2037b1f4536c4e71ec99c1d124e71..4cb1c53f7add720ab34a0a9a7dcf587d84b8ec7b 100644 (file)
--- a/lib/rbot/registry.rb
+++ b/lib/rbot/registry.rb
@@ -27,14 +27,14 @@ module Irc
         }
         old.close
         new.close
-        File.delete("#{@bot.botclass}/registry.db")
+        File.rename("#{@bot.botclass}/registry.db", "#{@bot.botclass}/registry.db.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)
+        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,
@@ -131,18 +131,26 @@ module Irc
           Dir.mkdir(dir) 
         end
       }
-      @registry = DBTree.new bot, "registry/#{@name}"
+      @registry = nil
       @default = nil
       # debug "initializing registry accessor with name #{@name}"
     end
 
+    def registry
+        @registry ||= DBTree.new @bot, "registry/#{@name}"
+    end
+
     def flush
-      @registry.flush
-      @registry.sync
+      # debug "fushing registry #{registry}"
+      return if !@registry
+      registry.flush
+      registry.sync
     end
 
     def close
-      @registry.close
+      # debug "closing registry #{registry}"
+      return if !@registry
+      registry.close
     end
 
     # convert value to string form for storing in the registry
@@ -184,8 +192,8 @@ module Irc
 
     # lookup a key in the registry
     def [](key)
-      if @registry.has_key?(key)
-        return restore(@registry[key])
+      if registry.has_key?(key)
+        return restore(registry[key])
       elsif @default != nil
         return restore(@default)
       else
@@ -195,7 +203,7 @@ module Irc
 
     # set a key in the registry
     def []=(key,value)
-      @registry[key] = store(value)
+      registry[key] = store(value)
     end
 
     # set the default value for registry lookups, if the key sought is not
@@ -206,45 +214,45 @@ module Irc
 
     # just like Hash#each
     def each(&block)
-      @registry.each {|key,value|
+      registry.each {|key,value|
         block.call(key, restore(value))
       }
     end
 
     # just like Hash#each_key
     def each_key(&block)
-      @registry.each {|key, value|
+      registry.each {|key, value|
         block.call(key)
       }
     end
 
     # just like Hash#each_value
     def each_value(&block)
-      @registry.each {|key, value|
+      registry.each {|key, value|
         block.call(restore(value))
       }
     end
 
     # just like Hash#has_key?
     def has_key?(key)
-      return @registry.has_key?(key)
+      return registry.has_key?(key)
     end
     alias include? has_key?
     alias member? has_key?
 
     # just like Hash#has_both?
     def has_both?(key, value)
-      return @registry.has_both?(key, store(value))
+      return registry.has_both?(key, store(value))
     end
 
     # just like Hash#has_value?
     def has_value?(value)
-      return @registry.has_value?(store(value))
+      return registry.has_value?(store(value))
     end
 
     # just like Hash#index?
     def index(value)
-      ind = @registry.index(store(value))
+      ind = registry.index(store(value))
       if ind
         return ind
       else
@@ -254,18 +262,18 @@ module Irc
 
     # delete a key from the registry
     def delete(key)
-      return @registry.delete(key)
+      return registry.delete(key)
     end
 
     # returns a list of your keys
     def keys
-      return @registry.keys
+      return registry.keys
     end
 
     # Return an array of all associations [key, value] in your namespace
     def to_a
       ret = Array.new
-      @registry.each {|key, value|
+      registry.each {|key, value|
         ret << [key, restore(value)]
       }
       return ret
@@ -274,7 +282,7 @@ module Irc
     # Return an hash of all associations {key => value} in your namespace
     def to_hash
       ret = Hash.new
-      @registry.each {|key, value|
+      registry.each {|key, value|
         ret[key] = restore(value)
       }
       return ret
@@ -282,7 +290,7 @@ module Irc
 
     # empties the registry (restricted to your namespace)
     def clear
-      @registry.clear
+      registry.clear
     end
     alias truncate clear
 
@@ -296,7 +304,7 @@ module Irc
     end
 
     def sub_registry(prefix)
-      return BotRegistryAccessor.new(@bot, @name + "/" + prefix)
+      return BotRegistryAccessor.new(@bot, @name + "/" + prefix.to_s)
     end
 
     # returns the number of keys in your registry namespace