X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/89e976c6e57c9aa8afae00437aaf4399ea5fc58f..4769eec5aab27cdb0ae6ac1b7bb713da720feb93:/lib/daemons/gpx_import.rb

diff --git a/lib/daemons/gpx_import.rb b/lib/daemons/gpx_import.rb
index 9e7e906c8..acf215300 100755
--- a/lib/daemons/gpx_import.rb
+++ b/lib/daemons/gpx_import.rb
@@ -13,27 +13,36 @@ end
 logger = ActiveRecord::Base.logger
 
 while($running) do
-  
+
   ActiveRecord::Base.logger.info("GPX Import daemon wake @ #{Time.now}.")
 
-  traces = Trace.find(:all) #, :conditions => ['inserted = ?', false])
+  traces = Trace.find(:all, :conditions => ['inserted = ?', false])
 
   if traces and traces.length > 0
     traces.each do |trace|
       begin
 
         logger.info("GPX Import importing #{trace.name} (#{trace.id}) from #{trace.user.email}")
-
+
         # TODO *nix specific, could do to work on windows... would be functionally inferior though - check for '.gz'
-        gzipped = `file -b /tmp/#{trace.id}.gpx`.chomp =~/^gzip/
+        filetype = `file -b /home/osm/gpx/#{trace.id}.gpx`.chomp
+        gzipped = filetype =~ /^gzip/
+        zipped = filetype =~ /^Zip/
 
         if gzipped
           logger.info("gzipped")
+          filename = "/tmp/#{rand}"
+          system("gunzip -c /home/osm/gpx/#{trace.id}.gpx > #{filename}")
+        elsif zipped
+          logger.info("zipped")
+          filename = "/tmp/#{rand}"
+          system("unzip -p /home/osm/gpx/#{trace.id}.gpx > #{filename}")
         else
           logger.info("not gzipped")
+          filename = "/home/osm/gpx/#{trace.id}.gpx"
         end
 
-        gpx = OSM::GPXImporter.new("/home/osm/gpx/#{trace.id}.gpx")
+        gpx = OSM::GPXImporter.new(filename)
 
         f_lat = 0
         f_lon = 0
@@ -60,12 +69,12 @@ while($running) do
           min_lat = Tracepoint.minimum('latitude', :conditions => ['gpx_id = ?', trace.id])
           max_lon = Tracepoint.maximum('longitude', :conditions => ['gpx_id = ?', trace.id])
           min_lon = Tracepoint.minimum('longitude', :conditions => ['gpx_id = ?', trace.id])
-          
+
           max_lat = max_lat.to_f / 1000000
           min_lat = min_lat.to_f / 1000000
           max_lon = max_lon.to_f / 1000000
           min_lon = min_lon.to_f / 1000000
- 
+
           trace.latitude = f_lat
           trace.longitude = f_lon
           trace.large_picture = gpx.get_picture(min_lat, min_lon, max_lat, max_lon, gpx.actual_points)
@@ -74,20 +83,32 @@ while($running) do
           trace.inserted = true
           trace.save
 
-          logger.info "done trace #{trace.id} -------------------------------------------------------------------------------"
-    #      Notifier::deliver_gpx_success(trace, gpx.possible_points)
+          if gzipped || zipped
+            FileUtils.rm_f(filename)
+          end
+
+          logger.info "done trace #{trace.id}"
+          Notifier::deliver_gpx_success(trace, gpx.possible_points)
         else
-          #trace.destroy
-#          Notifier::deliver_gpx_failure(trace, '0 points parsed ok. Do they all have lat,lng,alt,timestamp?')
+          FileUtils.rm_f("/home/osm/gpx/#{trace.id}.gpx", filename)
+          trace.destroy
+          Notifier::deliver_gpx_failure(trace, '0 points parsed ok. Do they all have lat,lng,alt,timestamp?')
         end
 
       rescue Exception => ex
         logger.info ex
         ex.backtrace.each {|l| logger.info l }
-        #trace.destroy
- #       Notifier::deliver_gpx_failure(trace, ex.to_s + ex.backtrace.join("\n") )
+          FileUtils.rm_f("/home/osm/gpx/#{trace.id}.gpx", filename)
+          trace.destroy
+          Notifier::deliver_gpx_failure(trace, ex.to_s + ex.backtrace.join("\n") )
       end
     end
   end
+
+  Trace.find(:all, :conditions => ['inserted = ?', false]).each do |trace|
+     FileUtils.rm_f("/home/osm/gpx/#{trace.id}.gpx")
+     trace.destroy
+  end
+  exit
   sleep 15.minutes
 end