Add support for segment/:id/ways and node/:id/segments API calls. Fixes #452.

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

diff --git a/app/models/trace.rb b/app/models/trace.rb
index 97dcf963518327c516f8b607d733d7819a2c798a..ba255e85d4a6d1c15169a76497f32e490acbcc70 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -90,13 +90,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}")