before_filter :authorize_web
before_filter :set_locale
- before_filter :require_user, :only => [:mine, :create, :edit, :delete, :make_public]
+ before_filter :require_user, :only => [:mine, :create, :edit, :delete]
before_filter :authorize, :only => [:api_details, :api_data, :api_create]
before_filter :check_database_readable, :except => [:api_details, :api_data, :api_create]
- before_filter :check_database_writable, :only => [:create, :edit, :delete, :make_public]
+ before_filter :check_database_writable, :only => [:create, :edit, :delete]
before_filter :check_api_readable, :only => [:api_details, :api_data]
before_filter :check_api_writable, :only => [:api_create]
before_filter :require_allow_read_gpx, :only => [:api_details, :api_data]
before_filter :require_allow_write_gpx, :only => [:api_create]
-
+ before_filter :offline_warning, :only => [:mine, :view]
+ before_filter :offline_redirect, :only => [:create, :edit, :delete, :data, :api_data, :api_create]
+ around_filter :api_call_handle_error, :only => [:api_details, :api_data, :api_create]
+
+ caches_action :list, :unless => :logged_in?, :layout => false
+ caches_action :view, :layout => false
+ caches_action :georss, :layout => true
+ cache_sweeper :trace_sweeper, :only => [:create, :edit, :delete, :api_create]
+ cache_sweeper :tracetag_sweeper, :only => [:create, :edit, :delete, :api_create]
+
# Counts and selects pages of GPX traces for various criteria (by user, tags, public etc.).
# target_user - if set, specifies the user to fetch traces for. if not set will fetch all traces
def list(target_user = nil, action = "list")
# from display name, pick up user id if one user's traces only
display_name = params[:display_name]
if target_user.nil? and !display_name.blank?
- target_user = User.find(:first, :conditions => [ "visible = ? and display_name = ?", true, display_name])
+ target_user = User.find(:first, :conditions => { :status => ["active", "confirmed"], :display_name => display_name })
if target_user.nil?
@title = t'trace.no_such_user.title'
@not_found_user = display_name
# four main cases:
# 1 - all traces, logged in = all public traces + all user's (i.e + all mine)
# 2 - all traces, not logged in = all public traces
- # 3 - user's traces, logged in as same user = all user's traces
+ # 3 - user's traces, logged in as same user = all user's traces
# 4 - user's traces, not logged in as that user = all user's public traces
if target_user.nil? # all traces
if @user
- conditions = ["(gpx_files.public = ? OR gpx_files.user_id = ?)", true, @user.id] #1
+ conditions = ["(gpx_files.visibility in ('public', 'identifiable') OR gpx_files.user_id = ?)", @user.id] #1
else
- conditions = ["gpx_files.public = ?", true] #2
+ conditions = ["gpx_files.visibility in ('public', 'identifiable')"] #2
end
else
if @user and @user == target_user
conditions = ["gpx_files.user_id = ?", @user.id] #3 (check vs user id, so no join + can't pick up non-public traces by changing name)
else
- conditions = ["gpx_files.public = ? AND gpx_files.user_id = ?", true, target_user.id] #4
+ conditions = ["gpx_files.visibility in ('public', 'identifiable') AND gpx_files.user_id = ?", target_user.id] #4
end
end
-
+
if params[:tag]
@tag = params[:tag]
conditions[0] += " AND 0 = 1"
end
end
-
+
conditions[0] += " AND gpx_files.visible = ?"
conditions << true
- @trace_pages, @traces = paginate(:traces,
- :include => [:user, :tags],
- :conditions => conditions,
- :order => "gpx_files.timestamp DESC",
- :per_page => 20)
+ @page = (params[:page] || 1).to_i
+ @page_size = 20
+
+ @traces = Trace.find(:all,
+ :include => [:user, :tags],
+ :conditions => conditions,
+ :order => "gpx_files.timestamp DESC",
+ :offset => (@page - 1) * @page_size,
+ :limit => @page_size)
# put together SET of tags across traces, for related links
tagset = Hash.new
end
end
end
-
+
# final helper vars for view
@action = action
@display_name = target_user.display_name if target_user
@all_tags = tagset.values
+ @trace = Trace.new(:visibility => default_visibility) if @user
end
def mine
- # Load the preference of whether the user set the trace public the last time
- @trace = Trace.new
- if @user.preferences.find(:first, :conditions => {:k => "gps.trace.public", :v => "default"}).nil?
- @trace.public = false
- else
- @trace.public = true
- end
- list(@user, "mine")
+ redirect_to :action => :list, :display_name => @user.display_name
end
def view
(@trace.public? or @trace.user == @user)
@title = t 'trace.view.title', :name => @trace.name
else
- flash[:notice] = t 'trace.view.trace_not_found'
+ flash[:error] = t 'trace.view.trace_not_found'
redirect_to :controller => 'trace', :action => 'list'
end
rescue ActiveRecord::RecordNotFound
- flash[:notice] = t 'trace.view.trace_not_found'
+ flash[:error] = t 'trace.view.trace_not_found'
redirect_to :controller => 'trace', :action => 'list'
end
if params[:trace]
logger.info(params[:trace][:gpx_file].class.name)
if params[:trace][:gpx_file].respond_to?(:read)
- do_create(params[:trace][:gpx_file], params[:trace][:tagstring],
- params[:trace][:description], params[:trace][:public])
+ begin
+ do_create(params[:trace][:gpx_file], params[:trace][:tagstring],
+ params[:trace][:description], params[:trace][:visibility])
+ rescue => ex
+ logger.debug ex
+ end
if @trace.id
logger.info("id is #{@trace.id}")
@trace = Trace.new({:name => "Dummy",
:tagstring => params[:trace][:tagstring],
:description => params[:trace][:description],
- :public => params[:trace][:public],
+ :visibility => params[:trace][:visibility],
:inserted => false, :user => @user,
:timestamp => Time.now.getutc})
@trace.valid?
if params[:trace]
@trace.description = params[:trace][:description]
@trace.tagstring = params[:trace][:tagstring]
+ @trace.visibility = params[:trace][:visibility]
if @trace.save
redirect_to :action => 'view'
- end
+ end
end
else
render :nothing => true, :status => :forbidden
render :nothing => true, :status => :not_found
end
- def make_public
- trace = Trace.find(params[:id])
-
- if @user and trace.user == @user
- if request.post? and !trace.public?
- trace.public = true
- trace.save
- flash[:notice] = t 'trace.make_public.made_public'
- redirect_to :controller => 'trace', :action => 'view', :id => params[:id]
- else
- render :nothing => true, :status => :bad_request
- end
- else
- render :nothing => true, :status => :forbidden
- end
- rescue ActiveRecord::RecordNotFound
- render :nothing => true, :status => :not_found
- end
-
def georss
- conditions = ["gpx_files.public = ?", true]
+ conditions = ["gpx_files.visibility in ('public', 'identifiable')"]
if params[:display_name]
conditions[0] += " AND users.display_name = ?"
conditions << params[:tag]
end
- traces = Trace.find(:all, :include => :user, :conditions => conditions,
+ traces = Trace.find(:all, :include => :user, :conditions => conditions,
:order => "timestamp DESC", :limit => 20)
rss = OSM::GeoRSS.new
traces.each do |trace|
- rss.add(trace.latitude, trace.longitude, trace.name, trace.user.display_name, url_for({:controller => 'trace', :action => 'view', :id => trace.id, :display_name => trace.user.display_name}), "<img src='#{url_for({:controller => 'trace', :action => 'icon', :id => trace.id, :user_login => trace.user.display_name})}'> GPX file with #{trace.size} points from #{trace.user.display_name}", trace.timestamp)
+ rss.add(trace.latitude, trace.longitude, trace.name, trace.user.display_name, url_for({:controller => 'trace', :action => 'view', :id => trace.id, :display_name => trace.user.display_name}), "<img src='#{url_for({:controller => 'trace', :action => 'icon', :id => trace.id, :display_name => trace.user.display_name})}'> GPX file with #{trace.size} points from #{trace.user.display_name}", trace.timestamp)
end
render :text => rss.to_s, :content_type => "application/rss+xml"
if trace.inserted?
if trace.public? or (@user and @user == trace.user)
- expires_in 7.days, :private => !trace.public, :public => trace.public
+ expires_in 7.days, :private => !trace.public?, :public => trace.public?
send_file(trace.large_picture_name, :filename => "#{trace.id}.gif", :type => 'image/gif', :disposition => 'inline')
else
render :nothing => true, :status => :forbidden
if trace.inserted?
if trace.public? or (@user and @user == trace.user)
- expires_in 7.days, :private => !trace.public, :public => trace.public
+ expires_in 7.days, :private => !trace.public?, :public => trace.public?
send_file(trace.icon_picture_name, :filename => "#{trace.id}_icon.gif", :type => 'image/gif', :disposition => 'inline')
else
render :nothing => true, :status => :forbidden
if request.post?
tags = params[:tags] || ""
description = params[:description] || ""
- pub = params[:public] || false
-
+ visibility = params[:visibility]
+
+ if visibility.nil?
+ if params[:public] && params[:public].to_i.nonzero?
+ visibility = "public"
+ else
+ visibility = "private"
+ end
+ end
+
if params[:file].respond_to?(:read)
- do_create(params[:file], tags, description, pub)
+ do_create(params[:file], tags, description, visibility)
if @trace.id
render :text => @trace.id.to_s, :content_type => "text/plain"
private
- def do_create(file, tags, description, public)
+ def do_create(file, tags, description, visibility)
# Sanitise the user's filename
name = file.original_filename.gsub(/[^a-zA-Z0-9.]/, '_')
:name => name,
:tagstring => tags,
:description => description,
- :public => public,
+ :visibility => visibility,
:inserted => true,
:user => @user,
:timestamp => Time.now.getutc
})
- # Save the trace object
- if @trace.save
- # Rename the temporary file to the final name
- FileUtils.mv(filename, @trace.trace_name)
+ 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 Exception => ex
+ # 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 Exception => ex
+ # Remove the file as we have failed to update the database
+ FileUtils.rm_f(@trace.trace_name)
+
+ # Pass the exception on
+ raise
+ end
+ end
- # Clear the inserted flag to make the import daemon load the trace
- @trace.inserted = false
- @trace.save!
+ # Finally save the user's preferred privacy level
+ if pref = @user.preferences.find(:first, :conditions => {:k => "gps.trace.visibility"})
+ pref.v = visibility
+ pref.save
else
- # Remove the file as we have failed to update the database
- FileUtils.rm_f(filename)
+ @user.preferences.create(:k => "gps.trace.visibility", :v => visibility)
end
-
- # Finally save whether the user marked the trace as being public
- if @trace.public?
- if @user.trace_public_default.nil?
- @user.preferences.create(:k => "gps.trace.public", :v => "default")
- end
+
+ end
+
+ def offline_warning
+ flash.now[:warning] = t 'trace.offline_warning.message' if OSM_STATUS == :gpx_offline
+ end
+
+ def offline_redirect
+ redirect_to :action => :offline if OSM_STATUS == :gpx_offline
+ end
+
+ def default_visibility
+ visibility = @user.preferences.find(:first, :conditions => {:k => "gps.trace.visibility"})
+
+ if visibility
+ visibility.v
+ elsif @user.preferences.find(:first, :conditions => {:k => "gps.trace.public", :v => "default"}).nil?
+ "private"
else
- pref = @user.trace_public_default
- pref.destroy unless pref.nil?
+ "public"
end
-
end
end
projects / rails.git / blobdiff