scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-07 15:33:50 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #134 from mz3944/mz_delete_step_file_fix

Browse source 
Fixes files deletion when rails worker is running [fixes SCI-411] and…
This commit is contained in:
mz3944 2016-09-07 11:00:50 +02:00 committed by GitHub
commit 5f446ab1f0
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/models/asset.rb
View file

@ -141,6 +141,10 @@ class Asset < ActiveRecord::Base
!(self.file.content_type =~ /^image/).nil? !(self.file.content_type =~ /^image/).nil?
end end
def text?
TEXT_EXTRACT_FILE_TYPES.any? { |v| file_content_type.start_with? v }
end
# TODO: get the current_user # TODO: get the current_user
# before_save do # before_save do
# if current_user # if current_user
@ -158,7 +162,7 @@ class Asset < ActiveRecord::Base
self.update(file_present: true) self.update(file_present: true)
# Extract asset text if it's of correct type # Extract asset text if it's of correct type
if TEXT_EXTRACT_FILE_TYPES.any? { |v| file_content_type.start_with? v } if text?
Rails.logger.info "Asset #{id}: Creating extract text job" Rails.logger.info "Asset #{id}: Creating extract text job"
# The extract_asset_text also includes # The extract_asset_text also includes
# estimated size calculation # estimated size calculation
@ -215,13 +219,19 @@ class Asset < ActiveRecord::Base
# this automatically, so this is not needed in such cases) # this automatically, so this is not needed in such cases)
key = file.path[1..-1] key = file.path[1..-1]
S3_BUCKET.object(key).delete S3_BUCKET.object(key).delete
Rails.logger.info "Asset #{id} (original): Asset file "\
"successfully deleted from S3 (" + key.to_s + ')'
if (file_content_type =~ %r{^image\/}) == 0 if (file_content_type =~ %r{^image\/}) == 0
file.options[:styles].each do |style| file.options[:styles].each do |style, _|
key = file.path(style)[1..-1] key = file.path(style)[1..-1]
S3_BUCKET.object(key).delete S3_BUCKET.object(key).delete
Rails.logger.info "Asset #{id} (" + style.to_s + '): Asset file '\
'successfully deleted from S3 (' + key.to_s + ')'
end end
end end
report_elements.destroy_all report_elements.destroy_all
asset_text_datum.destroy if asset_text_datum.present?
delete delete
end end

2
app/models/asset_text_datum.rb
View file

@ -3,7 +3,7 @@ class AssetTextDatum < ActiveRecord::Base
validates :data, presence: true validates :data, presence: true
validates :asset, presence: true, uniqueness: true validates :asset, presence: true, uniqueness: true
belongs_to :asset belongs_to :asset, inverse_of: :asset_text_datum
after_save :update_ts_index after_save :update_ts_index

3
app/models/result_asset.rb
View file

@ -2,8 +2,7 @@ class ResultAsset < ActiveRecord::Base
validates :result, :asset, presence: true validates :result, :asset, presence: true
belongs_to :result, inverse_of: :result_asset belongs_to :result, inverse_of: :result_asset
belongs_to :asset, inverse_of: :result_asset, belongs_to :asset, inverse_of: :result_asset, dependent: :destroy
dependent: :destroy
def space_taken def space_taken
asset.present? ? asset.estimated_size : 0 asset.present? ? asset.estimated_size : 0