amd/photogriffy.net
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

updated to lazy load flickraw and error messages are handled cleaner with flash[:error]

Browse source
This commit is contained in:
Andrew Davidson 2009-10-30 00:33:29 -07:00
parent ca8077dec8
commit c159583d31
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/flickr_controller.rb
View file

@ -1,4 +1,5 @@
class FlickrController < ApplicationController class FlickrController < ApplicationController
FlickrawOptions = { :lazyload => true }
require 'flickraw' require 'flickraw'
@@flickr_id = "13827925@N00" @@flickr_id = "13827925@N00"
@ -7,7 +8,7 @@ class FlickrController < ApplicationController
begin begin
@pinfo = flickr.photos.getInfo :photo_id => @pid @pinfo = flickr.photos.getInfo :photo_id => @pid
rescue => e rescue => e
@error = true; flash[:error] = "Photo " + params[:id].to_s + " could not be found. Random photo displayed."
@pid = flickr.photos.search(:user_id => @@flickr_id).rand.id @pid = flickr.photos.search(:user_id => @@flickr_id).rand.id
@pinfo = flickr.photos.getInfo :photo_id => @pid @pinfo = flickr.photos.getInfo :photo_id => @pid
end end
@ -20,10 +21,11 @@ class FlickrController < ApplicationController
end end
def home def home
@pid = flickr.photos.search(:user_id => @@flickr_id).rand.id @pid = flickr.photos.search(:user_id => @@flickr_id).rand.id
@pinfo = flickr.photos.getInfo(:photo_id => @pid) @pinfo = flickr.photos.getInfo(:photo_id => @pid)
@psize = flickr.photos.getSizes(:photo_id => @pid).find{|m| m.label == "Medium"} @psize = flickr.photos.getSizes(:photo_id => @pid).find{|m| m.label == "Medium"}
flash[:error] = "Could not connect to Flickr."
@pid = @pinfo = @psize = nil
respond_to do |format| respond_to do |format|
format.html format.html