Merge remote-tracking branch 'upstream/pull/2697'

[rails.git] / app / models / trace.rb

diff --git a/app/models/trace.rb b/app/models/trace.rb
index d500784af882892ab065d8134fcfdf236c9be353..97800a86822f804f1dba741092a27feeb580dfb3 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -26,6 +26,8 @@
 #
 
 class Trace < ApplicationRecord
 #
 
 class Trace < ApplicationRecord

+  require "open3"
+

   self.table_name = "gpx_files"
 
   belongs_to :user, :counter_cache => true
   self.table_name = "gpx_files"
 
   belongs_to :user, :counter_cache => true


@@ -117,11 +119,11 @@ class Trace < ApplicationRecord
   end
 
   def mime_type
   end
 
   def mime_type

-    filetype = `/usr/bin/file -Lbz #{trace_name}`.chomp
-    gzipped = filetype =~ /gzip compressed/
-    bzipped = filetype =~ /bzip2 compressed/
-    zipped = filetype =~ /Zip archive/
-    tarred = filetype =~ /tar archive/
+    filetype = Open3.capture2("/usr/bin/file", "-Lbz", trace_name).first.chomp
+    gzipped = filetype.include?("gzip compressed")
+    bzipped = filetype.include?("bzip2 compressed")
+    zipped = filetype.include?("Zip archive")
+    tarred = filetype.include?("tar archive")

 
     mimetype = if gzipped
                  "application/x-gzip"
 
     mimetype = if gzipped
                  "application/x-gzip"


@@ -139,11 +141,11 @@ class Trace < ApplicationRecord
   end
 
   def extension_name
   end
 
   def extension_name

-    filetype = `/usr/bin/file -Lbz #{trace_name}`.chomp
-    gzipped = filetype =~ /gzip compressed/
-    bzipped = filetype =~ /bzip2 compressed/
-    zipped = filetype =~ /Zip archive/
-    tarred = filetype =~ /tar archive/
+    filetype = Open3.capture2("/usr/bin/file", "-Lbz", trace_name).first.chomp
+    gzipped = filetype.include?("gzip compressed")
+    bzipped = filetype.include?("bzip2 compressed")
+    zipped = filetype.include?("Zip archive")
+    tarred = filetype.include?("tar archive")

 
     extension = if tarred && gzipped
                   ".tar.gz"
 
     extension = if tarred && gzipped
                   ".tar.gz"


@@ -208,33 +210,30 @@ class Trace < ApplicationRecord
   end
 
   def xml_file
   end
 
   def xml_file

-    # TODO: *nix specific, could do to work on windows... would be functionally inferior though - check for '.gz'
-    filetype = `/usr/bin/file -Lbz #{trace_name}`.chomp
-    gzipped = filetype =~ /gzip compressed/
-    bzipped = filetype =~ /bzip2 compressed/
-    zipped = filetype =~ /Zip archive/
-    tarred = filetype =~ /tar archive/
+    filetype = Open3.capture2("/usr/bin/file", "-Lbz", trace_name).first.chomp
+    gzipped = filetype.include?("gzip compressed")
+    bzipped = filetype.include?("bzip2 compressed")
+    zipped = filetype.include?("Zip archive")
+    tarred = filetype.include?("tar archive")

 
     if gzipped || bzipped || zipped || tarred
 
     if gzipped || bzipped || zipped || tarred

-      tmpfile = Tempfile.new("trace.#{id}")
+      file = Tempfile.new("trace.#{id}")

 
       if tarred && gzipped
 
       if tarred && gzipped

-        system("tar -zxOf #{trace_name} > #{tmpfile.path}")
+        system("tar -zxOf #{trace_name} > #{file.path}")

       elsif tarred && bzipped
       elsif tarred && bzipped

-        system("tar -jxOf #{trace_name} > #{tmpfile.path}")
+        system("tar -jxOf #{trace_name} > #{file.path}")

       elsif tarred
       elsif tarred

-        system("tar -xOf #{trace_name} > #{tmpfile.path}")
+        system("tar -xOf #{trace_name} > #{file.path}")

       elsif gzipped
       elsif gzipped

-        system("gunzip -c #{trace_name} > #{tmpfile.path}")
+        system("gunzip -c #{trace_name} > #{file.path}")

       elsif bzipped
       elsif bzipped

-        system("bunzip2 -c #{trace_name} > #{tmpfile.path}")
+        system("bunzip2 -c #{trace_name} > #{file.path}")

       elsif zipped
       elsif zipped

-        system("unzip -p #{trace_name} -x '__MACOSX/*' > #{tmpfile.path} 2> /dev/null")
+        system("unzip -p #{trace_name} -x '__MACOSX/*' > #{file.path} 2> /dev/null")

       end
 
       end
 

-      tmpfile.unlink
-
-      file = tmpfile.file
+      file.unlink

     else
       file = File.open(trace_name)
     end
     else
       file = File.open(trace_name)
     end