@@ -20,6 +20,13 @@ class ProgrammesController < ApplicationController strDescription << "on channel #{Channel.find(params[:channel]).xmltvname}" end + if params[:recorded] + oProgrammes = [] + + strConditions << "id in (select programme_id from Episodes where recording_status IN ('recorded'))" + strDescription << "recorded" + end + if params[:search] strConditions << 'title like ?' strParams << ("%" + params[:search] + "%") @@ -128,4 +135,26 @@ class ProgrammesController < ApplicationController format.xml { head :ok } end end + + def deleterecordings + @programme = Programme.find(params[:id]) + @programme.episodes.each do |oEpisode| + if ['recorded', 'recording_failed', 'recording_aborted'].index( oEpisode.recording_status) + oEpisode.destroy + end + end + + @programme = Programme.find_by_id(params[:id]) + if @programme + respond_to do |format| + format.html { redirect_to( @programme) } + format.xml { render :xml => @programme.errors, :status => :unprocessable_entity } + end + else + respond_to do |format| + format.html { redirect_to(programmes_url) } + format.xml { head :ok } + end + end + end end app/controllers/programmes_controller.rb @@ -51,6 +51,7 @@ <%= tab( '', 'Listings', {:controller => :Listings, :action => :channels}) %> <%= tab( '', 'Channels', {:controller => :channels, :action => :index}) %> <%= tab( '', 'Recordings', {:controller => :episodes, :action => :index, :recorded => true}) %> + <%= tab( '', 'Recordings', {:controller => :programmes, :action => :index, :recorded => true}) %> <%= tab( '', 'Jobs', {:controller => :episodes, :action => :index, :recording => true}) %> <%= tab( '', 'Search', search_programmes_url) %> </ul> app/views/layouts/application.html.erb @@ -2,6 +2,7 @@ <p> <b>Category:</b> <%= link_to @programme.category.name, :controller => :programmes, :action => :index, :category => @programme.category_id %> + <%= button_to "Delete Recordings", :controller => :programmes, :action => :deleterecordings, :id => @programme, :confirm => "Really Delete?" %> </p> <% form_for(@programme) do |f| %> app/views/programmes/show.html.erb @@ -2,12 +2,18 @@ <tr> <th>Title</th> <th>Category</th> + <% if params[:recorded] %> + <th>Recorded</th> + <% end %> </tr> <% for programme in programmes %> <tr> <td><%= link_to programme.title, :controller => :programmes, :action => :show, :id => programme %></td> <td><%= programme.category ? link_to( programme.category.name, :action => :index, :category => programme.category) : '' %></td> + <% if params[:recorded] %> + <td><%= Episode.find(:all, :conditions => ["programme_id = ? and recording_status = 'recorded'", programme]).count %></td> + <% end %> </tr> <% end %> </table> app/views/shared/_programmes.html.erb @@ -5,7 +5,7 @@ ActionController::Routing::Routes.draw do |map| map.resources :channels - map.resources :programmes, :collection => { :search => :any } + map.resources :programmes, :collection => { :search => :any }, :member => { :deleterecordings => :any} # The priority is based upon order of creation: first created -> highest priority. config/routes.rb db/production.sqlite3 @@ -36,6 +36,8 @@ class RecordEpisode nDuration = @oEpisode.ending.to_time - oNow.to_time end + nDuration += (5 * 60) # keep missing end of pappa pig + # # Ideal time to take a snapshot # lib/Scheduler.rb @@ -27,7 +27,7 @@ describe RecordEpisode do oRecordEpisode = RecordEpisode.new( oEpisode) Kernel.should_not_receive(:sleep) - Kernel.should_receive(:system).with("mencoder dvb://\"2@CrudTV\" -idx -oac copy -ovc copy -endpos 1800.0 -o \"#{RAILS_ROOT}/public/recordings/Dora the Explorer/Dora the Explorer-2008-11-10-0730.avi\" >> /tmp/pctv.log").and_return(true) + Kernel.should_receive(:system).with("mencoder dvb://\"2@CrudTV\" -idx -oac copy -ovc copy -endpos 2100.0 -o \"#{RAILS_ROOT}/public/recordings/Dora the Explorer/Dora the Explorer-2008-11-10-0730.avi\" >> /tmp/pctv.log").and_return(true) Kernel.should_receive(:system).with( "ffmpeg -i \"#{RAILS_ROOT}/public/recordings/Dora the Explorer/Dora the Explorer-2008-11-10-0730.avi\" -target pal-dvd -vcodec copy -acodec copy \"#{RAILS_ROOT}/public/recordings/Dora the Explorer/Dora the Explorer-2008-11-10-0730.mpeg\"") Kernel.should_receive(:system).with("ffmpeg -itsoffset -180.0 -i \"#{RAILS_ROOT}/public/recordings/Dora the Explorer/Dora the Explorer-2008-11-10-0730.mpeg\" -vframes 1 -an -f mjpeg -s 160x90 \"#{RAILS_ROOT}/public/recordings/Dora the Explorer/Dora the Explorer-2008-11-10-0730.mpeg.jpg\"").and_return(true) @@ -45,7 +45,7 @@ describe RecordEpisode do # Duration is shorter because we missed the start # Kernel.should_receive(:sleep).with(120).and_return(true) - Kernel.should_receive(:system).with("mencoder dvb://\"2@CrudTV\" -idx -oac copy -ovc copy -endpos 1980.0 -o \"#{RAILS_ROOT}/public/recordings/Dora the Explorer/Dora the Explorer-2008-11-10-0730.avi\" >> /tmp/pctv.log").and_return(true) + Kernel.should_receive(:system).with("mencoder dvb://\"2@CrudTV\" -idx -oac copy -ovc copy -endpos 2280.0 -o \"#{RAILS_ROOT}/public/recordings/Dora the Explorer/Dora the Explorer-2008-11-10-0730.avi\" >> /tmp/pctv.log").and_return(true) Kernel.should_receive(:system).with( "ffmpeg -i \"#{RAILS_ROOT}/public/recordings/Dora the Explorer/Dora the Explorer-2008-11-10-0730.avi\" -target pal-dvd -vcodec copy -acodec copy \"#{RAILS_ROOT}/public/recordings/Dora the Explorer/Dora the Explorer-2008-11-10-0730.mpeg\"") Kernel.should_receive(:system).with("ffmpeg -itsoffset -480.0 -i \"#{RAILS_ROOT}/public/recordings/Dora the Explorer/Dora the Explorer-2008-11-10-0730.mpeg\" -vframes 1 -an -f mjpeg -s 160x90 \"#{RAILS_ROOT}/public/recordings/Dora the Explorer/Dora the Explorer-2008-11-10-0730.mpeg.jpg\"").and_return(true) @@ -62,7 +62,7 @@ describe RecordEpisode do # # Duration is shorter because we missed the start # - Kernel.should_receive(:system).with("mencoder dvb://\"2@CrudTV\" -idx -oac copy -ovc copy -endpos 900.0 -o \"#{RAILS_ROOT}/public/recordings/Dora the Explorer/Dora the Explorer-2008-11-10-0730.avi\" >> /tmp/pctv.log").and_return(true) + Kernel.should_receive(:system).with("mencoder dvb://\"2@CrudTV\" -idx -oac copy -ovc copy -endpos 1200.0 -o \"#{RAILS_ROOT}/public/recordings/Dora the Explorer/Dora the Explorer-2008-11-10-0730.avi\" >> /tmp/pctv.log").and_return(true) Kernel.should_receive(:system).with( "ffmpeg -i \"#{RAILS_ROOT}/public/recordings/Dora the Explorer/Dora the Explorer-2008-11-10-0730.avi\" -target pal-dvd -vcodec copy -acodec copy \"#{RAILS_ROOT}/public/recordings/Dora the Explorer/Dora the Explorer-2008-11-10-0730.mpeg\"") Kernel.should_receive(:system).with("ffmpeg -itsoffset -0 -i \"#{RAILS_ROOT}/public/recordings/Dora the Explorer/Dora the Explorer-2008-11-10-0730.mpeg\" -vframes 1 -an -f mjpeg -s 160x90 \"#{RAILS_ROOT}/public/recordings/Dora the Explorer/Dora the Explorer-2008-11-10-0730.mpeg.jpg\"").and_return(true) @@ -77,7 +77,7 @@ describe RecordEpisode do oRecordEpisode = RecordEpisode.new( oEpisode) Kernel.should_not_receive(:sleep) - Kernel.should_receive(:system).once.ordered.with("mencoder dvb://\"2@CrudTV\" -idx -oac copy -ovc copy -endpos 1800.0 -o \"#{RAILS_ROOT}/public/recordings/Dora the Explorer/Dora the Explorer-2008-11-10-0730.avi\" >> /tmp/pctv.log").and_return(false) + Kernel.should_receive(:system).once.ordered.with("mencoder dvb://\"2@CrudTV\" -idx -oac copy -ovc copy -endpos 2100.0 -o \"#{RAILS_ROOT}/public/recordings/Dora the Explorer/Dora the Explorer-2008-11-10-0730.avi\" >> /tmp/pctv.log").and_return(false) Kernel.should_not_receive(:system).with(/ffmpeg/) oRecordEpisode.record( DateTime.new( 2008, 11, 10, 7, 30, 0)) @@ -93,7 +93,7 @@ describe RecordEpisode do oRecordEpisode = RecordEpisode.new( oEpisode) Kernel.should_not_receive(:sleep) - Kernel.should_receive(:system).once.ordered.with("mencoder dvb://\"2@CrudTV\" -idx -oac copy -ovc copy -endpos 1800.0 -o \"#{RAILS_ROOT}/public/recordings/Dora the Explorer/Dora the Explorer-2008-11-10-0730.avi\" >> /tmp/pctv.log").and_return(false) + Kernel.should_receive(:system).once.ordered.with("mencoder dvb://\"2@CrudTV\" -idx -oac copy -ovc copy -endpos 2100.0 -o \"#{RAILS_ROOT}/public/recordings/Dora the Explorer/Dora the Explorer-2008-11-10-0730.avi\" >> /tmp/pctv.log").and_return(false) Kernel.should_not_receive(:system).with(/ffmpeg/) oRecordEpisode.record( DateTime.new( 2008, 11, 10, 7, 30, 0)) spec/lib/RecordEpisode_spec.rb 204aab6d500b4a0212b9acbddfa678df2ad580df Peter Wilkinson peter.wilkinson@gmail.com http://github.com/pinkblob/pctv/commit/704d14fe73ae22c28fc1e206e5c86ea2d58f9d0a 704d14fe73ae22c28fc1e206e5c86ea2d58f9d0a 2009-03-13T10:08:40-07:00 2009-03-13T10:08:40-07:00 * Add five minutes to recordings as peppa pig seems to start late * Option to delete all recordings of a programme * List of recordings by programme 05ae885b3d8b31f57cd5c5888abc96224e23908b Peter Wilkinson peter.wilkinson@gmail.com