X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5bb21188e46eaf2496d041220409416562a43a00..52d40ee42b4428ab00cda97855827d5403d44ef4:/app/models/trace.rb diff --git a/app/models/trace.rb b/app/models/trace.rb index 7c97b4e96..0860d2b31 100644 --- a/app/models/trace.rb +++ b/app/models/trace.rb @@ -25,7 +25,9 @@ # 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 @@ -117,97 +119,64 @@ class Trace < ActiveRecord::Base 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 - 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 - end - - def to_xml - doc = OSM::API.new.get_xml_doc - doc.root << to_xml_node - doc - end - - def to_xml_node - el1 = XML::Node.new "gpx_file" - el1["id"] = id.to_s - el1["name"] = name.to_s - el1["lat"] = latitude.to_s if inserted - el1["lon"] = longitude.to_s if inserted - el1["user"] = user.display_name - el1["visibility"] = visibility - el1["pending"] = inserted ? "false" : "true" - el1["timestamp"] = timestamp.xmlschema - - el2 = XML::Node.new "description" - el2 << description - el1 << el2 - - tags.each do |tag| - el2 = XML::Node.new("tag") - el2 << tag.tag - el1 << el2 + 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 - - el1 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 + 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 - - 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 - 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"] @@ -238,33 +207,30 @@ class Trace < ActiveRecord::Base 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 - tmpfile = Tempfile.new("trace.#{id}") + file = Tempfile.new("trace.#{id}") if tarred && gzipped - system("tar -zxOf #{trace_name} > #{tmpfile.path}") + system("tar", "-zxOf", trace_name, :out => file.path) elsif tarred && bzipped - system("tar -jxOf #{trace_name} > #{tmpfile.path}") + system("tar", "-jxOf", trace_name, :out => file.path) elsif tarred - system("tar -xOf #{trace_name} > #{tmpfile.path}") + system("tar", "-xOf", trace_name, :out => file.path) elsif gzipped - system("gunzip -c #{trace_name} > #{tmpfile.path}") + system("gunzip", "-c", trace_name, :out => file.path) elsif bzipped - system("bunzip2 -c #{trace_name} > #{tmpfile.path}") + system("bunzip2", "-c", trace_name, :out => file.path) 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 - tmpfile.unlink - - file = tmpfile.file + file.unlink else file = File.open(trace_name) end @@ -275,7 +241,7 @@ class Trace < ActiveRecord::Base def import logger.info("GPX Import importing #{name} (#{id}) from #{user.email}") - gpx = ::GPX::File.new(xml_file) + gpx = GPX::File.new(trace_name) f_lat = 0 f_lon = 0