Fixed fontdir handling.

[redact.git] / lib / redact / redact.rb

diff --git a/lib/redact/redact.rb b/lib/redact/redact.rb
index 7417c92467e21f01a934369056c97716e7b4d10d..6b505f28cee7daf61c92aa53a9362b2a10bb38e4 100644 (file)
--- a/lib/redact/redact.rb
+++ b/lib/redact/redact.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: redact.rb 28 2005-04-14 19:53:45Z tilman $
+# $Id: redact.rb 45 2005-06-08 18:02:12Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -57,7 +57,7 @@ class String
 end
 
 module Redact
-       VERSION = "0.1.0"
+       VERSION = "0.1.1"
 
        class RedactError < StandardError; end
 
@@ -179,7 +179,7 @@ module Redact
                attr_reader :filename, :image, :id
 
                def initialize(filename)
-                       @filename = filename.to_str.dup.freeze
+                       @filename = find_image(filename.to_str).freeze
                        @image = Imlib2::Image.load(@filename)
                        @id = -1
                        @source_type = 1 # COMP
@@ -207,6 +207,16 @@ module Redact
                         "source_param" => [@source_param],
                         "id" => [@id]}
                end
+
+               private
+               def find_image(file)
+                       [".", OPTIONS.image_dir].each do |d|
+                               f2 = File.join(d, file)
+                               return f2 if File.file?(f2)
+                       end
+
+                       nil
+               end
        end
 
        class CollectionDirectory < Array # :nodoc:
@@ -273,7 +283,7 @@ module Redact
                                        ImagePart
                                else
                                        raise(ArgumentError,
-                                             "invalid program type - #{type.to_s}")
+                                             "invalid part type - #{type.to_s}")
                                end
 
                                p = klass.new(self, @parts.size, name)