X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..d7b4f88d5e342b5c2b4f2435d0394e4286524678:/app/models/trace.rb diff --git a/app/models/trace.rb b/app/models/trace.rb index d8cc6048a..2d055fd28 100644 --- a/app/models/trace.rb +++ b/app/models/trace.rb @@ -2,21 +2,19 @@ class Trace < ActiveRecord::Base self.table_name = "gpx_files" belongs_to :user, :counter_cache => true - has_many :tags, :class_name => 'Tracetag', :foreign_key => 'gpx_id', :dependent => :delete_all - has_many :points, :class_name => 'Tracepoint', :foreign_key => 'gpx_id', :dependent => :delete_all + has_many :tags, :class_name => "Tracetag", :foreign_key => "gpx_id", :dependent => :delete_all + has_many :points, :class_name => "Tracepoint", :foreign_key => "gpx_id", :dependent => :delete_all scope :visible, -> { where(:visible => true) } scope :visible_to, ->(u) { visible.where("visibility IN ('public', 'identifiable') OR user_id = ?", u) } scope :visible_to_all, -> { where(:visibility => %w(public identifiable)) } scope :tagged, ->(t) { joins(:tags).where(:gpx_file_tags => { :tag => t }) } - validates_presence_of :user_id, :name, :timestamp - validates_presence_of :description, :on => :create - validates_length_of :name, :maximum => 255 - validates_length_of :description, :maximum => 255 - # validates_numericality_of :latitude, :longitude - validates_inclusion_of :inserted, :in => [true, false] - validates_inclusion_of :visibility, :in => %w(private public trackable identifiable) + validates :user, :presence => true, :associated => true + validates :name, :presence => true, :length => 1..255 + validates :description, :presence => { :on => :create }, :length => 1..255 + validates :timestamp, :presence => true + validates :visibility, :inclusion => %w(private public trackable identifiable) def destroy super @@ -30,20 +28,20 @@ class Trace < ActiveRecord::Base end def tagstring=(s) - if s.include? ',' - self.tags = s.split(/\s*,\s*/).select { |tag| tag !~ /^\s*$/ }.collect {|tag| - tt = Tracetag.new - tt.tag = tag - tt - } - else - # do as before for backwards compatibility: - self.tags = s.split.collect {|tag| - tt = Tracetag.new - tt.tag = tag - tt - } - end + self.tags = if s.include? "," + s.split(/\s*,\s*/).select { |tag| tag !~ /^\s*$/ }.collect do |tag| + tt = Tracetag.new + tt.tag = tag + tt + end + else + # do as before for backwards compatibility: + s.split.collect do |tag| + tt = Tracetag.new + tt.tag = tag + tt + end + end end def public? @@ -72,16 +70,13 @@ class Trace < ActiveRecord::Base def large_picture f = File.new(large_picture_name, "rb") - logger.info "large picture file: '#{f.path}', bytes: #{File.size(f.path)}" data = f.sysread(File.size(f.path)) - logger.info "have read data, bytes: '#{data.length}'" f.close data end def icon_picture f = File.new(icon_picture_name, "rb") - logger.info "icon picture file: '#{f.path}'" data = f.sysread(File.size(f.path)) f.close data @@ -100,46 +95,49 @@ class Trace < ActiveRecord::Base end def mime_type - filetype = `/usr/bin/file -bz #{trace_name}`.chomp + filetype = `/usr/bin/file -Lbz #{trace_name}`.chomp gzipped = filetype =~ /gzip compressed/ bzipped = filetype =~ /bzip2 compressed/ zipped = filetype =~ /Zip archive/ + tarred = filetype =~ /tar archive/ - if gzipped - mimetype = "application/x-gzip" - elsif bzipped - mimetype = "application/x-bzip2" - elsif zipped - mimetype = "application/x-zip" - else - mimetype = "application/gpx+xml" - end + mimetype = if gzipped + "application/x-gzip" + elsif bzipped + "application/x-bzip2" + elsif zipped + "application/x-zip" + elsif tarred + "application/x-tar" + else + "application/gpx+xml" + end mimetype end def extension_name - filetype = `/usr/bin/file -bz #{trace_name}`.chomp + filetype = `/usr/bin/file -Lbz #{trace_name}`.chomp gzipped = filetype =~ /gzip compressed/ bzipped = filetype =~ /bzip2 compressed/ zipped = filetype =~ /Zip archive/ tarred = filetype =~ /tar archive/ - if tarred && gzipped - extension = ".tar.gz" - elsif tarred && bzipped - extension = ".tar.bz2" - elsif tarred - extension = ".tar" - elsif gzipped - extension = ".gpx.gz" - elsif bzipped - extension = ".gpx.bz2" - elsif zipped - extension = ".zip" - else - extension = ".gpx" - end + extension = if tarred && gzipped + ".tar.gz" + elsif tarred && bzipped + ".tar.bz2" + elsif tarred + ".tar" + elsif gzipped + ".gpx.gz" + elsif bzipped + ".gpx.bz2" + elsif zipped + ".zip" + else + ".gpx" + end extension end @@ -151,22 +149,22 @@ class Trace < ActiveRecord::Base end def to_xml_node - el1 = XML::Node.new 'gpx_file' - el1['id'] = id.to_s - el1['name'] = name.to_s - el1['lat'] = latitude.to_s if inserted - el1['lon'] = longitude.to_s if inserted - el1['user'] = user.display_name - el1['visibility'] = visibility - el1['pending'] = (!inserted).to_s - el1['timestamp'] = timestamp.xmlschema - - el2 = XML::Node.new 'description' + el1 = XML::Node.new "gpx_file" + el1["id"] = id.to_s + el1["name"] = name.to_s + el1["lat"] = latitude.to_s if inserted + el1["lon"] = longitude.to_s if inserted + el1["user"] = user.display_name + el1["visibility"] = visibility + el1["pending"] = inserted ? "false" : "true" + el1["timestamp"] = timestamp.xmlschema + + el2 = XML::Node.new "description" el2 << description el1 << el2 tags.each do |tag| - el2 = XML::Node.new('tag') + el2 = XML::Node.new("tag") el2 << tag.tag el1 << el2 end @@ -176,14 +174,14 @@ class Trace < ActiveRecord::Base # Read in xml as text and return it's Node object representation def self.from_xml(xml, create = false) - p = XML::Parser.string(xml) + p = XML::Parser.string(xml, :options => XML::Parser::Options::NOERROR) doc = p.parse - doc.find('//osm/gpx_file').each do |pt| + doc.find("//osm/gpx_file").each do |pt| return Trace.from_xml_node(pt, create) end - fail OSM::APIBadXMLError.new("trace", xml, "XML doesn't contain an osm/gpx_file element.") + raise OSM::APIBadXMLError.new("trace", xml, "XML doesn't contain an osm/gpx_file element.") rescue LibXML::XML::Error, ArgumentError => ex raise OSM::APIBadXMLError.new("trace", xml, ex.message) end @@ -191,15 +189,15 @@ class Trace < ActiveRecord::Base def self.from_xml_node(pt, create = false) trace = Trace.new - fail OSM::APIBadXMLError.new("trace", pt, "visibility missing") if pt['visibility'].nil? - trace.visibility = pt['visibility'] + raise OSM::APIBadXMLError.new("trace", pt, "visibility missing") if pt["visibility"].nil? + trace.visibility = pt["visibility"] unless create - fail OSM::APIBadXMLError.new("trace", pt, "ID is required when updating.") if pt['id'].nil? - trace.id = pt['id'].to_i + raise OSM::APIBadXMLError.new("trace", pt, "ID is required when updating.") if pt["id"].nil? + trace.id = pt["id"].to_i # .to_i will return 0 if there is no number that can be parsed. # We want to make sure that there is no id with zero anyway - fail OSM::APIBadUserInput.new("ID of trace cannot be zero when updating.") if trace.id == 0 + raise OSM::APIBadUserInput.new("ID of trace cannot be zero when updating.") if trace.id.zero? end # We don't care about the time, as it is explicitly set on create/update/delete @@ -207,11 +205,11 @@ class Trace < ActiveRecord::Base # and set manually before the actual delete trace.visible = true - description = pt.find('description').first - fail OSM::APIBadXMLError.new("trace", pt, "description missing") if description.nil? + description = pt.find("description").first + raise OSM::APIBadXMLError.new("trace", pt, "description missing") if description.nil? trace.description = description.content - pt.find('tag').each do |tag| + pt.find("tag").each do |tag| trace.tags.build(:tag => tag.content) end @@ -219,8 +217,8 @@ class Trace < ActiveRecord::Base end def xml_file - # TODO *nix specific, could do to work on windows... would be functionally inferior though - check for '.gz' - filetype = `/usr/bin/file -bz #{trace_name}`.chomp + # TODO: *nix specific, could do to work on windows... would be functionally inferior though - check for '.gz' + filetype = `/usr/bin/file -Lbz #{trace_name}`.chomp gzipped = filetype =~ /gzip compressed/ bzipped = filetype =~ /bzip2 compressed/ zipped = filetype =~ /Zip archive/ @@ -240,7 +238,7 @@ class Trace < ActiveRecord::Base elsif bzipped system("bunzip2 -c #{trace_name} > #{tmpfile.path}") elsif zipped - system("unzip -p #{trace_name} -x '__MACOSX/*' > #{tmpfile.path}") + system("unzip -p #{trace_name} -x '__MACOSX/*' > #{tmpfile.path} 2> /dev/null") end tmpfile.unlink @@ -262,12 +260,8 @@ class Trace < ActiveRecord::Base f_lon = 0 first = true - # If there are any existing points for this trace then delete - # them - we check for existing points first to avoid locking - # the table in the common case where there aren't any. - if Tracepoint.where(:gpx_id => id).exists? - Tracepoint.delete_all(:gpx_id => id) - end + # If there are any existing points for this trace then delete them + Tracepoint.delete_all(:gpx_id => id) gpx.points do |point| if first @@ -303,7 +297,7 @@ class Trace < ActiveRecord::Base self.icon_picture = gpx.icon(min_lat, min_lon, max_lat, max_lon) self.size = gpx.actual_points self.inserted = true - self.save! + save! end logger.info "done trace #{id}"