chucknorris: fix loading

[user/henk/code/ruby/rbot.git] / lib / rbot / core / utils / wordlist.rb

diff --git a/lib/rbot/core/utils/wordlist.rb b/lib/rbot/core/utils/wordlist.rb
old mode 100755 (executable)
new mode 100644 (file)
index fc34157..339a321
--- a/lib/rbot/core/utils/wordlist.rb
+++ b/lib/rbot/core/utils/wordlist.rb
@@ -10,14 +10,11 @@ require "find"
 module ::Irc
 class Bot
 class Wordlist
-  def self.wordlist_base
-    @@wordlist_base ||= File.join(Utils.bot.botclass, 'wordlists')
-  end
-
-  def self.get(path, options={})
+  def self.get(bot, where, options={})
+    wordlist_base = bot.path('wordlists')
     opts = { :spaces => false }.merge(options)
 
-    wordlist_path = File.join(wordlist_base, path)
+    wordlist_path = File.join(wordlist_base, where)
     raise "wordlist not found: #{wordlist_path}" unless File.exist?(wordlist_path)
 
     # Location is a directory -> combine all lists beneath it
@@ -44,21 +41,23 @@ class Wordlist
   # Return an array with the list of available wordlists.
   # Available options:
   # pattern:: pattern that should be matched by the wordlist filename
-  def self.list(options={})
+  def self.list(bot, options={})
+    wordlist_base = bot.path('wordlists')
     pattern = options[:pattern] || "**"
     # refuse patterns that contain ../
     return [] if pattern =~ /\.\.\//
-    striplen = self.wordlist_base.length+1
-    Dir.glob(File.join(self.wordlist_base, pattern)).map { |name|
+    striplen = wordlist_base.length+1
+    Dir.glob(File.join(wordlist_base, pattern)).map { |name|
       name[striplen..-1]
     }
   end
 
-  def self.exist?(path)
+  def self.exist?(bot, path)
+    wordlist_base = bot.path('wordlists')
     fn = path.to_s
     # refuse to check outside of the wordlist base directory
     return false if fn =~ /\.\.\//
-    File.exist?(File.join(self.wordlist_base, fn))
+    File.exist?(File.join(wordlist_base, fn))
   end
 
 end