deac/photomix
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

path not used. using path from fog

Browse source
This commit is contained in:
Espen Antonsen 2012-01-10 21:55:32 +01:00
parent d5d5f089a2
commit e17355b808
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/models/photo.rb
View file

@ -9,12 +9,11 @@ class Photo < ActiveRecord::Base
validates :title, :presence => true validates :title, :presence => true
before_validation :set_title, :set_path before_validation :set_title
before_create :exif_read before_create :exif_read
#before_update :exif_write #before_update :exif_write
attr_accessor :tag_list attr_accessor :tag_list
#attr_protected :path
scope :untouched, :conditions => "photos.description IS NULL AND photos.id NOT IN ( SELECT photo_id FROM photo_tags)", :include => :album scope :untouched, :conditions => "photos.description IS NULL AND photos.id NOT IN ( SELECT photo_id FROM photo_tags)", :include => :album
scope :previous, lambda { |p,a| { :conditions => ["id < :id AND album_Id = :album ", { :id => p, :album => a } ], :limit => 1, :order => "id DESC"} } scope :previous, lambda { |p,a| { :conditions => ["id < :id AND album_Id = :album ", { :id => p, :album => a } ], :limit => 1, :order => "id DESC"} }
@ -55,9 +54,6 @@ class Photo < ActiveRecord::Base
0 0
end end
protected
private private
@ -65,20 +61,12 @@ class Photo < ActiveRecord::Base
self.title = self.file.file.basename.titleize unless self.title self.title = self.file.file.basename.titleize unless self.title
end end
def set_path
self.path = self.file.file.file.sub(File.expand_path(Rails.root.to_s + '/public/' + ENV['STORAGE_PATH'] + "/files" ) + "/","") unless self.path
end
def ensure_file
#self.destroy if !File.exists?( APP_CONFIG[:photos_path] + self.path )
end
def exif_read def exif_read
photo = MiniExiftool.new(self.file.file.file) photo = MiniExiftool.new(self.file.file.file)
self.longitude = photo.GPSLongitude if self.longitude.nil? self.longitude = photo.GPSLongitude if self.longitude.nil?
self.latitude = photo.GPSLatitude if self.latitude.nil? self.latitude = photo.GPSLatitude if self.latitude.nil?
self.title = photo.DocumentName if self.title.nil? self.title = photo.DocumentName if self.title.nil?
self.description = photo.ImageDescription if self.description.nil? || photo.ImageDescription != 'Exif_JPEG_PICTURE' self.description = photo.ImageDescription if self.description.nil? && photo.ImageDescription != 'Exif_JPEG_PICTURE'
self.tag_list = (self.tags.empty? ? "" : self.album.tag_list) + " " + (photo.Keywords.nil? ? "" : photo.Keywords.to_a.map { |tag| tag.gsub(" ", "_") }.join(" ")) self.tag_list = (self.tags.empty? ? "" : self.album.tag_list) + " " + (photo.Keywords.nil? ? "" : photo.Keywords.to_a.map { |tag| tag.gsub(" ", "_") }.join(" "))
end end