app/views/thumbnail/new.html.erb @@ -38,11 +38,11 @@ class Thumbnail < Application @video.thumbnail_position = params[:percentage] @video.save - @video.successfull_encodings.each do | video | + @video.successful_encodings.each do | video | video.upload_thumbnail_to_s3 end - redirect "/videos/#{@video.key}" + redirect url(:video, @video.key) end private app/controllers/thumbnail.rb @@ -112,11 +112,13 @@ class Videos < Application else case content_type when :html + url = Panda::Config[:choose_thumbnail] ? "/videos/#{@video.key}/thumbnail/new?iframe=true" : @video.upload_redirect_url + # Special internal Panda case: textarea hack to get around the fact that the form is submitted with a hidden iframe and thus the response is rendered in the iframe if params[:iframe] == "true" - "<textarea>" + {:location => @video.redirect_after_upload}.to_json + "</textarea>" + "<textarea>" + {:location => url}.to_json + "</textarea>" else - redirect @video.redirect_after_upload + redirect url end end end app/controllers/videos.rb @@ -79,6 +79,7 @@ class Video < SimpleDB::Base # Delete an original video and all it's encodings. def obliterate! + # TODO: should this raise an exception if the file does not exist? self.delete_from_s3 self.encodings.each do |e| e.delete_from_s3 @@ -97,10 +98,6 @@ class Video < SimpleDB::Base self.status == 'empty' end - def redirect_after_upload - Panda::Config[:choose_thumbnail] ? "/videos/#{self.key}/thumbnail/new?iframe=true" : self.upload_redirect_url - end - def upload_redirect_url Panda::Config[:upload_redirect_url].gsub(/\$id/,self.key) end app/models/video.rb @@ -2,6 +2,6 @@ <ul id="screenshots"> <% @percentages.each do | percentage |%> - <li><%= link_to image_tag(@video.thumbnail_tmp_url(percentage)), "/videos/#{@video.key}/save_thumbnail?percentage=#{percentage}&iframe=#{params[:iframe]}" %></li> + <li><%= link_to image_tag(@video.thumbnail_tmp_url(percentage)), "/videos/#{@video.key}/thumbnail/update?percentage=#{percentage}&iframe=#{params[:iframe]}" %></li> <% end %> </ul> \ No newline at end of file app/views/thumbnail/edit.html.erb @@ -1,6 +1,6 @@ <ul class="actions"> <li><%= link_to "Add to queue", "/videos/#{@video.key}/add_to_queue" %></li> - <li><%= link_to "Change thumbnail", "/videos/#{@video.key}/choose_thumbnail" %></li> + <li><%= link_to "Change thumbnail", "/videos/#{@video.key}/thumbnail/edit" %></li> <li> <%= form_for(@video, :action => url(:video, :id => @video.key), :method => :delete) do %> <%= submit "Delete video", :onclick => "var agree=confirm('This will delete the original video file and all its encodings');if (agree) {return true} else {return false}" %> app/views/videos/show_parent.html.erb @@ -23,6 +23,9 @@ Merb.logger.info("Compiling routes...") Merb::Router.prepare do |r| r.resources :videos, :member => {:form => :get, :upload => :post, :done => :get, :state => :get, :add_to_queue => :get }, :collection => {:exp => :get} do |video| video.resource :thumbnail + # Using get requests right now for create and update + video.match('/thumbnail/create').to(:controller => "thumbnail", :action => "create") + video.match('/thumbnail/update').to(:controller => "thumbnail", :action => "update") end r.match("/signup").to(:controller => "accounts", :action => "new") config/router.rb @@ -1,103 +1,103 @@ -// jQuery.nginxUploadProgress = function(settings) { -// settings = jQuery.extend({ -// interval: 2000, -// progress_bar_id: "progressbar", -// nginx_progress_url: "/progress" -// }, settings); -// -// var options = { -// beforeSubmit: function(formData, jqForm, options) { -// $('#uploader').hide(); -// $('#uploading').show(); -// this.timer = setInterval(function() { jQuery.nginxUploadProgressFetch(this, settings['nginx_progress_url'], settings['progress_bar_id'], settings['uuid']) }, settings['interval']); -// return true; -// }, -// complete: function(xhr, statusText) { -// data = $.httpData(xhr, "json"); -// if (data.location) { // # TODO check http status! -// location.href = data.location; -// } else { -// $('#uploading').hide(); -// if (data.error == "NotValid") { -// $('#error').html("This video upload was not valid. Please try beginning the upload process again."); -// } else if (data.error == "FormatNotRecognised") { -// $('#uploader').show(); -// $('#error').html('The video format was not recognised. Please ensure that your video follows the <a href="http://pandastream.com/docs/upload_format_guidelines" target="_blank">upload format guidelines</a>.'); -// } else { -// $('#uploader').show(); -// $('#error').html('Unfortunately there was an error uploading your video. We have been notified of this issue. Please try uploading your video again shortly.'); -// } -// } -// }, -// dataType: 'json' // 'xml', 'script', or 'json' (expected server response type) -// }; -// -// // bind form using 'ajaxForm' -// $('#upload').ajaxForm(options); -// }; -// -// jQuery.nginxUploadProgress.inum = 0; -// -// jQuery.nginxUploadProgressFetch = function(e, nginx_progress_url, progress_bar_id, uuid) { -// // window.console.log("fetcing progress for "+uuid) -// jQuery.nginxUploadProgress.inum++; -// -// $.ajax({ -// type: "GET", -// url: nginx_progress_url, -// dataType: "json", -// beforeSend: function(xhr) { -// xhr.setRequestHeader("X-Progress-ID", uuid); -// // window.console.log("setting headers: "+uuid) -// }, -// complete: function(xhr, statusText) { -// // window.console.log("complete!: "+statusText); -// }, -// success: function(upload) { -// /* change the width if the inner progress-bar */ -// if (upload.state == 'uploading') { -// bar = $('#'+progress_bar_id); -// w = Math.floor((upload.received / upload.size)*100); -// bar.width(w + '%'); -// -// // Panda specific -// bar.show(); -// -// // Update ETA -// eta_seconds = ((upload.size / upload.received) * jQuery.nginxUploadProgress.inum) - jQuery.nginxUploadProgress.inum; -// -// if (eta_seconds < 60) { -// eta_str = "under a minute" -// } else if (eta_seconds < (60*5)) { -// eta_str = "a few minutes" -// } else if (eta_seconds < (60*15)) { -// eta_str = "fifteen minutes" -// } else if (eta_seconds < (60*30)) { -// eta_str = "about half an hour" -// } else if (eta_seconds < (60*45)) { -// eta_str = "around 45 minutes" -// } else if (eta_seconds < (60*60)) { -// eta_str = "less than an hour" -// } else if (eta_seconds > (60*60)) { -// eta_str = "over an hour"; -// } else if (eta_seconds > (60*60*2)) { -// eta_str = "a few hours"; -// } else if (eta_seconds > (60*60*3)) { -// eta_str = "several hours"; -// } else if (eta_seconds > (60*60*6)) { -// eta_str = "quite a long time... at least 6 hours"; -// } -// -// $("#eta").html(eta_str); -// } else if (upload.state == 'error') { -// $('#uploading').hide(); -// if (upload.status == 413) { -// $('#error').html("Sorry, that video file is too large. Could you resave it as a smaller one (under 60MB) please?"); -// } else { -// $('#error').html('Unfortunately there was an error uploading your video. We have been notified of this issue. Please try uploading your video again shortly.'); -// } -// } -// } -// }); -// }; -// +jQuery.nginxUploadProgress = function(settings) { + settings = jQuery.extend({ + interval: 2000, + progress_bar_id: "progressbar", + nginx_progress_url: "/progress" + }, settings); + + var options = { + beforeSubmit: function(formData, jqForm, options) { + $('#uploader').hide(); + $('#uploading').show(); + this.timer = setInterval(function() { jQuery.nginxUploadProgressFetch(this, settings['nginx_progress_url'], settings['progress_bar_id'], settings['uuid']) }, settings['interval']); + return true; + }, + complete: function(xhr, statusText) { + data = $.httpData(xhr, "json"); + if (data.location) { // # TODO check http status! + location.href = data.location; + } else { + $('#uploading').hide(); + if (data.error == "NotValid") { + $('#error').html("This video upload was not valid. Please try beginning the upload process again."); + } else if (data.error == "FormatNotRecognised") { + $('#uploader').show(); + $('#error').html('The video format was not recognised. Please ensure that your video follows the <a href="http://pandastream.com/docs/upload_format_guidelines" target="_blank">upload format guidelines</a>.'); + } else { + $('#uploader').show(); + $('#error').html('Unfortunately there was an error uploading your video. We have been notified of this issue. Please try uploading your video again shortly.'); + } + } + }, + dataType: 'json' // 'xml', 'script', or 'json' (expected server response type) + }; + + // bind form using 'ajaxForm' + $('#upload').ajaxForm(options); +}; + +jQuery.nginxUploadProgress.inum = 0; + +jQuery.nginxUploadProgressFetch = function(e, nginx_progress_url, progress_bar_id, uuid) { + // window.console.log("fetcing progress for "+uuid) + jQuery.nginxUploadProgress.inum++; + + $.ajax({ + type: "GET", + url: nginx_progress_url, + dataType: "json", + beforeSend: function(xhr) { + xhr.setRequestHeader("X-Progress-ID", uuid); + // window.console.log("setting headers: "+uuid) + }, + complete: function(xhr, statusText) { + // window.console.log("complete!: "+statusText); + }, + success: function(upload) { + /* change the width if the inner progress-bar */ + if (upload.state == 'uploading') { + bar = $('#'+progress_bar_id); + w = Math.floor((upload.received / upload.size)*100); + bar.width(w + '%'); + + // Panda specific + bar.show(); + + // Update ETA + eta_seconds = ((upload.size / upload.received) * jQuery.nginxUploadProgress.inum) - jQuery.nginxUploadProgress.inum; + + if (eta_seconds < 60) { + eta_str = "under a minute" + } else if (eta_seconds < (60*5)) { + eta_str = "a few minutes" + } else if (eta_seconds < (60*15)) { + eta_str = "fifteen minutes" + } else if (eta_seconds < (60*30)) { + eta_str = "about half an hour" + } else if (eta_seconds < (60*45)) { + eta_str = "around 45 minutes" + } else if (eta_seconds < (60*60)) { + eta_str = "less than an hour" + } else if (eta_seconds > (60*60)) { + eta_str = "over an hour"; + } else if (eta_seconds > (60*60*2)) { + eta_str = "a few hours"; + } else if (eta_seconds > (60*60*3)) { + eta_str = "several hours"; + } else if (eta_seconds > (60*60*6)) { + eta_str = "quite a long time... at least 6 hours"; + } + + $("#eta").html(eta_str); + } else if (upload.state == 'error') { + $('#uploading').hide(); + if (upload.status == 413) { + $('#error').html("Sorry, that video file is too large. Could you resave it as a smaller one (under 60MB) please?"); + } else { + $('#error').html('Unfortunately there was an error uploading your video. We have been notified of this issue. Please try uploading your video again shortly.'); + } + } + } + }); +}; + public/javascripts/jquery.nginxUploadProgress.js spec/helpers/thumbnails_helper_spec.rb 048133ba1c608206f09611e2c13d3e58657aefb3 Martyn Loughran martyn@new-bamboo.co.uk http://github.com/reddavis/panda/commit/16a479bbe68566517a308736754ab8865f23156e 16a479bbe68566517a308736754ab8865f23156e 2008-10-06T06:29:40-07:00 2008-10-06T06:29:40-07:00 Finished refactoring the thumbnail code out of video controller and got the UI working correctly. d91fa8ad2f7aea6b0d329fa09f902f34542e7390 Martyn Loughran martyn@new-bamboo.co.uk