simple_pvr 1.0.0 → 1.1.0

data/lib/simple_pvr/recording_planner.rb

@@ -3,7 +3,7 @@ module SimplePvr
     def self.reload
       planner = self.new
       planner.read
-      SimplePvr::Model::Schedule.cleanup
+      Model::Schedule.cleanup
     end
     
     def initialize
@@ -123,8 +123,8 @@ module SimplePvr
       end
     end
     
-    def add_recording(title, channel, start_time, duration, programme=nil)
-      @recordings << SimplePvr::Model::Recording.new(channel, title, start_time, duration, programme)
+    def add_recording(title, channel, start_time, duration, programme)
+      @recordings << 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

data/lib/simple_pvr/scheduler.rb

@@ -4,7 +4,9 @@ module SimplePvr
     
     def initialize
       @number_of_tuners = 2
-      @upcoming_recordings, @current_recordings, @recorders = [], [nil] * @number_of_tuners, {}
+      @current_recordings = [nil] * @number_of_tuners
+      @recorders = {}
+      @upcoming_recordings = []
       @mutex = Mutex.new
     end
 
@@ -16,7 +18,7 @@ module SimplePvr
         end
       end
     end
-    
+
     def recordings=(recordings)
       @mutex.synchronize do
         @upcoming_recordings = recordings.sort_by {|r| r.start_time }.find_all {|r| !r.expired? }
@@ -82,8 +84,14 @@ module SimplePvr
     end
     
     def stop_current_recordings_not_relevant_anymore
-      @current_recordings.each do |recording|
-        stop_recording(recording) if recording && !@upcoming_recordings.include?(recording)
+      @current_recordings.find_all {|r| r != nil }.each do |recording|
+        similar_recording = @upcoming_recordings.find {|r| recording.similar_to(r) }
+        if similar_recording
+          # It's (probably) the same show, so we continue recording and update with new information
+          similar_recording.update_with(recording)
+        else
+          stop_recording(recording)
+        end
       end
     end
     

data/lib/simple_pvr/server/base_controller.rb

@@ -8,16 +8,6 @@ module SimplePvr
     class BaseController < Sinatra::Base
       include ERB::Util
 
-      http_username, http_password = ENV['username'], ENV['password']
-      if http_username && http_password
-        PvrLogger.info('Securing server with Basic HTTP Authentication')
-        use Rack::Auth::Basic, 'Restricted Area' do |username, password|
-          [username, password] == [http_username, http_password]
-        end
-      else
-        PvrLogger.info('Beware: Unsecured server. Do not expose to the rest of the world!')
-      end
-
       configure do
         set :public_folder, File.dirname(__FILE__) + '/../../../public/'
         mime_type :webm, 'video/webm'
@@ -34,23 +24,32 @@ module SimplePvr
           title: programme.title,
           subtitle: programme.subtitle,
           description: programme.description,
+          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 } },
+          categories: programme.categories.map { |category| category.name },
           start_time: programme.start_time,
           is_scheduled: PvrInitializer.scheduler.scheduled?(programme),
           episode_num: programme.episode_num,
+          icon_url: programme.icon_url,
           is_outdated: programme.outdated?
         }
       end
 
       def recording_hash(show_id, recording)
-        path = PvrInitializer.recording_manager.directory_for_show_and_episode(show_id, recording.episode)
+        path = PvrInitializer.recording_manager.directory_for_show_and_recording(show_id, recording.id)
         {
-          id: recording.episode,
+          id: recording.id,
           show_id: show_id,
-          episode: recording.episode,
           subtitle: recording.subtitle,
           description: recording.description,
+          directors: recording.directors,
+          presenters: recording.presenters,
+          actors: recording.actors,
+          categories: recording.categories,
           start_time: recording.start_time,
           channel_name: recording.channel,
+          has_icon: recording.has_icon,
           has_thumbnail: recording.has_thumbnail,
           has_webm: recording.has_webm,
           local_file_url: 'file://' + File.join(path, 'stream.ts')

data/lib/simple_pvr/server/channels_controller.rb

@@ -1,6 +1,6 @@
 module SimplePvr
   module Server
-    class ChannelsController < BaseController
+    class ChannelsController < SecuredController
       get '/' do
         Model::Channel.all_with_current_programmes.map do |channel_with_current_programmes|
           channel_with_current_programmes_hash(channel_with_current_programmes)
@@ -8,11 +8,11 @@ module SimplePvr
       end
 
       get '/:id' do |id|
-        channel_with_current_programmes_hash(Model::Channel.with_current_programmes(id)).to_json
+        channel_with_current_programmes_hash(Model::Channel.with_current_programmes(id.to_i)).to_json
       end
 
       post '/:id/hide' do |id|
-        channel = Model::Channel.get(id)
+        channel = Model::Channel.get(id.to_i)
         channel.hidden = true
         channel.save
         {
@@ -23,7 +23,7 @@ module SimplePvr
       end
 
       post '/:id/show' do |id|
-        channel = Model::Channel.get(id)
+        channel = Model::Channel.get(id.to_i)
         channel.hidden = false
         channel.save
         {
@@ -42,7 +42,7 @@ module SimplePvr
         end
         previous_date = this_date.advance(days: -7)
         next_date = this_date.advance(days: 7)
-        channel = Model::Channel.get(channel_id)
+        channel = Model::Channel.get(channel_id.to_i)
 
         days = (0..6).map do |date_advanced|
           from_date = this_date.advance(days: date_advanced)

data/lib/simple_pvr/server/programmes_controller.rb

@@ -1,6 +1,6 @@
 module SimplePvr
   module Server
-    class ProgrammesController < BaseController
+    class ProgrammesController < SecuredController
       get '/title_search' do
         Model::Programme.titles_containing(params['query']).to_json
       end
@@ -10,7 +10,7 @@ module SimplePvr
       end
 
       get '/:id' do |id|
-        programme = Model::Programme.get(id)
+        programme = Model::Programme.get(id.to_i)
         programme_hash(programme).to_json
       end
 

data/lib/simple_pvr/server/schedules_controller.rb

@@ -1,6 +1,6 @@
 module SimplePvr
   module Server
-    class SchedulesController < BaseController
+    class SchedulesController < SecuredController
       # Must come before the "post '/:id'" below, or it won't get hit :-)
       post '/reload' do
         reload_schedules
@@ -20,13 +20,13 @@ module SimplePvr
       end
       
       get '/:id' do |id|
-        schedule_map(Model::Schedule.get(id)).to_json
+        schedule_map(Model::Schedule.get(id.to_i)).to_json
       end
       
       post '/:id' do |id|
         parameters = JSON.parse(request.body.read)
         channel_id = parameters['channel'] != nil ? parameters['channel']['id'].to_i : 0
-        schedule = Model::Schedule.get(id)
+        schedule = Model::Schedule.get(id.to_i)
         schedule.title = parameters['title']
         schedule.channel = channel_id > 0 ? Model::Channel.get(channel_id) : nil
 
@@ -51,7 +51,7 @@ module SimplePvr
       end
 
       delete '/:id' do |id|
-        Model::Schedule.get(id).destroy
+        Model::Schedule.get(id.to_i).destroy
         reload_schedules
         ''
       end

data/lib/simple_pvr/server/secured_controller.rb

@@ -0,0 +1,71 @@
+require 'base64'
+
+module SimplePvr
+  module Server
+    class SecuredController < BaseController
+      if ENV['username'] && ENV['password']
+        PvrLogger.info('Server secured with Basic HTTP Authentication')
+      else
+        PvrLogger.info('Beware: Unsecured server. Do not expose to the rest of the world!')
+      end
+
+      before do
+        return unless security_enabled
+        return if username_and_password_from_request == [http_username, http_password]
+
+        # We don't want AJAX calls to pop up the browser's own log-in dialog, so we
+        # give AJAX calls a special scheme. See
+        # http://stackoverflow.com/questions/86105/how-can-i-supress-the-browsers-authentication-dialog
+        # and
+        # http://loudvchar.blogspot.ca/2010/11/avoiding-browser-popup-for-401.html
+        scheme = is_ajax_call ? 'xBasic' : 'Basic'
+
+        halt 401, {
+          'Content-Type' => 'text/plain',
+          'Content-Length' => '0',
+          'WWW-Authenticate' => "#{scheme} realm=\"SimplePVR\""
+          }, []
+      end
+
+      def http_username
+        ENV['username']
+      end
+
+      def http_password
+        ENV['password']
+      end
+
+      private
+      def security_enabled
+        http_username && http_password
+      end
+
+      def username_and_password_from_request
+        authorization = encoded_credentials_from_http_basic_authentication || encoded_credentials_from_cookie
+        if authorization
+          username_and_password = Base64.decode64(authorization)
+          if username_and_password =~ /(.*):(.*)/
+            username, password = $1, $2
+            return [username, password]
+          end
+        end
+        [nil, nil]
+      end
+      
+      def encoded_credentials_from_http_basic_authentication
+        authorization = env['HTTP_AUTHORIZATION']
+        if authorization =~ /Basic ([a-zA-Z0-9\+\/]*[=]{0,2})/
+          return $1
+        end
+      end
+      
+      def encoded_credentials_from_cookie
+        request.cookies['basicCredentials']
+      end
+
+      def is_ajax_call
+        env['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest'
+      end
+    end
+  end
+end

data/lib/simple_pvr/server/shows_controller.rb

@@ -1,6 +1,6 @@
 module SimplePvr
   module Server
-    class ShowsController < BaseController
+    class ShowsController < SecuredController
       get '/' do
         shows = PvrInitializer.recording_manager.shows
         shows.map do |show|
@@ -24,7 +24,7 @@ module SimplePvr
       end
 
       get '/:show_id/recordings/?' do |show_id|
-        recordings = PvrInitializer.recording_manager.episodes_of(show_id)
+        recordings = PvrInitializer.recording_manager.recordings_of(show_id)
         recordings.map {|recording| recording_hash(show_id, recording) }.to_json
       end
 
@@ -33,28 +33,33 @@ module SimplePvr
         recording_hash(show_id, recording).to_json
       end
 
-      delete '/:show_id/recordings/:episode' do |show_id, episode|
-        PvrInitializer.recording_manager.delete_show_episode(show_id, episode)
+      delete '/:show_id/recordings/:recording_id' do |show_id, recording_id|
+        PvrInitializer.recording_manager.delete_show_recording(show_id, recording_id)
         ''
       end
 
+      get '/:show_id/recordings/:recording_id/icon' do |show_id, recording_id|
+        path = PvrInitializer.recording_manager.directory_for_show_and_recording(show_id, recording_id)
+        send_file File.join(path, 'icon')
+      end
+
       get '/:show_id/recordings/:recording_id/thumbnail.png' do |show_id, recording_id|
-        path = PvrInitializer.recording_manager.directory_for_show_and_episode(show_id, recording_id)
+        path = PvrInitializer.recording_manager.directory_for_show_and_recording(show_id, recording_id)
         send_file File.join(path, 'thumbnail.png')
       end
 
       get '/:show_id/recordings/:recording_id/stream.ts' do |show_id, recording_id|
-        path = PvrInitializer.recording_manager.directory_for_show_and_episode(show_id, recording_id)
+        path = PvrInitializer.recording_manager.directory_for_show_and_recording(show_id, recording_id)
         send_file File.join(path, 'stream.ts')
       end
 
       get '/:show_id/recordings/:recording_id/stream.webm' do |show_id, recording_id|
-        path = PvrInitializer.recording_manager.directory_for_show_and_episode(show_id, recording_id)
+        path = PvrInitializer.recording_manager.directory_for_show_and_recording(show_id, recording_id)
         send_file File.join(path, 'stream.webm'), type: :webm
       end
 
       post '/:show_id/recordings/:recording_id/transcode' do |show_id, recording_id|
-        path = PvrInitializer.recording_manager.directory_for_show_and_episode(show_id, recording_id)
+        path = PvrInitializer.recording_manager.directory_for_show_and_recording(show_id, recording_id)
         Ffmpeg.transcode_to_webm(path)
         ''
       end

data/lib/simple_pvr/server/status_controller.rb

@@ -1,6 +1,6 @@
 module SimplePvr
   module Server
-    class StatusController < BaseController
+    class StatusController < SecuredController
       get '/' do
         {
           status_text: PvrInitializer.scheduler.status_text

data/lib/simple_pvr/server/upcoming_recordings_controller.rb

@@ -1,6 +1,6 @@
 module SimplePvr
   module Server
-    class UpcomingRecordingsController < BaseController
+    class UpcomingRecordingsController < SecuredController
       get '/' do
         PvrInitializer.scheduler.upcoming_recordings.map do |recording|
           {

data/lib/simple_pvr/version.rb

@@ -1,3 +1,3 @@
 module SimplePvr
-  VERSION = "1.0.0"
+  VERSION = '1.1.0'
 end

data/lib/simple_pvr/xmltv_reader.rb

@@ -50,7 +50,9 @@ module SimplePvr
     end
     
     def add_programme(channel_name, programme)
-      title_node, subtitle_node, description_node, episode_num_node = nil
+      title_node, subtitle_node, description_node, episode_num_node, icon_node, credits_node = nil
+      category_nodes = []
+      
       programme.children.each do |child|
         case child.name
         when 'title'
@@ -58,9 +60,15 @@ module SimplePvr
         when 'sub-title'
           subtitle_node = child
         when 'desc'
-            description_node = child
+          description_node = child
         when 'episode-num'
-            episode_num_node = child
+          episode_num_node = child
+        when 'icon'
+          icon_node = child
+        when 'category'
+          category_nodes << child
+        when 'credits'
+          credits_node = child
         end
       end
       
@@ -70,8 +78,33 @@ module SimplePvr
       episode_num = episode_num_node ? episode_num_node.text : ''
       start_time = Time.parse(programme[:start])
       stop_time = Time.parse(programme[:stop])
+      icon_url = icon_node ? icon_node['src'] : nil
 
-      Programme.add(channel_from_name(channel_name), title, subtitle, description, start_time, stop_time - start_time, episode_num)
+      programme = Programme.add(channel_from_name(channel_name), title, subtitle, description, start_time, stop_time - start_time, episode_num, icon_url)
+      
+      if programme
+        add_categories(programme, category_nodes)
+        add_credits(programme, credits_node) if credits_node
+      end
+    end
+    
+    def add_categories(programme, category_nodes)
+      category_nodes.each do |child|
+        programme.categories.create(language: child[:language], name: child.text)
+      end
+    end
+    
+    def add_credits(programme, credits_node)
+      credits_node.children.each do |child|
+        case child.name
+        when 'director'
+          programme.directors.create(name: child.text)
+        when 'presenter'
+          programme.presenters.create(name: child.text)
+        when 'actor'
+          programme.actors.create(role_name: child[:role], actor_name: child.text)
+        end
+      end
     end
     
     def channel_from_name(channel_name)

data/public/css/typeahead.js-bootstrap.css

@@ -0,0 +1,83 @@
+/* From https://github.com/ashleydw/typeahead.js-bootstrap.css */
+
+.twitter-typeahead {
+    width: 100%;
+    position: relative;
+}
+
+.twitter-typeahead .tt-query,
+.twitter-typeahead .tt-hint {
+    margin-bottom: 0;
+    width: 100%;
+    height: 34px;
+    position: absolute;
+    top: 0;
+    left: 0;
+}
+
+.twitter-typeahead .tt-hint {
+    color: #a1a1a1;
+    z-index: 1;
+    padding: 6px 12px;
+    border: 1px solid transparent;
+}
+
+.twitter-typeahead .tt-query {
+    z-index: 2;
+    border-radius: 4px !important;
+}
+
+.input-group-addon + .twitter-typeahead > .tt-query {
+    border-top-left-radius: 0!important;
+    border-bottom-left-radius: 0!important;
+}
+
+.input-group-appended > .twitter-typeahead > .tt-query {
+    border-top-right-radius: 0!important;
+    border-bottom-right-radius: 0!important;
+}
+
+.tt-dropdown-menu {
+    min-width: 160px;
+    margin-top: 2px;
+    padding: 5px 0;
+    background-color: #fff;
+    border: 1px solid #ccc;
+    border: 1px solid rgba(0, 0, 0, .2);
+    *border-right-width: 2px;
+    *border-bottom-width: 2px;
+    -webkit-border-radius: 6px;
+    -moz-border-radius: 6px;
+    border-radius: 6px;
+    -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
+    -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
+    box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
+    -webkit-background-clip: padding-box;
+    -moz-background-clip: padding;
+    background-clip: padding-box;
+}
+
+.tt-suggestion {
+    display: block;
+    padding: 3px 20px;
+}
+
+.tt-suggestion.tt-is-under-cursor {
+    color: #fff;
+    background-color: #0081c2;
+    background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
+    background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
+    background-image: -o-linear-gradient(top, #0088cc, #0077b3);
+    background-image: linear-gradient(to bottom, #0088cc, #0077b3);
+    background-repeat: repeat-x;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0)
+}
+
+.tt-suggestion.tt-is-under-cursor a {
+    color: #fff;
+}
+
+.tt-suggestion p {
+    margin: 0;
+}