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

fix set title. setting for heroku

Browse source
This commit is contained in:
Espen Antonsen 2010-04-14 01:00:48 -04:00
parent 5cf109280b
commit c854b3d2e9
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gems
View file

@ -1,3 +1,4 @@
authlogic authlogic
carrierwave carrierwave
aws-s3 aws-s3
mini_exiftool

8
app/models/photo.rb
View file

@ -12,8 +12,8 @@ class Photo < ActiveRecord::Base
validates_presence_of :title validates_presence_of :title
before_validation :set_title before_validation :set_title
before_create :exif_read #before_create :exif_read
before_update :exif_write # should only write if tags are changed as images can be large and thus ExifTool will take a while to write to the file #before_update :exif_write # should only write if tags are changed as images can be large and thus ExifTool will take a while to write to the file
attr_accessor :tag_list attr_accessor :tag_list
#attr_protected :path #attr_protected :path
@ -55,7 +55,7 @@ class Photo < ActiveRecord::Base
def exif_info def exif_info
photo = MiniExiftool.new(self.path_original) photo = MiniExiftool.new(self.file.path)
#photo.tags.sort.each do |tag| #photo.tags.sort.each do |tag|
# puts tag.ljust(28) + photo[tag].to_s # puts tag.ljust(28) + photo[tag].to_s
#end #end
@ -68,7 +68,7 @@ class Photo < ActiveRecord::Base
private private
def set_title def set_title
self.title = self.file.filename.titleize unless self.title self.title = self.file.file.basename.titleize unless self.title
end end
def ensure_file def ensure_file

4
app/uploaders/file_uploader.rb
View file

@ -10,6 +10,10 @@ class FileUploader < CarrierWave::Uploader::Base
#storage :file #storage :file
if ENV['S3_KEY'] if ENV['S3_KEY']
storage :s3 storage :s3
def cache_dir
"#{RAILS_ROOT}/tmp/uploads" if ENV['HEROKU'] == 'true'
end
else else
storage :file storage :file
end end