diff options
| author | Ralph Amissah <ralph@amissah.com> | 2007-10-15 19:27:27 +0100 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2007-10-15 19:27:27 +0100 |
| commit | 7330cf6ae4fa17e3f6d9914ead719655ebbe590b (patch) | |
| tree | 1f7253a22872ca2501d7aefc2a48b9b2df65f7f4 /lib/sisu/v0/remote.rb | |
| parent | debian/control add depends on rsync (diff) | |
| parent | mostly the arrangement of conditionals (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v0/remote.rb')
| -rw-r--r-- | lib/sisu/v0/remote.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/sisu/v0/remote.rb b/lib/sisu/v0/remote.rb index 2a45e3cb..efa49dc0 100644 --- a/lib/sisu/v0/remote.rb +++ b/lib/sisu/v0/remote.rb @@ -113,7 +113,7 @@ module SiSU_Remote require 'open-uri' require 'pp' require "#{SiSU_lib}/composite" - @rgx_image=/\{\s*(\S+?\.(?:png|jpg|gif))/ + @rgx_image=/(?:^|[^_\\])\{\s*(\S+?\.(?:png|jpg|gif))/ @rgx_skin=/(?:0~|@)skin:?\s+(\S+)/ #@rgx_skin=/^0~skin\s+(\S+)/ threads=[] for requested_page in @get_s @@ -133,10 +133,12 @@ module SiSU_Remote images << r.scan(@rgx_image).uniq if r =~@rgx_image downloaded_file << r end - if skin and skin.length > 0 + if skin \ + and skin.length > 0 SiSU_Assemble::Remote_image.new.download_doc_skin(skin) end - if images and images.length > 1 + if images \ + and images.length > 1 images.flatten!.uniq! @msg,@msgs='downloading images:', [ images.join(',') ] @tell.call.warn unless @opt.cmd =~/q/ |