Refactor GPX creation routines to share common code.

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index 37c74f8e0e1676ddc4d46b28f3d0494ac7777d63..2d4a26c29bcd951b07dc68cdf66a605276cce189 100644 (file)
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -101,22 +101,16 @@ class TraceController < ApplicationController
   end
 
   def create
-    filename = "/tmp/#{rand}"
+    name = params[:trace][:gpx_file].original_filename.gsub(/[^a-zA-Z0-9.]/, '_') # This makes sure filenames are sane
 
-    File.open(filename, "w") { |f| f.write(params[:trace][:gpx_file].read) }
-    params[:trace][:name] = params[:trace][:gpx_file].original_filename.gsub(/[^a-zA-Z0-9.]/, '_') # This makes sure filenames are sane
-    params[:trace].delete('gpx_file') # remove the field from the hash, because there's no such field in the DB
-    @trace = Trace.new(params[:trace])
-    @trace.inserted = false
-    @trace.user = @user
-    @trace.timestamp = Time.now
-
-    if @trace.save
-      saved_filename = "/home/osm/gpx/#{@trace.id}.gpx"
-      File.rename(filename, saved_filename)
+    do_create(name, params[:trace][:tagstring], params[:trace][:description]) do |f|
+      f.write(params[:trace][:gpx_file].read)
+    end
 
+    if @trace.id
       logger.info("id is #{@trace.id}")
       flash[:notice] = "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
+
       redirect_to :action => 'mine'
     end
   end
@@ -206,27 +200,34 @@ class TraceController < ApplicationController
   end
 
   def api_create
-    #FIXME merge this code with create as they're pretty similar?
-    
+    do_create(params[:filename], params[:tags], params[:description]) do |f|
+      f.write(request.raw_post)
+    end
+
+    if @trace.id
+      render :nothing => true
+    else
+      render :nothing => true, :status => :internal_server_error
+    end
+  end
+
+private
+
+  def do_create(name, tags, description)
     filename = "/tmp/#{rand}"
-    File.open(filename, "w") { |f| f.write(request.raw_post) }
-    params[:trace] = {}
-    params[:trace][:name] = params[:filename]
-    params[:trace][:tagstring] = params[:tags]
-    params[:trace][:description] = params[:description]
-    @trace = Trace.new(params[:trace])
+
+    File.open(filename, "w") { |f| yield f }
+
+    @trace = Trace.new({:name => name, :tagstring => tags, :description => description})
     @trace.inserted = false
     @trace.user = @user
     @trace.timestamp = Time.now
 
     if @trace.save
-      saved_filename = "/home/osm/gpx/#{@trace.id}.gpx"
-      File.rename(filename, saved_filename)
-      logger.info("id is #{@trace.id}")
-      flash[:notice] = "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
-      render :nothing => true
+      File.rename(filename, @trace.trace_name)
     else
-      render :nothing => true, :status => :internal_server_error
+      FileUtils.rm_f(filename)
     end
   end
+
 end