Sending message instead of raising error if lbnl file is not found

Author: David Zuckerman

lib/berkeley_library/sftp_handler/downloader/lbnl.rb

@@ -15,8 +15,9 @@ def download!(filename: nil, local_dir: '/opt/app/data')
           filename ||= default_filename
           remote_path = Pathname.new(filename)
           local_path = Pathname.new(local_dir) + filename
-          assert_file_not_processed! local_path
-          assert_not_exists! local_path
+
+          # If the file was already grabbed or process we don't want to retrieve it again
+          return puts "#{local_path} was already grabbed or processed" if file_retrieved?(local_path)
 
           connect do |sftp|
             sftp.download!(remote_path.to_s, local_path.to_s)
@@ -25,9 +26,8 @@ def download!(filename: nil, local_dir: '/opt/app/data')
           end
         end
 
-        def assert_file_not_processed!(filepath)
-          raise "File was already processed: #{filepath}" \
-            if Pathname.glob("#{filepath}*.old").any?
+        def file_retrieved?(filepath)
+          Pathname.glob("#{filepath}*.old").any? || Pathname.new(filepath).exist?
         end
 
         def default_host

spec/downloader/lbnl_spec.rb

@@ -3,6 +3,7 @@
 require 'spec_helper'
 require 'tempfile'
 
+# rubocop:disable Metrics/BlockLength
 describe BerkeleyLibrary::SftpHandler::Downloader::Lbnl do
   its(:default_host) { is_expected.to eq 'ncc-1701.lbl.gov' }
   its(:default_username) { is_expected.to eq 'ucblib' }
@@ -25,15 +26,15 @@
       Timecop.unfreeze
     end
 
-    it "downloads this week's file" do
+    it 'downloads this week\'s file' do
       expect(sftp_session)
         .to receive(:download!)
         .with(todays_remote_path.to_s, Pathname.new("/opt/app/data/#{this_weeks_filename}").to_s)
 
       subject.download!
     end
 
-    it "downloads to an alternate local_dir" do
+    it 'downloads to an alternate local_dir' do
       local_dir = '/netapp/alma/lbnl_patrons'
 
       expect(sftp_session)
@@ -43,7 +44,7 @@
       subject.download!(local_dir: local_dir)
     end
 
-    it "downloads a specific file" do
+    it 'downloads a specific file' do
       filename = 'lbnl_people_20220516.zip'
       remote_path = Pathname.new(filename)
       local_path = Pathname.new("/opt/app/data/#{filename}")
@@ -56,14 +57,19 @@
     end
   end
 
-  describe '#assert_file_not_processed!' do
-    it 'proceeds if processed file is absent' do
-      expect { subject.assert_file_not_processed!('/path/to/non-existent-file') }.not_to raise_error
+  describe '#file_retrieved?' do
+    it 'returns false if file was already retrieved or processed' do
+      expect(subject.file_retrieved?('/path/to/non-existent-file')).to be(false)
     end
 
-    it 'raises if processed file exists' do
-      f = Tempfile.new(['temp_file38348', '.old'])
-      expect { subject.assert_file_not_processed! f.path.gsub('.old', '') }.to raise_error RuntimeError
+    it 'returns true if file was already retrieved' do
+      f = Tempfile.new('temp_file38348')
+      expect(subject.file_retrieved?(f)).to be(true)
+    end
+
+    it 'returns true if file was already processed' do
+      f = Tempfile.new('temp_file38348.old')
+      expect(subject.file_retrieved?(f)).to be(true)
     end
   end
 
@@ -101,3 +107,4 @@
     end
   end
 end
+# rubocop:enable Metrics/BlockLength