X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=lib%2Fredact%2Fredact.rb;h=6b505f28cee7daf61c92aa53a9362b2a10bb38e4;hb=18c7ac35df71363a579ac51d0d075a7161b22093;hp=4e1696cf24e7ea638a78fe005d49a49cf019269a;hpb=84d99c429aa1138961cb1c7b40ff2383b3c79e28;p=redact.git diff --git a/lib/redact/redact.rb b/lib/redact/redact.rb index 4e1696c..6b505f2 100644 --- a/lib/redact/redact.rb +++ b/lib/redact/redact.rb @@ -1,5 +1,5 @@ #-- -# $Id: redact.rb 31 2005-04-23 22:54:01Z 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: