redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#1353 doc preview

Browse Source
This commit is contained in:
Karel Pičman 2022-05-20 14:10:40 +02:00
parent 52ecb21478
commit d55915da46
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/dmsf_file.rb
View File

@ -519,12 +519,11 @@ class DmsfFile < ActiveRecord::Base
def pdf_preview def pdf_preview
return '' unless previewable? 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 begin
RedmineDmsf::Preview.generate last_revision.disk_file.to_s, target RedmineDmsf::Preview.generate last_revision&.disk_file.to_s, target
rescue => e 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 nil
end end
end end

3
lib/redmine_dmsf/preview.rb
View File

@ -50,9 +50,6 @@ module RedmineDmsf
dir = File.dirname(target) dir = File.dirname(target)
cmd = "#{shell_quote(OFFICE_BIN)} --convert-to pdf --headless --outdir #{shell_quote(dir)} #{shell_quote(source)}" cmd = "#{shell_quote(OFFICE_BIN)} --convert-to pdf --headless --outdir #{shell_quote(dir)} #{shell_quote(source)}"
if system(cmd) 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 target
else else
Rails.logger.error "Creating preview failed (#{$?}):\nCommand: #{cmd}" Rails.logger.error "Creating preview failed (#{$?}):\nCommand: #{cmd}"