X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Frbot%2Fcore%2Futils%2Fwordlist.rb;h=339a3219383a934bf0db5003a26947d3893705c9;hb=56e4713c5c0498838ed77a409e44fbc3251acde2;hp=23e141ac3b32497941b09f5fb5a7471e992ce176;hpb=0bf6eabdddddafecc42d56eaae1e0db35413390f;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/lib/rbot/core/utils/wordlist.rb b/lib/rbot/core/utils/wordlist.rb
old mode 100755
new mode 100644
index 23e141ac..339a3219
--- 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
@@ -33,12 +30,36 @@ class Wordlist
       File.readlines(wordlist_path)
     end
 
-    wordlist.map! { |l| l.strip }
+    # wordlists are assumed to be UTF-8, but we need to strip the BOM, if present
+    wordlist.map! { |l| l.sub("\xef\xbb\xbf",'').strip }
     wordlist.reject do |word|
       word =~ /\s/ && !opts[:spaces] ||
       word.empty?
     end
   end
+
+  # Return an array with the list of available wordlists.
+  # Available options:
+  # pattern:: pattern that should be matched by the wordlist filename
+  def self.list(bot, options={})
+    wordlist_base = bot.path('wordlists')
+    pattern = options[:pattern] || "**"
+    # refuse patterns that contain ../
+    return [] if pattern =~ /\.\.\//
+    striplen = wordlist_base.length+1
+    Dir.glob(File.join(wordlist_base, pattern)).map { |name|
+      name[striplen..-1]
+    }
+  end
+
+  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(wordlist_base, fn))
+  end
+
+end
 end
 end
-end
\ No newline at end of file