geoip plugin: added nick based network-wide lookup and fixed some charset issues

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

diff --git a/lib/rbot/registry.rb b/lib/rbot/registry.rb
index 358c80d68e0b30acd178627724b2de68b58ac508..b85a622426de23442a71b5039e144c4051ce3f3b 100644 (file)
--- a/lib/rbot/registry.rb
+++ b/lib/rbot/registry.rb
@@ -126,7 +126,8 @@ class Bot
     def initialize(bot, name)
       @bot = bot
       @name = name.downcase
-      dirs = File.dirname("#{@bot.botclass}/registry/#{@name}").split("/")
+      @filename = "#{@bot.botclass}/registry/#{@name}"
+      dirs = File.dirname(@filename).split("/")
       dirs.length.times { |i|
         dir = dirs[0,i+1].join("/")+"/"
         unless File.exist?(dir)
@@ -134,6 +135,7 @@ class Bot
           Dir.mkdir(dir)
         end
       }
+      @filename << ".db"
       @registry = nil
       @default = nil
       @recovery = nil
@@ -189,26 +191,16 @@ class Bot
             debug ee
           end
         end
-        unless @default.nil?
-          begin
-            return Marshal.restore(@default)
-          rescue
-            return nil
-          end
-        else
-          return nil
-        end
+        return default
       end
     end
 
     # lookup a key in the registry
     def [](key)
-      if registry.has_key?(key)
+      if File.exist?(@filename) && registry.has_key?(key)
         return restore(registry[key])
-      elsif @default != nil
-        return restore(@default)
       else
-        return nil
+        return default
       end
     end
 
@@ -220,11 +212,16 @@ class Bot
     # set the default value for registry lookups, if the key sought is not
     # found, the default will be returned. The default default (har) is nil.
     def set_default (default)
-      @default = store(default)
+      @default = default
+    end
+
+    def default
+      @default && (@default.dup rescue @default)
     end
 
     # just like Hash#each
     def each(&block)
+      return nil unless File.exist?(@filename)
       registry.each {|key,value|
         block.call(key, restore(value))
       }
@@ -232,6 +229,7 @@ class Bot
 
     # just like Hash#each_key
     def each_key(&block)
+      return nil unless File.exist?(@filename)
       registry.each {|key, value|
         block.call(key)
       }
@@ -239,6 +237,7 @@ class Bot
 
     # just like Hash#each_value
     def each_value(&block)
+      return nil unless File.exist?(@filename)
       registry.each {|key, value|
         block.call(restore(value))
       }
@@ -246,23 +245,28 @@ class Bot
 
     # just like Hash#has_key?
     def has_key?(key)
+      return false unless File.exist?(@filename)
       return registry.has_key?(key)
     end
     alias include? has_key?
     alias member? has_key?
+    alias key? has_key?
 
     # just like Hash#has_both?
     def has_both?(key, value)
+      return false unless File.exist?(@filename)
       return registry.has_both?(key, store(value))
     end
 
     # just like Hash#has_value?
     def has_value?(value)
+      return false unless File.exist?(@filename)
       return registry.has_value?(store(value))
     end
 
     # just like Hash#index?
     def index(value)
+      return nil unless File.exist?(@filename)
       ind = registry.index(store(value))
       if ind
         return ind
@@ -273,16 +277,19 @@ class Bot
 
     # delete a key from the registry
     def delete(key)
+      return default unless File.exist?(@filename)
       return registry.delete(key)
     end
 
     # returns a list of your keys
     def keys
+      return [] unless File.exist?(@filename)
       return registry.keys
     end
 
     # Return an array of all associations [key, value] in your namespace
     def to_a
+      return [] unless File.exist?(@filename)
       ret = Array.new
       registry.each {|key, value|
         ret << [key, restore(value)]
@@ -292,6 +299,7 @@ class Bot
 
     # Return an hash of all associations {key => value} in your namespace
     def to_hash
+      return {} unless File.exist?(@filename)
       ret = Hash.new
       registry.each {|key, value|
         ret[key] = restore(value)
@@ -301,12 +309,14 @@ class Bot
 
     # empties the registry (restricted to your namespace)
     def clear
+      return true unless File.exist?(@filename)
       registry.clear
     end
     alias truncate clear
 
     # returns an array of the values in your namespace of the registry
     def values
+      return [] unless File.exist?(@filename)
       ret = Array.new
       self.each {|k,v|
         ret << restore(v)