diff --git a/app/controllers/dmsf_files_controller.rb b/app/controllers/dmsf_files_controller.rb index 2e200716..6504120c 100644 --- a/app/controllers/dmsf_files_controller.rb +++ b/app/controllers/dmsf_files_controller.rb @@ -141,7 +141,6 @@ class DmsfFilesController < ApplicationController revision.size = upload.size revision.disk_filename = revision.new_storage_filename revision.mime_type = upload.mime_type - revision.digest = upload.digest revision.file.attach( io: File.open(upload.tempfile_path), filename: revision.disk_filename, @@ -153,7 +152,6 @@ class DmsfFilesController < ApplicationController revision.size = last_revision.size revision.disk_filename = last_revision.disk_filename revision.mime_type = last_revision.mime_type - revision.digest = last_revision.digest end # Custom fields revision.copy_custom_field_values(params[:dmsf_file_revision][:custom_field_values], last_revision) diff --git a/app/controllers/dmsf_upload_controller.rb b/app/controllers/dmsf_upload_controller.rb index 97159471..022f5d77 100644 --- a/app/controllers/dmsf_upload_controller.rb +++ b/app/controllers/dmsf_upload_controller.rb @@ -49,7 +49,6 @@ class DmsfUploadController < ApplicationController @uploads.push upload params[:committed_files][key][:disk_filename] = upload.disk_filename - params[:committed_files][key][:digest] = upload.digest params[:committed_files][key][:tempfile_path] = upload.tempfile_path end commit_files if params[:committed_files].present? diff --git a/app/helpers/dmsf_upload_helper.rb b/app/helpers/dmsf_upload_helper.rb index 21757c7f..550da8d0 100644 --- a/app/helpers/dmsf_upload_helper.rb +++ b/app/helpers/dmsf_upload_helper.rb @@ -70,7 +70,6 @@ module DmsfUploadHelper end new_revision.mime_type = committed_file[:mime_type] new_revision.size = committed_file[:size] - new_revision.digest = committed_file[:digest] # Custom fields new_revision.copy_custom_field_values(committed_file[:custom_field_values]) # Need to save file first to generate id for it in case of creation. diff --git a/app/models/dmsf_file_revision.rb b/app/models/dmsf_file_revision.rb index 88576dad..0bf731ab 100644 --- a/app/models/dmsf_file_revision.rb +++ b/app/models/dmsf_file_revision.rb @@ -114,6 +114,10 @@ class DmsfFileRevision < ApplicationRecord shared_file end + def checksum + file.blob.checksum + end + def visible?(_user = nil) deleted == STATUS_ACTIVE end @@ -237,7 +241,6 @@ class DmsfFileRevision < ApplicationRecord new_revision.source_revision = self new_revision.user = User.current new_revision.name = name - new_revision.digest = digest new_revision end @@ -322,7 +325,6 @@ class DmsfFileRevision < ApplicationRecord content_type: mime_type, identify: false ) - self.digest = file.blob.checksum end # Overrides Redmine::Acts::Customizable::InstanceMethods#available_custom_fields @@ -360,20 +362,6 @@ class DmsfFileRevision < ApplicationRecord format2 end - def create_digest - self.digest = Digest::SHA256.file(path).hexdigest - rescue StandardError => e - Rails.logger.error e.message - self.digest = 0 - end - - # Returns either MD5 or SHA256 depending on the way self.digest was computed - def digest_type - return nil if digest.blank? - - digest.size < 64 ? 'MD5' : 'SHA256' - end - def tooltip text = description.presence || +'' if comment.present? diff --git a/app/models/dmsf_upload.rb b/app/models/dmsf_upload.rb index f1818340..fe136be5 100644 --- a/app/models/dmsf_upload.rb +++ b/app/models/dmsf_upload.rb @@ -20,7 +20,7 @@ # Upload class DmsfUpload attr_accessor :name, :disk_filename, :mime_type, :title, :description, :comment, :major_version, :minor_version, - :patch_version, :locked, :workflow, :custom_values, :tempfile_path, :digest, :token + :patch_version, :locked, :workflow, :custom_values, :tempfile_path, :token attr_reader :size def disk_file @@ -36,8 +36,7 @@ class DmsfUpload original_filename: a.filename, comment: uploaded_file[:description], tempfile_path: a.diskfile, - token: uploaded_file[:token], - digest: a.digest + token: uploaded_file[:token] } DmsfUpload.new project, folder, uploaded else diff --git a/app/views/dmsf_files/show.html.erb b/app/views/dmsf_files/show.html.erb index f8138ba2..8b80290d 100644 --- a/app/views/dmsf_files/show.html.erb +++ b/app/views/dmsf_files/show.html.erb @@ -135,10 +135,10 @@ <%= content_tag :div, l(:label_mime), class: 'label' %> <%= content_tag :div, revision.mime_type, class: 'value' %> - <% if revision.digest.present? %> + <% if revision.checksum.present? %>