simple_pvr 1.0.0 → 1.1.0

data/features/channel_overview.feature

@@ -11,7 +11,7 @@ Background:
     | Animals   |
   And the following programmes:
     | title           | subtitle                        | channel   | day |
-	| Blast from past | Prehistoric documentary         | Channel 1 |  -1 |
+	  | Blast from past | Prehistoric documentary         | Channel 1 |  -1 |
     | Bonderøven      | Danish documentary              | Channel 1 |   0 |
     | Blood and Bone  | American action movie from 2009 | Channel 1 |   0 |
     | Noddy           | Children's programme            | Channel 2 |   0 |

data/features/recordings.feature

@@ -0,0 +1,30 @@
+Feature: Channel overview
+  In order to actually use the system for anything
+  As a user
+  I need to be able to view and administer recorded shows
+
+Background:
+  Given the following recorded shows:
+    | name       |
+    | Bonderøven |
+    | Noddy      |
+    | Star Trek  |
+  And the following recordings:
+    | name       | id        |
+    | Bonderøven | 1234567   |
+    | Bonderøven | 1234567-1 |
+    | Bonderøven | 1234678   |
+    | Star Trek  | 2345678   |
+
+Scenario: Shows overview shows all recorded shows
+  Given I am on the shows page
+  Then I should see "Bonderøven"
+  And I should see "Noddy"
+  And I should see "Star Trek"
+
+Scenario: Show details shows all recordings of show
+  Given I am on the shows page
+  # The following does not work with Poltergeist/PhantomJS - prints infinitely many
+  # AngularJS errors :-(
+  #And I see the details for show "Bonderøven"
+  #Then I should see 3 recordings

data/features/step_definitions/pvr_steps.rb

@@ -1,4 +1,5 @@
 require 'timeout'
+require 'pry'
 
 RSpec::Matchers.define :become do |expected|
   match do |block|
@@ -40,6 +41,24 @@ Given /the following channels\:/ do |channel_table|
   end
 end
 
+Given /the following recorded shows:/ do |shows_table|
+  recordings_directory = Dir.pwd + '/features/recordings'
+  FileUtils.rm_rf(recordings_directory)
+  FileUtils.makedirs(recordings_directory)
+
+  shows_table.hashes.each do |show|
+    FileUtils.makedirs(recordings_directory + '/' + show['name'])
+  end
+end
+
+Given /the following recordings:/ do |recordings_table|
+  recordings_directory = Dir.pwd + '/features/recordings'
+
+  recordings_table.hashes.each do |recording|
+    FileUtils.makedirs(recordings_directory + '/' + recording['name'] + '/' + recording['id'])
+  end
+end
+
 Given /I have navigated to the week overview for channel "(.*)"/ do |channel|
   visit path_to('the channel overview page')
   fill_in('channel_filter', :with => channel)
@@ -97,6 +116,17 @@ Then /I should see the programme title suggestion "(.*)"/ do |suggestion|
   page.should have_text(text)
 end
 
+When /I see the details for show "(.*)"/ do |show_name|
+  div = find(:xpath, "//h2[text()='#{show_name}']").find(:xpath, '..')
+  within(div) do
+    click_on('Episodes')
+  end
+end
+
+Then /I should see (\d*) recordings/ do |number_of_recordings|
+  expect { page.all(:xpath, "//button[text()='Delete recording']").length }.to become(number_of_recordings.to_i)
+end
+
 Then /I should see "(.*)" in the page contents/ do |text|
   within('#contents') do
     page.should have_text(text)
@@ -141,6 +171,10 @@ Then /I wait (\d*) seconds/ do |seconds|
   sleep seconds.to_i
 end
 
+Then /I start the debugger/ do
+  binding.pry
+end
+
 def find_or_create_channel_with_name(name)
   channel = SimplePvr::Model::Channel.first(name: name)
   channel ? channel : SimplePvr::Model::Channel.add(name, 0, 0)

data/features/support/env.rb

@@ -10,9 +10,8 @@ SimplePvr::PvrInitializer.setup_for_integration_test
 SimplePvr::RecordingPlanner.reload
 
 Capybara.app = eval "Rack::Builder.new {( " + SimplePvr::PvrInitializer.rack_maps_file + ")}"
-Capybara.default_driver = (ENV['capybara_driver'] || 'selenium').to_sym
+Capybara.default_driver = (ENV['capybara_driver'] || 'poltergeist').to_sym # 'selenium' can be nice too
 Capybara.default_wait_time = 30
-Capybara.ignore_hidden_elements = true # AngularJS shows and hides elements all the time, so this is important
 
 class SimplePvrWorld
   include Capybara::DSL

data/features/support/paths.rb

@@ -7,6 +7,8 @@ module NavigationHelpers
       '/channels'
     when 'the status page'
       '/status'
+    when 'the shows page'
+      '/shows'
     else
       raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
         "Now, go and add a mapping in #{__FILE__}"

data/lib/simple_pvr.rb

@@ -9,10 +9,12 @@ require File.dirname(__FILE__) + '/simple_pvr/recording_planner'
 require File.dirname(__FILE__) + '/simple_pvr/recorder'
 require File.dirname(__FILE__) + '/simple_pvr/scheduler'
 require File.dirname(__FILE__) + '/simple_pvr/recording_manager'
+require File.dirname(__FILE__) + '/simple_pvr/programme_icon_fetcher'
 require File.dirname(__FILE__) + '/simple_pvr/ffmpeg'
 require File.dirname(__FILE__) + '/simple_pvr/xmltv_reader'
 
 require File.dirname(__FILE__) + '/simple_pvr/server/base_controller'
+require File.dirname(__FILE__) + '/simple_pvr/server/secured_controller'
 require File.dirname(__FILE__) + '/simple_pvr/server/app_controller'
 require File.dirname(__FILE__) + '/simple_pvr/server/channels_controller'
 require File.dirname(__FILE__) + '/simple_pvr/server/programmes_controller'

data/lib/simple_pvr/model/database_initializer.rb

@@ -3,6 +3,10 @@ require 'dm-migrations'
 require 'active_support/time_with_zone'
 require File.dirname(__FILE__) + '/channel'
 require File.dirname(__FILE__) + '/programme'
+require File.dirname(__FILE__) + '/programme_category'
+require File.dirname(__FILE__) + '/programme_director'
+require File.dirname(__FILE__) + '/programme_presenter'
+require File.dirname(__FILE__) + '/programme_actor'
 require File.dirname(__FILE__) + '/schedule'
 require File.dirname(__FILE__) + '/recording'
 
@@ -19,6 +23,10 @@ module SimplePvr
     
       def self.clear
         Schedule.destroy
+        ProgrammeCategory.destroy
+        ProgrammePresenter.destroy
+        ProgrammeDirector.destroy
+        ProgrammeActor.destroy
         Programme.destroy
         Channel.destroy
       end

data/lib/simple_pvr/model/programme.rb

@@ -11,8 +11,13 @@ module SimplePvr
       property :start_time, DateTime
       property :duration, Integer
       property :episode_num, String, index: true
+      property :icon_url, String, :length => 255
 
       belongs_to :channel
+      has n, :categories, 'ProgrammeCategory'
+      has n, :directors, 'ProgrammeDirector'
+      has n, :presenters, 'ProgrammePresenter'
+      has n, :actors, 'ProgrammeActor'
 
       def end_time
         @start_time.advance(seconds: duration)
@@ -23,10 +28,14 @@ module SimplePvr
       end
 
       def self.clear
+        ProgrammeCategory.destroy
+        ProgrammeDirector.destroy
+        ProgrammePresenter.destroy
+        ProgrammeActor.destroy
         Programme.destroy
       end
 
-      def self.add(channel, title, subtitle, description, start_time, duration, episode_num)
+      def self.add(channel, title, subtitle, description, start_time, duration, episode_num, icon_url=nil)
         channel.programmes.create(
           channel: channel,
           title: title,
@@ -34,7 +43,8 @@ module SimplePvr
           description: description,
           start_time: start_time,
           duration: duration.to_i,
-          episode_num: episode_num)
+          episode_num: episode_num,
+          icon_url: icon_url)
       end
 
       def self.with_title(title)

data/lib/simple_pvr/model/programme_actor.rb

@@ -0,0 +1,14 @@
+module SimplePvr
+  module Model
+    class ProgrammeActor
+      include DataMapper::Resource
+      storage_names[:default] = 'programme_actors'
+
+      property :id, Serial
+      property :role_name, String, :length => 255
+      property :actor_name, String, :length => 255
+      
+      belongs_to :programme
+    end
+  end
+end

data/lib/simple_pvr/model/programme_category.rb

@@ -0,0 +1,14 @@
+module SimplePvr
+  module Model
+    class ProgrammeCategory
+      include DataMapper::Resource
+      storage_names[:default] = 'programme_categories'
+
+      property :id, Serial
+      property :language, String, :length => 4
+      property :name, String, :length => 255
+      
+      belongs_to :programme
+    end
+  end
+end

data/lib/simple_pvr/model/programme_director.rb

@@ -0,0 +1,13 @@
+module SimplePvr
+  module Model
+    class ProgrammeDirector
+      include DataMapper::Resource
+      storage_names[:default] = 'programme_directors'
+
+      property :id, Serial
+      property :name, String, :length => 255
+      
+      belongs_to :programme
+    end
+  end
+end

data/lib/simple_pvr/model/programme_presenter.rb

@@ -0,0 +1,13 @@
+module SimplePvr
+  module Model
+    class ProgrammePresenter
+      include DataMapper::Resource
+      storage_names[:default] = 'programme_presenters'
+
+      property :id, Serial
+      property :name, String, :length => 255
+      
+      belongs_to :programme
+    end
+  end
+end

data/lib/simple_pvr/model/recording.rb

@@ -26,6 +26,18 @@ module SimplePvr
       def inspect
         "'#{@show_name}' from '#{@channel.name}' at '#{@start_time}' with duration #{@duration} and programme #{@programme}"
       end
+      
+      def similar_to(other)
+        other != nil &&
+        other.channel == @channel &&
+        other.show_name == @show_name &&
+        other.start_time == @start_time
+      end
+      
+      def update_with(other)
+        @duration = other.duration
+        @programme = other.programme
+      end
 
       def ==(other)
         other != nil &&

data/lib/simple_pvr/programme_icon_fetcher.rb

@@ -0,0 +1,15 @@
+require 'open-uri'
+
+module SimplePvr
+  class ProgrammeIconFetcher
+    def self.fetch(url, destination_file)
+      Thread.new do
+        File.open(destination_file, "wb") do |saved_file|
+          open(url, 'rb') do |read_file|
+            saved_file.write(read_file.read)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/simple_pvr/pvr_initializer.rb

@@ -2,13 +2,13 @@ module SimplePvr
   class PvrInitializer
     def self.setup
       Model::DatabaseInitializer.setup
-      setup_with_hdhomerun(HDHomeRun.new)
+      setup_with_hdhomerun_and_recording_directory(HDHomeRun.new, Dir.pwd + '/recordings')
       @hdhomerun.scan_for_channels if Model::Channel.all.empty?
     end
     
     def self.setup_for_integration_test
       Model::DatabaseInitializer.prepare_for_test
-      setup_with_hdhomerun(HDHomeRunFake.new)
+      setup_with_hdhomerun_and_recording_directory(HDHomeRunFake.new, Dir.pwd + '/features/recordings')
     end
     
     def self.hdhomerun
@@ -37,9 +37,9 @@ module SimplePvr
     end
     
     private
-    def self.setup_with_hdhomerun(hdhomerun)
+    def self.setup_with_hdhomerun_and_recording_directory(hdhomerun, recording_directory)
       @hdhomerun = hdhomerun
-      @recording_manager = RecordingManager.new
+      @recording_manager = RecordingManager.new(recording_directory)
       @scheduler = Scheduler.new
       @scheduler.start
     end

data/lib/simple_pvr/recorder.rb

@@ -1,6 +1,4 @@
 require 'fileutils'
-require File.dirname(__FILE__) + '/hdhomerun'
-require File.dirname(__FILE__) + '/pvr_logger'
 
 module SimplePvr
   class Recorder
@@ -11,7 +9,10 @@ module SimplePvr
     def start!
       @directory = PvrInitializer.recording_manager.create_directory_for_recording(@recording)
       PvrInitializer.hdhomerun.start_recording(@tuner, @recording.channel.frequency, @recording.channel.channel_id, @directory)
-    
+      
+      icon_url = @recording.programme.icon_url
+      ProgrammeIconFetcher.fetch(icon_url, "#{@directory}/icon") if icon_url
+      
       PvrLogger.info "Started recording #{@recording.show_name} in #{@directory}"
     end
   

data/lib/simple_pvr/recording_manager.rb

@@ -1,9 +1,9 @@
 module SimplePvr
-  RecordingMetadata = Struct.new(:has_thumbnail, :has_webm, :show_name, :episode, :channel, :subtitle, :description, :start_time, :duration)
+  RecordingMetadata = Struct.new(:id, :has_icon, :has_thumbnail, :has_webm, :show_name, :channel, :subtitle, :description, :categories, :directors, :presenters, :actors, :start_time, :duration)
   
   class RecordingManager
-    def initialize(recordings_directory=nil)
-      @recordings_directory = recordings_directory || Dir.pwd + '/recordings'
+    def initialize(recordings_directory)
+      @recordings_directory = recordings_directory
     end
     
     def shows
@@ -14,45 +14,53 @@ module SimplePvr
       FileUtils.rm_rf(directory_for_show(show_name))
     end
     
-    def episodes_of(show_name)
-      episodes = Dir.new(directory_for_show(show_name)).entries - ['.', '..']
-      episodes.sort.map do |episode|
-        metadata_for(show_name, episode)
+    def recordings_of(show_name)
+      recordings = Dir.new(directory_for_show(show_name)).entries - ['.', '..']
+      recordings.sort.map do |recording_id|
+        metadata_for(show_name, recording_id)
       end
     end
     
-    def metadata_for(show_name, episode)
-      metadata_file_name = directory_for_show_and_episode(show_name, episode) + '/metadata.yml'
+    def metadata_for(show_name, recording_id)
+      metadata_file_name = directory_for_show_and_recording(show_name, recording_id) + '/metadata.yml'
       metadata = File.exists?(metadata_file_name) ? YAML.load_file(metadata_file_name) : {}
 
-      thumbnail_file_name = directory_for_show_and_episode(show_name, episode) + '/thumbnail.png'
+      icon_file_name = directory_for_show_and_recording(show_name, recording_id) + '/icon'
+      has_icon = File.exists?(icon_file_name)
+
+      thumbnail_file_name = directory_for_show_and_recording(show_name, recording_id) + '/thumbnail.png'
       has_thumbnail = File.exists?(thumbnail_file_name)
 
-      webm_file_name = directory_for_show_and_episode(show_name, episode) + '/stream.webm'
+      webm_file_name = directory_for_show_and_recording(show_name, recording_id) + '/stream.webm'
       has_webm = File.exists?(webm_file_name)
 
       RecordingMetadata.new(
+        recording_id,
+        has_icon,
         has_thumbnail,
         has_webm,
         show_name,
-        episode,
         metadata[:channel],
         metadata[:subtitle],
         metadata[:description],
+        metadata[:categories] || [],
+        metadata[:directors] || [],
+        metadata[:presenters] || [],
+        metadata[:actors] || [],
         metadata[:start_time],
         metadata[:duration])
     end
 
-    def delete_show_episode(show_name, episode)
-      FileUtils.rm_rf(@recordings_directory + '/' + show_name + '/' + episode)
+    def delete_show_recording(show_name, recording_id)
+      FileUtils.rm_rf(@recordings_directory + '/' + show_name + '/' + recording_id)
     end
 
     def create_directory_for_recording(recording)
       show_directory = directory_for_show(recording.show_name)
       ensure_directory_exists(show_directory)
 
-      new_sequence_number = next_sequence_number_for(show_directory)
-      recording_directory = "#{show_directory}/#{new_sequence_number}"
+      recording_subdirectory = subdirectory_for_recording(recording, show_directory)
+      recording_directory = "#{show_directory}/#{recording_subdirectory}"
       ensure_directory_exists(recording_directory)
 
       create_metadata(recording_directory, recording)
@@ -60,8 +68,8 @@ module SimplePvr
       recording_directory
     end
     
-    def directory_for_show_and_episode(show_name, episode)
-      directory_for_show(show_name) + '/' + episode
+    def directory_for_show_and_recording(show_name, recording_id)
+      directory_for_show(show_name) + '/' + recording_id
     end
 
     private
@@ -75,9 +83,16 @@ module SimplePvr
       FileUtils.makedirs(directory) unless File.exists?(directory)
     end
     
-    def next_sequence_number_for(base_directory)
-      largest_current_sequence_number = Dir.new(base_directory).map {|dir_name| dir_name.to_i }.max
-      1 + largest_current_sequence_number
+    def subdirectory_for_recording(recording, base_directory)
+      start_time_millis = recording.start_time.to_i
+      path = "#{base_directory}/#{start_time_millis}"
+      return "#{start_time_millis}" unless File.exists?(path)
+
+      sequence_number = 1
+      while File.exists?("#{path}-#{sequence_number}")
+        sequence_number += 1
+      end
+      "#{start_time_millis}-#{sequence_number}"
     end
     
     def create_metadata(directory, recording)
@@ -88,10 +103,15 @@ module SimplePvr
         duration: recording.duration
       }
       
-      if recording.programme
+      programme = recording.programme
+      if programme
         metadata.merge!({
-          subtitle: recording.programme.subtitle,
-          description: recording.programme.description
+          subtitle: programme.subtitle,
+          description: programme.description,
+          categories: programme.categories.map { |category| category.name },
+          directors: programme.directors.map { |director| director.name },
+          presenters: programme.presenters.map { |presenter| presenter.name },
+          actors: programme.actors.map { |actor| { role_name: actor.role_name, actor_name: actor.actor_name } }
         })
       end