##// END OF EJS Templates
Removed debug message....
Jean-Philippe Lang -
r9832:c3c7f1f900b1
parent child
Show More
@@ -1,56 +1,55
1 # Redmine - project management software
1 # Redmine - project management software
2 # Copyright (C) 2006-2012 Jean-Philippe Lang
2 # Copyright (C) 2006-2012 Jean-Philippe Lang
3 #
3 #
4 # This program is free software; you can redistribute it and/or
4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License
5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2
6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version.
7 # of the License, or (at your option) any later version.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU General Public License
14 # You should have received a copy of the GNU General Public License
15 # along with this program; if not, write to the Free Software
15 # along with this program; if not, write to the Free Software
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17
17
18 require 'fileutils'
18 require 'fileutils'
19
19
20 module Redmine
20 module Redmine
21 module Thumbnail
21 module Thumbnail
22 extend Redmine::Utils::Shell
22 extend Redmine::Utils::Shell
23
23
24 CONVERT_BIN = (Redmine::Configuration['imagemagick_convert_command'] || 'convert').freeze
24 CONVERT_BIN = (Redmine::Configuration['imagemagick_convert_command'] || 'convert').freeze
25
25
26 # Generates a thumbnail for the source image to target
26 # Generates a thumbnail for the source image to target
27 def self.generate(source, target, size)
27 def self.generate(source, target, size)
28 return nil unless convert_available?
28 return nil unless convert_available?
29 unless File.exists?(target)
29 unless File.exists?(target)
30 directory = File.dirname(target)
30 directory = File.dirname(target)
31 unless File.exists?(directory)
31 unless File.exists?(directory)
32 FileUtils.mkdir_p directory
32 FileUtils.mkdir_p directory
33 end
33 end
34 size_option = "#{size}x#{size}>"
34 size_option = "#{size}x#{size}>"
35 cmd = "#{shell_quote CONVERT_BIN} #{shell_quote source} -thumbnail #{shell_quote size_option} #{shell_quote target}"
35 cmd = "#{shell_quote CONVERT_BIN} #{shell_quote source} -thumbnail #{shell_quote size_option} #{shell_quote target}"
36 unless system(cmd)
36 unless system(cmd)
37 logger.error("Creating thumbnail failed (#{$?}):\nCommand: #{cmd}")
37 logger.error("Creating thumbnail failed (#{$?}):\nCommand: #{cmd}")
38 return nil
38 return nil
39 end
39 end
40 end
40 end
41 target
41 target
42 end
42 end
43
43
44 def self.convert_available?
44 def self.convert_available?
45 return @convert_available if defined?(@convert_available)
45 return @convert_available if defined?(@convert_available)
46 logger.warn("testing for convert...")
47 @convert_available = system("#{shell_quote CONVERT_BIN} -version") rescue false
46 @convert_available = system("#{shell_quote CONVERT_BIN} -version") rescue false
48 logger.warn("Imagemagick's convert binary (#{CONVERT_BIN}) not available") unless @convert_available
47 logger.warn("Imagemagick's convert binary (#{CONVERT_BIN}) not available") unless @convert_available
49 @convert_available
48 @convert_available
50 end
49 end
51
50
52 def self.logger
51 def self.logger
53 Rails.logger
52 Rails.logger
54 end
53 end
55 end
54 end
56 end
55 end
General Comments 0
You need to be logged in to leave comments. Login now