X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bd5793f7a6eb8f2c49f08f7fd66bd35abd4a37c3..467990a45bbc9ca64c275b42e27a8b15ab9b236b:/app/models/trace.rb

diff --git a/app/models/trace.rb b/app/models/trace.rb
index eccd3af1f..2d4e9ef8a 100644
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -12,7 +12,9 @@ class Trace < ActiveRecord::Base
 
   def destroy
     super
-    FileUtils.rm_f(trace_name, icon_picture_name, large_picture_name)
+    FileUtils.rm_f(trace_name)
+    FileUtils.rm_f(icon_picture_name)
+    FileUtils.rm_f(large_picture_name)
   end
 
   def tagstring
@@ -70,6 +72,10 @@ class Trace < ActiveRecord::Base
     "/home/osm/gpx/#{id}.gpx"
   end
 
+  def mime_type
+    return `file -bi #{trace_name}`.chomp
+  end
+
   def to_xml_node
     el1 = XML::Node.new 'gpx_file'
     el1['id'] = self.id.to_s
@@ -88,13 +94,27 @@ class Trace < ActiveRecord::Base
       logger.info("GPX Import importing #{name} (#{id}) from #{user.email}")
 
       # TODO *nix specific, could do to work on windows... would be functionally inferior though - check for '.gz'
-      filetype = `file -b #{trace_name}`.chomp
-      gzipped = filetype =~ /^gzip/
-      zipped = filetype =~ /^Zip/
+      filetype = `file -bz #{trace_name}`.chomp
+      gzipped = filetype =~ /gzip compressed/
+      bzipped = filetype =~ /bzip2 compressed/
+      zipped = filetype =~ /Zip archive/
+      tarred = filetype =~ /tar archive/
 
-      if gzipped
+      if tarred and gzipped then
+        filename = tempfile = "/tmp/#{rand}"
+        system("tar -zxOf #{trace_name} > #{filename}")
+      elsif tarred and bzipped then
+        filename = tempfile = "/tmp/#{rand}"
+        system("tar -jxOf #{trace_name} > #{filename}")
+      elsif tarred
+        filename = tempfile = "/tmp/#{rand}"
+        system("tar -xOf #{trace_name} > #{filename}")
+      elsif gzipped
         filename = tempfile = "/tmp/#{rand}"
         system("gunzip -c #{trace_name} > #{filename}")
+      elsif bzipped
+        filename = tempfile = "/tmp/#{rand}"
+        system("bunzip2 -c #{trace_name} > #{filename}")
       elsif zipped
         filename = tempfile = "/tmp/#{rand}"
         system("unzip -p #{trace_name} > #{filename}")