From 5790ba99b4be5bf73ccbf3eca586490858e75f3d Mon Sep 17 00:00:00 2001 From: Phil Lee Date: Wed, 30 Nov 2022 10:53:30 +0000 Subject: [PATCH] match csv or text file for validation --- app/models/forms/bulk_upload_lettings/upload_your_file.rb | 4 ++-- app/models/forms/bulk_upload_sales/upload_your_file.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/forms/bulk_upload_lettings/upload_your_file.rb b/app/models/forms/bulk_upload_lettings/upload_your_file.rb index 25e8a73f4..d0e1b96d5 100644 --- a/app/models/forms/bulk_upload_lettings/upload_your_file.rb +++ b/app/models/forms/bulk_upload_lettings/upload_your_file.rb @@ -57,10 +57,10 @@ module Forms def validate_file_is_csv return unless file - argv = %W[file --mime-type -- #{file.path}] + argv = %W[file --brief --mime-type -- #{file.path}] output = `#{argv.shelljoin}` - unless output.include?("text/csv") + unless output.match?(/text\/csv|text\/plain/) errors.add(:file, :not_csv) end end diff --git a/app/models/forms/bulk_upload_sales/upload_your_file.rb b/app/models/forms/bulk_upload_sales/upload_your_file.rb index 3632734ab..2ce2769dc 100644 --- a/app/models/forms/bulk_upload_sales/upload_your_file.rb +++ b/app/models/forms/bulk_upload_sales/upload_your_file.rb @@ -57,10 +57,10 @@ module Forms def validate_file_is_csv return unless file - argv = %W[file --mime-type -- #{file.path}] + argv = %W[file --brief --mime-type -- #{file.path}] output = `#{argv.shelljoin}` - unless output.include?("text/csv") + unless output.match?(/text\/csv|text\/plain/) errors.add(:file, :not_csv) end end