#1353 doc preview
This commit is contained in:
parent
52ecb21478
commit
d55915da46
@ -519,12 +519,11 @@ class DmsfFile < ActiveRecord::Base
|
||||
|
||||
def pdf_preview
|
||||
return '' unless previewable?
|
||||
target = File.join(DmsfFile.previews_storage_path, "#{id}_#{last_revision.digest}.pdf")
|
||||
|
||||
target = File.join(DmsfFile.previews_storage_path, "#{File.basename(last_revision&.disk_file.to_s, '.*')}.pdf")
|
||||
begin
|
||||
RedmineDmsf::Preview.generate last_revision.disk_file.to_s, target
|
||||
RedmineDmsf::Preview.generate last_revision&.disk_file.to_s, target
|
||||
rescue => e
|
||||
Rails.logger.error "An error occured while generating preview for #{last_revision.disk_file} to #{target}\nException was: #{e.message}"
|
||||
Rails.logger.error "An error occurred while generating preview for #{last_revision&.disk_file} to #{target}\nException was: #{e.message}"
|
||||
nil
|
||||
end
|
||||
end
|
||||
|
||||
@ -50,9 +50,6 @@ module RedmineDmsf
|
||||
dir = File.dirname(target)
|
||||
cmd = "#{shell_quote(OFFICE_BIN)} --convert-to pdf --headless --outdir #{shell_quote(dir)} #{shell_quote(source)}"
|
||||
if system(cmd)
|
||||
source_filename = File.basename(source, '.*')
|
||||
target_filename = File.basename(target)
|
||||
FileUtils.mv File.join(dir, "#{source_filename}.pdf"), File.join(dir, target_filename)
|
||||
target
|
||||
else
|
||||
Rails.logger.error "Creating preview failed (#{$?}):\nCommand: #{cmd}"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user