summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2020-11-05 13:42:08 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2020-11-05 13:42:08 +0000
commitacf30c8c5b185a95304c9dd12828d21a4345e6e6 (patch)
tree53d6cb8f0dcceee68b7796b8a6c9da4db29f631e /lib
parent3758b91e5493a9c55de174f5ea1c6a0ac2a864ca (diff)
downloadredmine-acf30c8c5b185a95304c9dd12828d21a4345e6e6.tar.gz
redmine-acf30c8c5b185a95304c9dd12828d21a4345e6e6.zip
add empty line after guard clause to lib/redmine/thumbnail.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@20261 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r--lib/redmine/thumbnail.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/redmine/thumbnail.rb b/lib/redmine/thumbnail.rb
index b3507ba68..9455e918e 100644
--- a/lib/redmine/thumbnail.rb
+++ b/lib/redmine/thumbnail.rb
@@ -32,6 +32,7 @@ module Redmine
def self.generate(source, target, size, is_pdf = false)
return nil unless convert_available?
return nil if is_pdf && !gs_available?
+
unless File.exists?(target)
mime_type = File.open(source) {|f| MimeMagic.by_magic(f).try(:type) }
return nil if mime_type.nil?
@@ -42,6 +43,7 @@ module Redmine
unless File.open(source) {|f| ALLOWED_TYPES.include? MimeMagic.by_magic(f).try(:type) }
return nil
end
+
directory = File.dirname(target)
unless File.exists?(directory)
FileUtils.mkdir_p directory
@@ -63,6 +65,7 @@ module Redmine
def self.convert_available?
return @convert_available if defined?(@convert_available)
+
begin
`#{shell_quote CONVERT_BIN} -version`
@convert_available = $?.success?