simple_pvr 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,17 +1,18 @@
 PATH
   remote: .
   specs:
-    simple_pvr (0.0.2)
+    simple_pvr (0.0.3)
       activesupport (~> 3.2)
       data_mapper (~> 1.2)
       dm-sqlite-adapter (~> 1.2)
       nokogiri (~> 1.5)
+      puma (~> 1.6)
       sinatra (~> 1.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.8)
+    activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.2.8)
@@ -41,7 +42,7 @@ GEM
       dm-transactions (~> 1.2.0)
       dm-types (~> 1.2.0)
       dm-validations (~> 1.2.0)
-    data_objects (0.10.8)
+    data_objects (0.10.12)
       addressable (~> 2.1)
     diff-lcs (1.1.3)
     dm-aggregates (1.2.0)
@@ -78,22 +79,24 @@ GEM
       uuidtools (~> 2.1)
     dm-validations (1.2.0)
       dm-core (~> 1.2.0)
-    do_sqlite3 (0.10.8)
-      data_objects (= 0.10.8)
+    do_sqlite3 (0.10.12)
+      data_objects (= 0.10.12)
     fastercsv (1.5.5)
     ffi (1.1.5)
     gherkin (2.11.2)
       json (>= 1.4.6)
-    i18n (0.6.1)
+    i18n (0.6.4)
     json (1.7.5)
-    json_pure (1.7.5)
+    json_pure (1.7.7)
     libwebsocket (0.1.5)
       addressable
     mime-types (1.19)
     multi_json (1.3.6)
     nokogiri (1.5.5)
+    puma (1.6.3)
+      rack (~> 1.2)
     rack (1.4.1)
-    rack-protection (1.4.0)
+    rack-protection (1.5.0)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
@@ -112,12 +115,12 @@ GEM
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
-    sinatra (1.3.3)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
+    sinatra (1.3.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
-    stringex (1.4.0)
-    tilt (1.3.3)
+    stringex (1.5.1)
+    tilt (1.3.5)
     uuidtools (2.1.3)
     xpath (0.1.4)
       nokogiri (~> 1.3)

data/README.md

@@ -61,7 +61,7 @@ First you must specify in a YAML file how the channel IDs in your XMLTV file rel
 that the HDHomeRun has found for you. Create a file called e.g. "channel_mappings.yaml", with lines like this:
 
         www.ontv.dk/tv/1: DR 1
-		www.ontv.dk/tv/2: DR 2
+        www.ontv.dk/tv/2: DR 2
 
 Then read your XMLTV file and the mappings file:
 
@@ -108,14 +108,16 @@ Future?
 This projects needs to be a nice, readable, hackable, tested system. No pull requests are
 accepted that violate this.
 
-For version 1 of SimplePVR, I'd like to finish the following:
+For version 1 of SimplePVR, there are no more features planned. Instead, there'll be a little clean-up:
 
-* More schedule editing, e.g.:
-  * "Start early" and "end late" (currently 2 and 5 minutes).
-  * Which time of day the schedule should be active (e.g. only the afternoon, ignoring all the
-    re-runs earlier in the day).
-* Removal of outdated schedules (the "Record single programme" and "Don't record this specific
-  programme").
+* Updating dependencies:
+  * Twitter Bootstrap.
+  * AngularJS.
+  * JQuery (should be part of the project, instead of fetched through CDN).
+  * Testacular is now called Karma.
+* Various code clean-ups (no grand plan).
+* Various GUI clean-ups (no grand plan).
+* Various bug fixes (no known issues at this point).
 
 There is lots of stuff I'd like to do after that, but I have no deadline - which means that pull
 requests are the only means you have for speeding things up. This includes:

data/bin/pvr_server

@@ -5,6 +5,6 @@ require 'simple_pvr'
 
 Rack::Server.start(
   :config => SimplePvr::PvrInitializer.rackup_file_path,
-  :Port => 4567
-  #:server => 'sinatra'
+  :Port => 4567,
+  :server => 'puma'
 )

data/features/scheduling.feature

@@ -6,6 +6,7 @@ Feature: Scheduling
 Background:
   Given the following programmes:
     | title          | subtitle             | channel   | day |
+    | Old News       | Just the old news... | Channel 1 |  -1 |
     | News right now | Just the news...     | Channel 1 |   0 |
     | Bonderøven     | Danish documentary   | Channel 1 |   1 |
     | Bonderøven     | Danish documentary   | Channel 2 |   1 |
@@ -16,6 +17,10 @@ Scenario: Nothing is scheduled by default
   Given I am on the schedules page
   Then there should be 0 upcoming recordings
 
+Scenario: I cannot record past programmes
+  Given I have navigated to the programme page for yesterday's "Old News" on channel "Channel 1"
+  Then I should not see the button "Record just this programme"
+
 Scenario: Schedule by title for a single channel
   Given I have navigated to the programme page for "Bonderøven" on channel "Channel 1"
   And I choose to record the programme on this channel
@@ -109,4 +114,56 @@ Scenario: Editing a schedule so that only some weekdays are allowed
   And I check "Record Wednesdays"
   And I check "Record Sundays"
   And I press "Update"
-  Then I should see "(Mondays, Wednesdays, and Sundays)"
+  Then I should see "(Mondays, Wednesdays, and Sundays)"
+
+Scenario: Setting "Start early" and "End late"
+  Given I have navigated to the programme page for "Bonderøven" on channel "Channel 1"
+  And I choose to record the programme on any channel
+  And I am on the schedules page
+  And I follow "Edit"
+  And I fill in "Start early" with "4"
+  And I fill in "End late" with "10"
+  And I press "Update"
+  Then I should see "(starts 4 minutes early, ends 10 minutes late)"
+
+Scenario: Start and end times of day
+  Given I have navigated to the programme page for "Bonderøven" on channel "Channel 1"
+  And I choose to record the programme on any channel
+  And I am on the schedules page
+  And I follow "Edit"
+  And I check "Filter by time of day"
+  And I fill in "From" with "17:00"
+  And I fill in "To" with "19:00"
+  And I press "Update"
+  Then I should see "(between 17:00 and 19:00)"
+
+Scenario: Start and end times of day, crossing midnight
+  Given I have navigated to the programme page for "Bonderøven" on channel "Channel 1"
+  And I choose to record the programme on any channel
+  And I am on the schedules page
+  And I follow "Edit"
+  And I check "Filter by time of day"
+  And I fill in "From" with "19:00"
+  And I fill in "To" with "3:00"
+  And I press "Update"
+  Then I should see "(between 19:00 and 3:00)"
+
+Scenario: Start time of day
+  Given I have navigated to the programme page for "Bonderøven" on channel "Channel 1"
+  And I choose to record the programme on any channel
+  And I am on the schedules page
+  And I follow "Edit"
+  And I check "Filter by time of day"
+  And I fill in "From" with "17:00"
+  And I press "Update"
+  Then I should see "(after 17:00)"
+
+Scenario: End time of day
+  Given I have navigated to the programme page for "Bonderøven" on channel "Channel 1"
+  And I choose to record the programme on any channel
+  And I am on the schedules page
+  And I follow "Edit"
+  And I check "Filter by time of day"
+  And I fill in "To" with "7:00"
+  And I press "Update"
+  Then I should see "(before 7:00)"

data/features/step_definitions/pvr_steps.rb

@@ -28,6 +28,14 @@ Given /I have navigated to the programme page for "(.*)" on channel "(.*)"/ do |
   click_link(title)
 end
 
+Given /I have navigated to the programme page for yesterday's "(.*)" on channel "(.*)"/ do |title, channel|
+  visit path_to('the channel overview page')
+  fill_in('channel_filter', :with => channel)
+  click_link('...')
+  click_link('<<')
+  click_link(title)
+end
+
 Given /I choose to record just this programme/ do
   choose_to_record('Record just this programme')
 end
@@ -77,6 +85,10 @@ Then /I should not see the schedule "(.*)"/ do |text|
   end
 end
 
+Then /I should not see the button "(.*)"/ do |text|
+    page.wait_until { page.has_no_button?(text) }
+end
+
 Then /there should be (\d*) upcoming recordings?/ do |upcoming_recordings|
   page.wait_until { find('#upcoming_recordings').all('h2').length == upcoming_recordings.to_i }
 end

data/features/support/env.rb

@@ -6,7 +6,7 @@ require 'rspec'
 require File.join(File.dirname(__FILE__), '../../lib/simple_pvr')
 
 SimplePvr::PvrInitializer.setup_for_integration_test
-SimplePvr::RecordingPlanner.read
+SimplePvr::RecordingPlanner.reload
 
 Capybara.app = eval "Rack::Builder.new {( " + SimplePvr::PvrInitializer.rack_maps_file + ")}"
 Capybara.default_driver = :selenium

data/lib/simple_pvr/hdhomerun.rb

@@ -97,7 +97,7 @@ module SimplePvr
     end
   
     def tuner_control_file(tuner)
-      File.dirname(__FILE__) + "/tuner#{tuner}.lock"
+      "tuner#{tuner}.lock"
     end
   end
 end

data/lib/simple_pvr/model/programme.rb

@@ -14,6 +14,14 @@ module SimplePvr
 
       belongs_to :channel
 
+      def end_time
+        @start_time.advance(seconds: duration)
+      end
+
+      def outdated?
+        end_time < Time.now
+      end
+
       def self.clear
         Programme.destroy
       end

data/lib/simple_pvr/model/schedule.rb

@@ -3,13 +3,36 @@ module SimplePvr
     class Schedule
       include DataMapper::Resource
       storage_names[:default] = 'schedules'
+
+      def self.cleanup
+        Schedule.all(:end_time.lt => Time.now).each {|s| s.destroy }
+      end
+
+      def self.add_specification(options)
+        Schedule.create(
+          type: :specification,
+          title: options[:title],
+          channel: options[:channel],
+          start_time: options[:start_time],
+          end_time: options[:end_time])
+      end
       
       property :id, Serial
       property :type, Enum[:specification, :exception]
-      property :title, String, :length => 255
+      property :title, String, length: 255
+
       # If specified (and channel is specified too), this schedule is for a specific
       # programme at a specific channel at a specific time
       property :start_time, DateTime
+      property :end_time, DateTime
+
+      property :custom_start_early_minutes, Integer
+      property :custom_end_late_minutes, Integer
+
+      property :filter_by_time_of_day, Boolean
+      property :from_time_of_day, String, length: 5
+      property :to_time_of_day, String, length: 5
+
       property :filter_by_weekday, Boolean
       property :monday, Boolean
       property :tuesday, Boolean
@@ -21,12 +44,12 @@ module SimplePvr
 
       belongs_to :channel, required: false
     
-      def self.add_specification(options)
-        Schedule.create(
-          type: :specification,
-          title: options[:title],
-          channel: options[:channel],
-          start_time: options[:start_time])
+      def start_early_minutes
+        custom_start_early_minutes || 2
+      end
+
+      def end_late_minutes
+        custom_end_late_minutes || 5
       end
     end
   end

data/lib/simple_pvr/recording_planner.rb

@@ -1,6 +1,8 @@
 module SimplePvr
   class RecordingPlanner
-    def self.read
+    def self.reload
+      Model::Schedule.cleanup
+
       planner = self.new
       planner.read
     end
@@ -15,24 +17,28 @@ module SimplePvr
       exceptions = schedules.find_all {|s| s.type == :exception }
       
       specifications.each do |specification|
-        title = specification.title
-        if specification.channel && specification.start_time
-          programmes = Model::Programme.on_channel_with_title_and_start_time(specification.channel, specification.title, specification.start_time)
-        elsif specification.channel
-          programmes = Model::Programme.on_channel_with_title(specification.channel, specification.title)
-        else
-          programmes = Model::Programme.with_title(specification.title)
-        end
-        
+        programmes = programmes_matching(specification)
         programmes_with_exceptions_removed = programmes.find_all {|programme| !matches_exception(programme, exceptions) }
         programmes_filtered_by_weekdays = programmes_with_exceptions_removed.find_all {|programme| on_allowed_weekday(programme, specification) }
-        add_programmes(title, programmes_filtered_by_weekdays)
+        programmes_filtered_by_time_of_day = programmes_filtered_by_weekdays.find_all {|programme| at_allowed_time_of_day(programme, specification) }
+
+        add_programmes(specification, programmes_filtered_by_time_of_day)
       end
 
       PvrInitializer.scheduler.recordings = @recordings
     end
     
     private
+    def programmes_matching(specification)
+        if specification.channel && specification.start_time
+          Model::Programme.on_channel_with_title_and_start_time(specification.channel, specification.title, specification.start_time)
+        elsif specification.channel
+          Model::Programme.on_channel_with_title(specification.channel, specification.title)
+        else
+          Model::Programme.with_title(specification.title)
+        end
+    end
+
     def matches_exception(programme, exceptions)
       exceptions.any? do |exception|
         programme.title == exception.title &&
@@ -56,17 +62,58 @@ module SimplePvr
       else false
       end
     end
+
+    def at_allowed_time_of_day(programme, specification)
+      return true unless specification.filter_by_time_of_day
+
+      # When comparing times of day below, we convert all timestamps into an integer so that we can easily compare them.
+      # We do this by converting e.g. "10:35" to the integer 1035.
+      programme_pseudo_start_time = pseudo_time_of_day_from_datetime(programme.start_time)
+
+      if specification.from_time_of_day && specification.to_time_of_day
+        pseudo_from_time = pseudo_time_of_day_from_string(specification.from_time_of_day)
+        pseudo_to_time = pseudo_time_of_day_from_string(specification.to_time_of_day)
+        if pseudo_from_time < pseudo_to_time
+          # Both times of day are at the same day
+          programme_pseudo_start_time >= pseudo_time_of_day_from_string(specification.from_time_of_day) &&
+          programme_pseudo_start_time <= pseudo_time_of_day_from_string(specification.to_time_of_day)
+        else
+          # Stretching across midnight
+          programme_pseudo_start_time >= pseudo_time_of_day_from_string(specification.from_time_of_day) ||
+          programme_pseudo_start_time <= pseudo_time_of_day_from_string(specification.to_time_of_day)
+        end
+      elsif specification.from_time_of_day
+        programme_pseudo_start_time >= pseudo_time_of_day_from_string(specification.from_time_of_day)
+      elsif specification.to_time_of_day
+        programme_pseudo_start_time <= pseudo_time_of_day_from_string(specification.to_time_of_day)
+      else
+        true
+      end
+    end
     
-    def add_programmes(title, programmes)
+    def add_programmes(schedule, programmes)
       programmes.each do |programme|
-        start_time = programme.start_time.advance(minutes: -2)
-        duration = programme.duration + 7.minutes
-        add_recording(title, programme.channel, start_time, duration, programme)
+        start_time = programme.start_time.advance(minutes: -schedule.start_early_minutes)
+        duration = programme.duration + (schedule.start_early_minutes + schedule.end_late_minutes).minutes
+        add_recording(schedule.title, programme.channel, start_time, duration, programme)
       end
     end
     
     def add_recording(title, channel, start_time, duration, programme=nil)
       @recordings << SimplePvr::Model::Recording.new(channel, title, start_time, duration, programme)
     end
+
+    # Given a time of day as string, e.g. "10:35", returns an integer which can be used to compare with other
+    # times of day, e.g. "1035"
+    def pseudo_time_of_day_from_string(s)
+      components = s.split(':')
+      components[0].to_i * 100 + components[1].to_i
+    end
+
+    # Given a datetime, representing e.g. "10:35", returns an integer which can be used to compare with other
+    # times of day, e.g. "1035"
+    def pseudo_time_of_day_from_datetime(datetime)
+      datetime.hour * 100 + datetime.min
+    end
   end
 end

data/lib/simple_pvr/scheduler.rb

@@ -29,11 +29,11 @@ module SimplePvr
       end
     end
     
-    def is_scheduled?(programme)
+    def scheduled?(programme)
       @scheduled_programmes[programme.id] != nil
     end
     
-    def is_conflicting?(programme)
+    def conflicting?(programme)
       @conflicting_programmes[programme.id] != nil
     end
     

data/lib/simple_pvr/server/base_controller.rb

@@ -24,11 +24,10 @@ module SimplePvr
       end
 
       def reload_schedules
-        RecordingPlanner.read
+        RecordingPlanner.reload
       end
 
       def programme_hash(programme)
-        is_scheduled = PvrInitializer.scheduler.is_scheduled?(programme)
         {
           id: programme.id,
           channel: { id: programme.channel.id, name: programme.channel.name },
@@ -36,8 +35,9 @@ module SimplePvr
           subtitle: programme.subtitle,
           description: programme.description,
           start_time: programme.start_time,
-          is_scheduled: is_scheduled,
-          episode_num: programme.episode_num
+          is_scheduled: PvrInitializer.scheduler.scheduled?(programme),
+          episode_num: programme.episode_num,
+          is_outdated: programme.outdated?
         }
       end
 
@@ -85,8 +85,8 @@ module SimplePvr
           id: programme.id,
           title: programme.title,
           start_time: programme.start_time,
-          is_scheduled: PvrInitializer.scheduler.is_scheduled?(programme),
-          is_conflicting: PvrInitializer.scheduler.is_conflicting?(programme)
+          is_scheduled: PvrInitializer.scheduler.scheduled?(programme),
+          is_conflicting: PvrInitializer.scheduler.conflicting?(programme)
         }
       end
     end

data/lib/simple_pvr/server/config.ru

@@ -1,5 +1,5 @@
 SimplePvr::PvrInitializer.setup
-SimplePvr::RecordingPlanner.read
+SimplePvr::RecordingPlanner.reload
 
 # Due to a lazy initialization bug in ActiveSupport:
 # http://stackoverflow.com/questions/5267700/undefined-method-encode-for-activesupportjsonmodule

data/lib/simple_pvr/server/programmes_controller.rb

@@ -30,14 +30,14 @@ module SimplePvr
 
       post '/:id/record_just_this_programme' do |id|
         programme = Model::Programme.get(id.to_i)
-        Model::Schedule.add_specification(title: programme.title, channel: programme.channel, start_time: programme.start_time)
+        Model::Schedule.add_specification(title: programme.title, channel: programme.channel, start_time: programme.start_time, end_time: programme.end_time)
         reload_schedules
         programme_hash(programme).to_json
       end
 
       post '/:id/exclude' do |id|
         programme = Model::Programme.get(id.to_i)
-        Model::Schedule.create(type: :exception, title: programme.title, channel: programme.channel, start_time: programme.start_time)
+        Model::Schedule.create(type: :exception, title: programme.title, channel: programme.channel, start_time: programme.start_time, end_time: programme.end_time)
         reload_schedules
         programme_hash(programme).to_json
       end

data/lib/simple_pvr/server/schedules_controller.rb

@@ -29,6 +29,14 @@ module SimplePvr
         schedule = Model::Schedule.get(id)
         schedule.title = parameters['title']
         schedule.channel = channel_id > 0 ? Model::Channel.get(channel_id) : nil
+
+        schedule.custom_start_early_minutes = parameters['custom_start_early_minutes'].present? ? parameters['custom_start_early_minutes'].to_i : nil
+        schedule.custom_end_late_minutes = parameters['custom_end_late_minutes'].present? ? parameters['custom_end_late_minutes'].to_i : nil
+
+        schedule.filter_by_time_of_day = parameters['filter_by_time_of_day']
+        schedule.from_time_of_day = parameters['from_time_of_day']
+        schedule.to_time_of_day = parameters['to_time_of_day']
+
         schedule.filter_by_weekday = parameters['filter_by_weekday'] ? true : nil
         schedule.monday = parameters['monday']
         schedule.tuesday = parameters['tuesday']
@@ -56,6 +64,16 @@ module SimplePvr
           channel: schedule.channel ? { id: schedule.channel.id, name: schedule.channel.name } : nil,
           start_time: schedule.start_time,
           is_exception: schedule.type == :exception,
+
+          custom_start_early_minutes: schedule.custom_start_early_minutes,
+          custom_end_late_minutes: schedule.custom_end_late_minutes,
+          start_early_minutes: schedule.start_early_minutes,
+          end_late_minutes: schedule.end_late_minutes,
+
+          filter_by_time_of_day: schedule.filter_by_time_of_day,
+          from_time_of_day: schedule.from_time_of_day,
+          to_time_of_day: schedule.to_time_of_day,
+
           filter_by_weekday: schedule.filter_by_weekday,
           monday: schedule.monday,
           tuesday: schedule.tuesday,

data/lib/simple_pvr/server/upcoming_recordings_controller.rb

@@ -9,7 +9,7 @@ module SimplePvr
             start_time: recording.start_time,
             channel: { id: recording.channel.id, name: recording.channel.name },
             subtitle: recording.programme.subtitle,
-            is_conflicting: PvrInitializer.scheduler.is_conflicting?(recording.programme)
+            is_conflicting: PvrInitializer.scheduler.conflicting?(recording.programme)
           }
         end.to_json
       end

data/lib/simple_pvr/version.rb

@@ -1,3 +1,3 @@
 module SimplePvr
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/public/index.html

@@ -20,6 +20,7 @@
 
 	<script src="app/js/controllers.js"></script>
 	<script src="app/js/services.js"></script>
+  <script src="app/js/filters.js"></script>
 	<script src="app/js/app.js"></script>
   </head>
 
@@ -40,10 +41,7 @@
               <navbar-item route="/shows">Recordings</navbar-item>
               <navbar-item route="/status">Status</navbar-item>
             </ul>
-			<form class="navbar-form pull-right" ng-controller="SearchProgrammesCtrl" ng-submit="search()">
-			  <input pvr-autocomplete class="span2" id="programme-search-query" type="text" placeholder="Search programmes...">
-			  <button type="submit" class="btn">Search</button>
-			</form>
+            <title-search></title-search>
           </div>
         </div>
       </div>