Merge pull request #4249 from AntonKhorev/no-traces-nav-empty-li

[rails.git] / app / controllers / api / traces_controller.rb

diff --git a/app/controllers/api/traces_controller.rb b/app/controllers/api/traces_controller.rb
index fd43a1d44500681ee874c8faf15e2bfe07aef6c4..629617f0b127c01685ed460f7a7ed0d688da89e6 100644 (file)
--- a/app/controllers/api/traces_controller.rb
+++ b/app/controllers/api/traces_controller.rb
@@ -1,28 +1,49 @@
 module Api
   class TracesController < ApiController
 module Api
   class TracesController < ApiController

-    layout "site", :except => :georss
-
-    before_action :authorize_web
+    before_action :check_database_readable, :except => [:show, :data]
+    before_action :check_database_writable, :only => [:create, :update, :destroy]

     before_action :set_locale
     before_action :authorize
 
     authorize_resource
 
     before_action :set_locale
     before_action :authorize
 
     authorize_resource
 

-    before_action :check_database_readable, :except => [:show, :data]
-    before_action :check_database_writable, :only => [:create, :update, :destroy]

     before_action :check_api_readable, :only => [:show, :data]
     before_action :check_api_writable, :only => [:create, :update, :destroy]
     before_action :check_api_readable, :only => [:show, :data]
     before_action :check_api_writable, :only => [:create, :update, :destroy]

-    before_action :offline_redirect, :only => [:create, :destroy, :data]
+    before_action :offline_error, :only => [:create, :destroy, :data]

     around_action :api_call_handle_error
 
     def show
     around_action :api_call_handle_error
 
     def show

-      trace = Trace.visible.find(params[:id])
+      @trace = Trace.visible.find(params[:id])

 
 

-      if trace.public? || trace.user == current_user
-        @traces = [trace]
-        render "trace"
+      head :forbidden unless @trace.public? || @trace.user == current_user
+    end
+
+    def create
+      tags = params[:tags] || ""
+      description = params[:description] || ""
+      visibility = params[:visibility]
+
+      if visibility.nil?
+        visibility = if params[:public]&.to_i&.nonzero?
+                       "public"
+                     else
+                       "private"
+                     end
+      end
+
+      if params[:file].respond_to?(:read)
+        trace = do_create(params[:file], tags, description, visibility)
+
+        if trace.id
+          TraceImporterJob.perform_later(trace)
+          render :plain => trace.id.to_s
+        elsif trace.valid?
+          head :internal_server_error
+        else
+          head :bad_request
+        end

       else
       else

-        head :forbidden
+        head :bad_request

       end
     end
 
       end
     end
 


@@ -45,7 +66,7 @@ module Api
       if trace.user == current_user
         trace.visible = false
         trace.save!
       if trace.user == current_user
         trace.visible = false
         trace.save!

-        TraceDestroyerJob.perform_later(trace) if Settings.trace_use_job_queue
+        TraceDestroyerJob.perform_later(trace)

 
         head :ok
       else
 
         head :ok
       else


@@ -61,6 +82,8 @@ module Api
           send_data(trace.xml_file.read, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => "attachment")
         elsif request.format == Mime[:gpx]
           send_data(trace.xml_file.read, :filename => "#{trace.id}.gpx", :type => request.format.to_s, :disposition => "attachment")
           send_data(trace.xml_file.read, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => "attachment")
         elsif request.format == Mime[:gpx]
           send_data(trace.xml_file.read, :filename => "#{trace.id}.gpx", :type => request.format.to_s, :disposition => "attachment")

+        elsif trace.file.attached?
+          redirect_to rails_blob_path(trace.file, :disposition => "attachment")

         else
           send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => "attachment")
         end
         else
           send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => "attachment")
         end


@@ -69,47 +92,12 @@ module Api
       end
     end
 
       end
     end
 

-    def create
-      tags = params[:tags] || ""
-      description = params[:description] || ""
-      visibility = params[:visibility]
-
-      if visibility.nil?
-        visibility = if params[:public]&.to_i&.nonzero?
-                       "public"
-                     else
-                       "private"
-                     end
-      end
-
-      if params[:file].respond_to?(:read)
-        trace = do_create(params[:file], tags, description, visibility)
-
-        if trace.id
-          TraceImporterJob.perform_later(trace) if Settings.trace_use_job_queue
-          render :plain => trace.id.to_s
-        elsif trace.valid?
-          head :internal_server_error
-        else
-          head :bad_request
-        end
-      else
-        head :bad_request
-      end
-    end
-

     private
 
     def do_create(file, tags, description, visibility)
       # Sanitise the user's filename
       name = file.original_filename.gsub(/[^a-zA-Z0-9.]/, "_")
 
     private
 
     def do_create(file, tags, description, visibility)
       # Sanitise the user's filename
       name = file.original_filename.gsub(/[^a-zA-Z0-9.]/, "_")
 

-      # Get a temporary filename...
-      filename = "/tmp/#{rand}"
-
-      # ...and save the uploaded file to that location
-      File.open(filename, "wb") { |f| f.write(file.read) }
-

       # Create the trace object, falsely marked as already
       # inserted to stop the import daemon trying to load it
       trace = Trace.new(
       # Create the trace object, falsely marked as already
       # inserted to stop the import daemon trying to load it
       trace = Trace.new(


@@ -117,40 +105,14 @@ module Api
         :tagstring => tags,
         :description => description,
         :visibility => visibility,
         :tagstring => tags,
         :description => description,
         :visibility => visibility,

-        :inserted => true,
+        :inserted => false,

         :user => current_user,
         :user => current_user,

-        :timestamp => Time.now.getutc
+        :timestamp => Time.now.utc,
+        :file => file

       )
 
       )
 

-      if trace.valid?
-        Trace.transaction do
-          begin
-            # Save the trace object
-            trace.save!
-
-            # Rename the temporary file to the final name
-            FileUtils.mv(filename, trace.trace_name)
-          rescue StandardError
-            # Remove the file as we have failed to update the database
-            FileUtils.rm_f(filename)
-
-            # Pass the exception on
-            raise
-          end
-
-          begin
-            # Clear the inserted flag to make the import daemon load the trace
-            trace.inserted = false
-            trace.save!
-          rescue StandardError
-            # Remove the file as we have failed to update the database
-            FileUtils.rm_f(trace.trace_name)
-
-            # Pass the exception on
-            raise
-          end
-        end
-      end
+      # Save the trace object
+      trace.save!

 
       # Finally save the user's preferred privacy level
       if pref = current_user.preferences.where(:k => "gps.trace.visibility").first
 
       # Finally save the user's preferred privacy level
       if pref = current_user.preferences.where(:k => "gps.trace.visibility").first


@@ -163,8 +125,8 @@ module Api
       trace
     end
 
       trace
     end
 

-    def offline_redirect
-      redirect_to :action => :offline if Settings.status == "gpx_offline"
+    def offline_error
+      report_error "GPX files offline for maintenance", :service_unavailable if Settings.status == "gpx_offline"

     end
   end
 end
     end
   end
 end