Windows throws when trying to mv a Tempfile. Copy it instead

tabulapdf · Feb 20, 2018 · 40e1d05 · 40e1d05
1 parent 34f2adc
commit 40e1d05
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/tabula_workspace.rb b/lib/tabula_workspace.rb
@@ -78,7 +78,9 @@ def move_file(path, document_id, filename)
       FileUtils.mv(path, File.join(get_document_dir(document_id), filename))
     end
 
-
+	def copy_file(path, document_id, filename)
+	   FileUtils.cp_r(path, File.join(get_document_dir(document_id), filename))
+	end
 
     def list_templates
       read_workspace!

diff --git a/webapp/tabula_web.rb b/webapp/tabula_web.rb
@@ -53,7 +53,12 @@ def upload(file)
   file_id = Digest::SHA1.hexdigest(Time.now.to_s + original_filename) # just SHA1 of time isn't unique with multiple uploads
   file_path = File.join(TabulaSettings::DOCUMENTS_BASEPATH, file_id)
 
-  Tabula::Workspace.instance.move_file(file[:tempfile].path, file_id, 'document.pdf')
+  begin
+    Tabula::Workspace.instance.move_file(file[:tempfile].path, file_id, 'document.pdf')
+  rescue Errno::EACCES
+    # Windows doesn't like tempfiles to be moved
+	Tabula::Workspace.instance.copy_file(file[:tempfile].path, file_id, 'document.pdf')
+  end
 
   filepath = Tabula::Workspace.instance.get_document_path(file_id)
   job_batch = SecureRandom.uuid