Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions app/services/sync_service/assets.rb
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def ensure_directory_structure(isilon_path)
directories = all_directories[0...-1]
return true if directories.empty?

volume = Volume.find_by(name: @parent_volume.name)
volume = @parent_volume

(directories.size).downto(0) do |i|
if directories.present?
Expand Down Expand Up @@ -140,17 +140,21 @@ def fallback_individual_saves(assets_to_create)
end

def set_full_path(path)
volume_segment = [ "/", @parent_volume.name ].join
path.gsub(volume_segment, "")
segments = path.to_s.split("/").reject(&:blank?)
return "/" if segments.size <= 1

"/" + segments[1..].join("/")
end

def check_volume(path)
first_row = CSV.read(path, headers: true).first
volume = first_row["Path"].split("/").compact_blank[0]

if Volume.exists?(name: volume)
stdout_and_log("Volume #{volume} already exists.")
Volume.find_by(name: volume)
existing_volume = find_volume_case_insensitive(volume)

if existing_volume
stdout_and_log("Volume #{existing_volume.name} already exists.")
existing_volume
else
new_volume = Volume.create!(name: volume)
begin
Expand Down Expand Up @@ -178,6 +182,10 @@ def get_asset_parent_id(path)
find_or_create_folder_safely(@parent_volume.id, "/#{path}")
end

def find_volume_case_insensitive(name)
Volume.where("LOWER(name) = ?", name.to_s.downcase).first
end

def find_or_create_folder_safely(volume_id, full_path)
retry_count = 0
max_retries = 3
Expand Down
17 changes: 16 additions & 1 deletion app/services/sync_service/tiffs.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,18 @@ def self.call(volume_name: nil)
new(volume_name: volume_name).process
end

ALLOWED_VOLUME_NAMES = %w[Deposit Media-Repository].freeze

def initialize(volume_name: nil)
@volume_name = volume_name
@log = Logger.new("log/isilon-post-processing.log")
@stdout = Logger.new($stdout)

if @volume_name
@parent_volume = Volume.find_by(name: @volume_name)
validate_volume_name!(@volume_name)
@parent_volume = find_volume_case_insensitive(@volume_name)
raise ArgumentError, "Volume '#{@volume_name}' not found" unless @parent_volume
@volume_name = @parent_volume.name
else
@parent_volume = nil # Will process all volumes
end
Expand Down Expand Up @@ -238,5 +242,16 @@ def stdout_and_log(message, level: :info)
@log.send(level, message)
@stdout.send(level, message)
end

def validate_volume_name!(name)
return if ALLOWED_VOLUME_NAMES.any? { |allowed| allowed.casecmp?(name.to_s) }

allowed_display = ALLOWED_VOLUME_NAMES.join(", ")
raise ArgumentError, "Volume '#{name}' is not supported. Use one of: #{allowed_display}"
end

def find_volume_case_insensitive(name)
Volume.where("LOWER(name) = ?", name.to_s.downcase).first
end
end
end
14 changes: 8 additions & 6 deletions lib/tasks/isilon_import.rake
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,28 @@ namespace :sync do

desc "Process TIFF files for deduplication"
task :tiffs, [ :volume_name ] => :environment do |_t, args|
unless args[:volume_name]
requested_volume = args[:volume_name].to_s

if requested_volume.blank?
puts "Error: volume_name argument is required"
puts "Usage: rake sync:tiffs[deposit] or rake sync:tiffs[media-repository]"
exit 1
end

valid_volumes = %w[deposit media-repository]
unless valid_volumes.include?(args[:volume_name])
valid_volumes = %w[Deposit Media-Repository]
unless valid_volumes.map(&:downcase).include?(requested_volume.downcase)
puts "Error: volume_name must be one of: #{valid_volumes.join(', ')}"
exit 1
end

volume = Volume.find_by(name: args[:volume_name])
volume = Volume.where("LOWER(name) = ?", requested_volume.downcase).first
unless volume
puts "Error: Volume '#{args[:volume_name]}' not found in database"
puts "Error: Volume '#{requested_volume}' not found in database"
exit 1
end

begin
SyncService::Tiffs.call(volume_name: args[:volume_name])
SyncService::Tiffs.call(volume_name: requested_volume)
rescue => e
puts "Error during TIFF processing: #{e.message}"
puts e.backtrace.first(5).join("\n") if e.backtrace
Expand Down
Loading