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

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

diff --git a/app/models/trace.rb b/app/models/trace.rb
index f1cd72acd600f0ba2278b201c9427c8addaa91ae..0860d2b31954e1a3d255594650b071443399f702 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -25,7 +25,9 @@
 #  gpx_files_user_id_fkey  (user_id => users.id)
 #
 
 #  gpx_files_user_id_fkey  (user_id => users.id)
 #
 

-class Trace < ActiveRecord::Base
+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,67 +119,64 @@ class Trace < ActiveRecord::Base
   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/
-
-    mimetype = if gzipped
-                 "application/x-gzip"
-               elsif bzipped
-                 "application/x-bzip2"
-               elsif zipped
-                 "application/x-zip"
-               elsif tarred
-                 "application/x-tar"
-               else
-                 "application/gpx+xml"
-               end
-
-    mimetype
+    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
+      "application/x-gzip"
+    elsif bzipped
+      "application/x-bzip2"
+    elsif zipped
+      "application/x-zip"
+    elsif tarred
+      "application/x-tar"
+    else
+      "application/gpx+xml"
+    end

   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/
-
-    extension = if tarred && gzipped
-                  ".tar.gz"
-                elsif tarred && bzipped
-                  ".tar.bz2"
-                elsif tarred
-                  ".tar"
-                elsif gzipped
-                  ".gpx.gz"
-                elsif bzipped
-                  ".gpx.bz2"
-                elsif zipped
-                  ".zip"
-                else
-                  ".gpx"
-                end
-
-    extension
+    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 tarred && gzipped
+      ".tar.gz"
+    elsif tarred && bzipped
+      ".tar.bz2"
+    elsif tarred
+      ".tar"
+    elsif gzipped
+      ".gpx.gz"
+    elsif bzipped
+      ".gpx.bz2"
+    elsif zipped
+      ".zip"
+    else
+      ".gpx"
+    end

   end
 
   end
 

-  def update_from_xml(xml, create = false)
+  def update_from_xml(xml, create: false)

     p = XML::Parser.string(xml, :options => XML::Parser::Options::NOERROR)
     doc = p.parse
     p = XML::Parser.string(xml, :options => XML::Parser::Options::NOERROR)
     doc = p.parse

+    pt = doc.find_first("//osm/gpx_file")

 
 

-    doc.find("//osm/gpx_file").each do |pt|
-      return update_from_xml_node(pt, create)
+    if pt
+      update_from_xml_node(pt, :create => create)
+    else
+      raise OSM::APIBadXMLError.new("trace", xml, "XML doesn't contain an osm/gpx_file element.")

     end
     end

-
-    raise OSM::APIBadXMLError.new("trace", xml, "XML doesn't contain an osm/gpx_file element.")

   rescue LibXML::XML::Error, ArgumentError => e
     raise OSM::APIBadXMLError.new("trace", xml, e.message)
   end
 
   rescue LibXML::XML::Error, ArgumentError => e
     raise OSM::APIBadXMLError.new("trace", xml, e.message)
   end
 

-  def update_from_xml_node(pt, create = false)
+  def update_from_xml_node(pt, create: false)

     raise OSM::APIBadXMLError.new("trace", pt, "visibility missing") if pt["visibility"].nil?
 
     self.visibility = pt["visibility"]
     raise OSM::APIBadXMLError.new("trace", pt, "visibility missing") if pt["visibility"].nil?
 
     self.visibility = pt["visibility"]


@@ -208,33 +207,30 @@ class Trace < ActiveRecord::Base
   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, :out => file.path)

       elsif tarred && bzipped
       elsif tarred && bzipped

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

       elsif tarred
       elsif tarred

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

       elsif gzipped
       elsif gzipped

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

       elsif bzipped
       elsif bzipped

-        system("bunzip2 -c #{trace_name} > #{tmpfile.path}")
+        system("bunzip2", "-c", trace_name, :out => 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/*", :out => file.path, :err => "/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