From d55915da461766b094d9866d09d118992109139b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= <karel.picman@kontron.com>
Date: Fri, 20 May 2022 14:10:40 +0200
Subject: [PATCH] #1353 doc preview

---
 app/models/dmsf_file.rb     | 7 +++----
 lib/redmine_dmsf/preview.rb | 3 ---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb
index 7c1e63c9..38c39748 100644
--- a/app/models/dmsf_file.rb
+++ b/app/models/dmsf_file.rb
@@ -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
diff --git a/lib/redmine_dmsf/preview.rb b/lib/redmine_dmsf/preview.rb
index b861e9a6..87748fc2 100644
--- a/lib/redmine_dmsf/preview.rb
+++ b/lib/redmine_dmsf/preview.rb
@@ -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}"