db/migrate/003_new_panda_api.rb @@ -22,7 +22,7 @@ class VideosController < ApplicationController def upload @video = Video.find(params[:id]) - @upload_form_url = %(http://upload.pandastream.com/videos/#{@video.panda_id}/form) + @upload_form_url = %(http://#{Panda.api_domain}:#{Panda.api_port}/videos/#{@video.panda_id}/form) end def status app/controllers/videos_controller.rb @@ -1,21 +1,32 @@ class Video < ActiveRecord::Base def embed_html - %(<embed src="http://videos.pandastream.com/flvplayer.swf" width="#{self.width}" height="#{self.height}" allowfullscreen="true" allowscriptaccess="always" flashvars="&displayheight=#{self.height}&file=#{self.video_url}&width=#{self.width}&height=#{self.height}" />) + %(<embed src="http://videos.pandastream.com/flvplayer.swf" width="#{self.width}" height="#{self.height}" allowfullscreen="true" allowscriptaccess="always" flashvars="&displayheight=#{self.height}&file=#{self.url}&image=#{self.screenshot_url}&width=#{self.width}&height=#{self.height}" />) + end + + def url + "http://#{VIDEOS_DOMAIN}/#{self.filename}" + end + + def screenshot_url + "http://#{VIDEOS_DOMAIN}/#{self.screenshot}" + end + + def thumbnail_url + "http://#{VIDEOS_DOMAIN}/#{self.thumbnail}" end def update_panda_status(panda_video) - # If the video has been encoded, save the url of the standard quality flash video which users will watch - if panda_video.status == 'done' - if encoding = panda_video.encodings.find { |e| - e[:format] == 'flv' and \ - e[:quality] == 'sd' and \ - e[:status] == 'success' - } - self.video_url = encoding[:filename] - self.width = encoding[:width] - self.height = encoding[:height] - save - end + if encoding = panda_video.encodings.find { |e| + e.profile_title == "MP4 SD" and e.status == 'success' + } + self.filename = encoding.filename + self.original_filename = encoding.original_filename + self.screenshot = encoding.screenshot + self.thumbnail = encoding.thumbnail + self.duration = encoding.duration + self.width = encoding.width + self.height = encoding.height + save end end end \ No newline at end of file app/models/video.rb @@ -61,4 +61,7 @@ end # Include your application configuration below # require 'panda' require 'panda_new' -Panda.account_key = "5ff26a80-15e8-012b-b412-404043cf913d" \ No newline at end of file +Panda.account_key = "f9e69730-16fd-012b-731d-001ec2b5c0e1" +Panda.api_domain = "localhost" +Panda.api_port = 4000 +VIDEOS_DOMAIN = "videos.pandastream.com" \ No newline at end of file config/environment.rb lib/panda_new.rb 16520b45b6f4633d07a9ab517e34f0a02d4f648f Damien Tanner damien@new-bamboo.co.uk http://github.com/newbamboo/panda_example_rails/commit/452cac6d4123731f8bf030d3a2d4f5468fce3cb6 452cac6d4123731f8bf030d3a2d4f5468fce3cb6 2008-06-23T15:54:49-07:00 2008-06-23T15:54:49-07:00 updated for new panda arch 035bc10a4590b08ca979980902c05c7eff370934 Damien Tanner damien@new-bamboo.co.uk