in_our_time 0.7.0 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 956e4e9773aad8f71897640c04d397bd566f512d
-  data.tar.gz: 39f0098a0bb42d7f4a16d04fb518f68bfb2fb61a
+  metadata.gz: f7366e48fb9235107463e7af22d3b04b30ea7368
+  data.tar.gz: 3ef1be69c2de15068ad48ac13ae7bec99f6498bc
 SHA512:
-  metadata.gz: 62af2485c95313e901ac884a6eb111a8cc2d407aafa64a1feda55e27c48ac85c1c3183781d4cc0d8c5f672aeeddf11a6bffc693aaafbde34d957e21d04605d30
-  data.tar.gz: b6bb8e7f15b7f92ce50fe922fc04f418c7058506dbd78b09ce069bd1b8ad77b13a18064dbdf1dbc578df45e379c947f849ae1d294271e28bcd9f0acaa17980cd
+  metadata.gz: 30258e410871e24e8f7e8f93d95fd8e8a4464b11d321b5659a8b5f80e79e10091a8c269973d794f084b289f62dda29690d0be8ce8cc8a5d4f1ddaf06d1a85f1d
+  data.tar.gz: 3928c59f30aff170246a1480fbc1e0965c0386c115e43f7fc387d9876ed78b9cca85d9e1fae810766a9eef5441a2c9df8dc8b7c54a1370bb8486bdeb219c0fe4

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.3

data/in_our_time.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+require "time"
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
@@ -20,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>= 2.0.0'
-  spec.add_runtime_dependency 'oga', '~> 2.2'
+  spec.add_runtime_dependency 'oga', '>= 2.1.4'
   spec.add_runtime_dependency 'colorize', '>= 0.8.1'
   spec.add_development_dependency 'version', '>= 1.0.0'
 end

data/lib/iot/iot.rb

@@ -13,30 +13,74 @@ require_relative 'keyboard_events'
 class InOurTime
   ROOT            = File.expand_path '~/'
   HERE            = File.dirname(__FILE__)
-  CONFIG_DIR      = '.in_our_time'
-  CONFIG_NAME     = 'config.yml'
+  CONFIG_DIR      = '.in_our_time'.freeze
+  CONFIG_NAME     = 'config.yml'.freeze
   IN_OUR_TIME     = File.join ROOT, CONFIG_DIR
   VERSION         = File.join HERE, '..','..','VERSION'
   DEFAULT_CONFIG  = File.join HERE, '..','..',CONFIG_NAME
   CONFIG          = File.join IN_OUR_TIME,CONFIG_NAME
   UPDATE_INTERVAL = 604800
-  AUDIO_DIRECTORY = 'audio'
-  RSS_DIRECTORY   = 'rss'
+  AUDIO_DIRECTORY = '../../../../Volumes/UNTITLED/.in_our_time/audio'.freeze
+  #  AUDIO_DIRECTORY = 'audio'.freeze
+  RSS_DIRECTORY   = 'rss'.freeze
 
   class Tic
     def initialize
+      Thread.abort_on_exception = true
       @flag = false
+      init_processes
       run
     end
 
+    def init_processes
+      @processes =
+        { process: {
+            timeout: 5,
+            value:   0 },
+          playing_time: {
+            timeout: 1,
+            value:   0 },
+          ended: {
+            timeout: 1,
+            value:   0 }
+        }
+    end
+
+    def inc_processes
+      @processes.each { |process| process[:value] += 1 }
+    end
+
     def kill
       Thread.kill(@th_tic) if @th_tic
     end
 
+    def timeout? type
+      @processes[type]
+      return unless @processes[type][:value] > @processes[type][:timeout]
+      @processes[type][:value] = 0
+      true
+    end
+
+    def process
+      timeout? :process
+    end
+
+    def playing_time
+      timeout? :playing_time
+    end
+
+    def ended
+      timeout? :ended
+    end
+
     def run
+      Thread.abort_on_exception = true
       @th_tic = Thread.new do
         loop do
-          sleep 1
+          sleep 0.2
+          @processes[:process][:value] += 1
+          @processes[:playing_time][:value] += 1
+          @processes[:ended][:value] += 1
           @flag = true
         end
       end
@@ -49,8 +93,102 @@ class InOurTime
     end
   end
 
+  class PlayTime
+    def initialize(dur)
+      @duration = dur
+      @start_time = Time.now
+      update
+    end
+
+    def changed?
+      ! unchanged?
+    end
+
+    def read
+      store
+      format_time
+    end
+
+    def ended?
+      (@duration + 20) < @seconds
+    end
+
+    def unchanged?
+      (update == stored) || paused?
+    end
+
+    def store
+      @stored = @seconds
+    end
+
+    def stored
+      @stored
+    end
+
+    def plural x
+      x == 1 ? '' : 's'
+    end
+
+    def mins
+      @seconds / 60
+    end
+
+    def secs
+      @seconds % 60
+    end
+
+    def format x
+      x < 10 ? '0' + x.to_s : x.to_s
+    end
+
+    def format_minutes
+      format mins
+    end
+
+    def format_secs
+      format secs
+    end
+
+    def format_remaining_time
+      secs = @duration - @seconds
+      format(secs/60) + ':' + format(secs%60)
+    end
+
+    def format_time
+      ' (' + format_minutes + ':' + format_secs +
+      ' / '  + format_remaining_time + ')'
+    end
+
+    def update
+      @seconds = (Time.now - @start_time).to_i
+    end
+
+    def pause
+      @paused = Time.now
+    end
+
+    def paused?
+      @paused
+    end
+
+    def unpause
+      @start_time = @start_time + (Time.now - @paused)
+      @paused = false
+    end
+
+    def forward
+      @start_time -= 1.5
+    end
+
+    def rewind
+      @start_time += 1.5
+    end
+  end
+
   def initialize
-    @content = ''
+    Thread.abort_on_exception = true
+    @queued = Array.new
+    @content = String.new
     @selected = 0
     clear
     print "\e[?25h"
@@ -80,7 +218,7 @@ class InOurTime
     STDIN.echo = true
     STDIN.cooked!
     puts "\n\n#{@error_msg}" if @error_msg
-    puts 'Quitting...'
+    puts 'Quitting...'.freeze
     sleep 0.5
     exit code
   end
@@ -91,7 +229,7 @@ class InOurTime
   end
 
   def iot_print x, col = @text_colour, now = false
-    content = ''
+    content = String.new
       content << x.colorize(col) if @config[:colour]
       content << x unless @config[:colour]
       unless now
@@ -101,9 +239,9 @@ class InOurTime
       end
   end
 
-  def iot_puts x = '', col = @text_colour
-    iot_print x, col
-    iot_print "\n\r"
+  def iot_puts x = '', col = @text_colour, now = false
+    iot_print x, col, now
+    iot_print "\n\r", now
   end
 
   def clear_content
@@ -132,18 +270,18 @@ class InOurTime
   end
 
   def dev_mode?
-    ENV['IN_OUR_TIME'] == 'development'
+    ENV['IN_OUR_TIME'] == 'development'.freeze
   end
 
   def puts_title colour
     title =
-    %q{  _____          ____               _______ _
+      %q{  _____          ____               _______ _
  |_   _|        / __ \             |__   __(_)
    | |  _ __   | |  | |_   _ _ __     | |   _ _ __ ___   ___
    | | | '_ \  | |  | | | | | '__|    | |  | | '_ ` _ \ / _ \
   _| |_| | | | | |__| | |_| | |       | |  | | | | | | |  __/
  |_____|_| |_|  \____/ \__,_|_|       |_|  |_|_| |_| |_|\___|
-}
+}.freeze
 
     title.split("\n").map{|l| iot_print(l + "\r\n", colour)} if(window_width > 61)
     iot_puts("In Our Time\r", colour) unless(window_width > 61)
@@ -200,7 +338,7 @@ class InOurTime
 
   def set_height
     height = window_height
-    while(height -2 % 10 != 0) ; height -=1 ; end
+    while(((height - 2) % 10) != 0) ; height -= 1 ; end
     height = 10 if height < 10
     @page_height = height if(@config[:page_height] == :auto)
     @page_height = @config[:page_height] unless(@config[:page_height] == :auto)
@@ -210,8 +348,8 @@ class InOurTime
     width = window_width
     while(width % 10 != 0) ; width -=1 ; end
     width = 20 if width < 20
-    @page_width = width - 1 if(@config[:page_width]  == :auto)
-    @page_width = @config[:page_width] unless(@config[:page_width]  == :auto)
+    @page_width = width - 1 if(@config[:page_width] == :auto)
+    @page_width = @config[:page_width] unless(@config[:page_width] == :auto)
   end
 
   def window_height
@@ -249,25 +387,16 @@ class InOurTime
   end
 
   def rss_addresses
+    filename = "/episodes/downloads.rss"
     host = 'http://www.bbc.co.uk/programmes'
-    [ "/b006qykl/episodes/downloads.rss",
-      "/p01drwny/episodes/downloads.rss",
-      "/p01dh5yg/episodes/downloads.rss",
-      "/p01f0vzr/episodes/downloads.rss",
-      "/p01gvqlg/episodes/downloads.rss",
-      "/p01gyd7j/episodes/downloads.rss"
-    ].collect{|page| host + page}
+    [ "/b006qykl", "/p01drwny", "/p01dh5yg",
+      "/p01f0vzr", "/p01gvqlg", "/p01gyd7j"
+    ].collect{|page| host + page + filename}
   end
 
   def local_rss
-    [
-      "culture.rss",
-      "history.rss",
-      "in_our_time.rss",
-      "philosophy.rss",
-      "religion.rss",
-      "science.rss"
-    ]
+    [ "culture.rss", "history.rss", "in_our_time.rss",
+      "philosophy.rss", "religion.rss", "science.rss"]
   end
 
   def fetch_uri uri, file
@@ -342,13 +471,14 @@ class InOurTime
   end
 
   def build_program(bin)
-    title = bin[tags[0]].shift.text
+    title = bin['title'].shift.text
     { title:    title,
-      subtitle: bin[tags[1]].shift.text,
-      summary:  bin[tags[2]].shift.text,
-      duration: bin[tags[3]].shift.text,
-      date:     bin[tags[4]].shift.text[0..15],
-      link:     bin[tags[5]].shift.text,
+      subtitle: bin['itunes:subtitle'].shift.text,
+      summary:  bin['itunes:summary'].shift.text,
+      duration: bin['itunes:duration'].shift.text,
+      date:     bin['pubDate'].shift.text[0..15],
+      link:     bin['link'].shift.text,
+      url:      bin['url'].shift,
       have_locally: have_locally?(title)
     }
   end
@@ -376,6 +506,10 @@ class InOurTime
         bin[tag] = [] if bin[tag].nil?
         bin[tag] = @doc.xpath(item_path(tag))
       end
+      bin['url'] = []
+      @doc.xpath(item_path('enclosure')).each do |x|
+        bin['url'] << x.get('url')
+      end
       build_programs(bin)
     end
     uniquify_programs
@@ -418,12 +552,51 @@ class InOurTime
     redraw
   end
 
-  def list_key
-    title = @playing ? @playing : (@sorted_titles[@last_selected || 0])
+  def title_focus
+    @playing ? @playing : (@sorted_titles[@last_selected || 0])
+  end
+
+  def top_selected
+    @selected == 0
+  end
+
+  def end_selected
+    @selected == @titles_count - 1
+  end
+
+  def top_title_focus
+    title_focus == @sorted_titles.first
+  end
+
+  def end_title_focus
+    title_focus == @sorted_titles.last
+  end
+
+  def top_or_end?
+    top_selected || end_selected
+  end
+
+  def store_selected
+    @last_selected = @selected
+  end
+
+  def top_or_end_title_focus
+    top_title_focus || end_title_focus
+  end
+
+  def jump_key
     if top_or_end?
-      draw_by_title title
+      if top_or_end_title_focus
+        if top_selected
+          list_end
+        else
+          list_top
+        end
+      else
+        draw_by_title title_focus
+      end
     else
-      @last_selected = @selected
+      store_selected
       list_top_or_end
     end
   end
@@ -437,18 +610,12 @@ class InOurTime
     end
   end
 
-  def top_or_end?
-    @selected == 0 || @selected == @titles_count - 1
-  end
-
   def list_top
-    @last_selected = @selected
     @selected = 0
     draw_selected
   end
 
   def list_end
-    @last_selected = @selected
     @selected = @titles_count - 1
     draw_selected
   end
@@ -497,7 +664,7 @@ class InOurTime
 
   def player_cmd
     if use_mpg123?
-      "mpg123 --remote-err -Cqk#{pre_delay}"
+      "mpg123 -Cvk#{pre_delay}"
     else
       get_player
     end
@@ -517,12 +684,12 @@ class InOurTime
     @sorted_titles.each do |title|
       title.split(' ').each do |word|
         if distances[title].nil?
-          distances[title] = Levenshtein::distance(search_term, word)
+          distances[title] = Levenshtein.distance(search_term, word)
         else
           distances[title] =
             distances[title] >
-            Levenshtein::distance(search_term, word.downcase)   ?
-              Levenshtein::distance(search_term, word.downcase) :
+            Levenshtein.distance(search_term, word.downcase)   ?
+              Levenshtein.distance(search_term, word.downcase) :
               distances[title]
         end
       end
@@ -534,11 +701,14 @@ class InOurTime
 
   def print_search_results results
     puts
-    puts "0: Search Again!"
+    iot_print "0:", @count_sel_colour, :now
+    iot_puts " Search Again!", @system_colour, :now
+    puts
     puts
     5.times do |count|
-      print "#{count + 1}: "
-      puts results[count][0]
+      iot_print "#{count + 1}:", @count_sel_colour, :now
+      iot_print " #{results[count][0]}", @system_colour, :now
+      puts
     end
     puts
   end
@@ -555,7 +725,8 @@ class InOurTime
   end
 
   def get_search_term
-    puts "Enter Search Term or just Return for Random:"
+    iot_puts "Enter Search Term or just Return for Random:", @system_colour, :now
+    puts
     puts
     print "Search Term: "
     gets.chomp
@@ -563,7 +734,7 @@ class InOurTime
 
   def get_search_choice
     print "Enter Choice: "
-    temp = gets.chomp
+    temp = $stdin.getch.chomp
     temp == '0' ? :search_again : temp
   end
 
@@ -598,7 +769,7 @@ class InOurTime
     render
     10.times do
       begin
-        res = Net::HTTP.get_response(URI.parse(prg[:link]))
+        res = Net::HTTP.get_response(URI.parse(prg[:url]))
       rescue SocketError => e
         print_error_and_delay "Error: Failed to connect to Internet! (#{e.class})"
         render
@@ -620,11 +791,10 @@ class InOurTime
       end
       retries += 1
     end
-    if retries >= 10
-      print_error_and_delay "Max retries downloading #{prg[:title]}"
-      render
-      @no_play = true
-    end
+    return if retries < 10
+    print_error_and_delay "Max retries downloading #{prg[:title]}"
+    render
+    @no_play = true
   end
 
   # Cross-platform way of finding an executable in the $PATH.
@@ -647,16 +817,58 @@ class InOurTime
     quit 1
   end
 
+  def init_countdown(duration)
+    @play_time = PlayTime.new(duration) unless use_mpg123?
+  end
+
   def run_program prg
-    download prg
     unless @no_play
       @playing = prg[:title]
       player = player_cmd.split(' ').first
-      unknown_player(player) unless which(player)
+      unknown_player(player) unless which(File.basename player)
       window_title prg[:title]
       cmd = player_cmd + ' ' + filename_from_title(@playing)
       @messages = []
-      @p_out, @p_in, @pid = PTY.spawn(cmd)
+      init_countdown prg[:duration].to_i
+      @player_th = Thread.new do
+        buf = ''
+        p_out, @p_in, @pid = PTY.spawn(cmd)
+        sleep 1
+        count = 0
+        loop do
+          unless use_mpg123?
+            sleep 1
+          else
+            x = p_out.getc unless p_out.eof?
+            if(((count >= 6) && (count <= 10)) ||
+               ((count > 15) && (count < 21))  )
+              buf << x
+              count += 1
+            elsif(((count == 0)  && (x == 'T'))  ||
+                  ((count == 1)  && (x == 'i'))  ||
+                  ((count == 2)  && (x == 'm'))  ||
+                  ((count == 3)  && (x == 'e'))  ||
+                  ((count == 4)  && (x == ':'))  ||
+                  ((count == 5)  && (x == ' '))  ||
+                  ((count >= 12) && (count <= 15)))
+              count += 1
+            elsif count == 11
+              @running_time = buf
+              buf = ''
+              count += 1
+            elsif count == 21
+              @remaining_time = buf
+              buf = ''
+              count = 0
+              sleep 0.3
+              p_out.flush
+            else
+              count = 0
+              sleep 0.001
+            end
+          end
+        end
+      end
     end
     @no_play = nil
   end
@@ -677,6 +889,7 @@ class InOurTime
     begin
       @p_in.puts str
     rescue Errno::EIO
+      kill_audio
       reset
     end
   end
@@ -684,6 +897,8 @@ class InOurTime
   def pause
     return unless control_play?
     @paused = @paused ? false : true
+    @play_time.pause if @paused unless use_mpg123?
+    @play_time.unpause unless @paused unless use_mpg123?
     write_player " "
     redraw
   end
@@ -693,11 +908,15 @@ class InOurTime
   end
 
   def forward
-     write_player ":" if control_play?
+    return unless control_play?
+    write_player ":"
+    @play_time.forward unless use_mpg123?
   end
 
   def rewind
-     write_player ";" if control_play?
+    return unless control_play?
+    write_player ";"
+    @play_time.rewind unless use_mpg123?
   end
 
   def instructions
@@ -706,11 +925,30 @@ class InOurTime
     iot_print "for instructions", @system_colour
   end
 
+  def print_playing
+    iot_print("Playing: ", @count_colour)
+  end
+
+  def print_paused
+    iot_print("Paused: ", @count_colour)
+  end
+
+  def print_play_time
+    if use_mpg123?
+      iot_print(@playing, @selection_colour)
+      iot_print(' (' + @running_time, @selection_colour) unless @running_time.nil?
+      iot_print(' / ' + @remaining_time, @selection_colour) unless @remaining_time.nil?
+      iot_puts(')', @selection_colour) unless @running_time.nil?
+    else
+      iot_puts(@playing + @play_time.read, @selection_colour)
+    end
+  end
+
   def print_playing_maybe
     if @playing
-      iot_print("Playing: ", @count_colour) unless @paused
-      iot_print("Paused: ", @count_colour) if @paused
-      iot_puts @playing, @selection_colour
+      print_playing unless @paused
+      print_paused if @paused
+      print_play_time
     elsif @started.nil?
       @started = true
       instructions
@@ -718,11 +956,19 @@ class InOurTime
   end
 
   def kill_audio
-    return unless @playing
-    @playing = nil
-    return unless @pid.is_a?(Integer)
-    Process.kill('QUIT', @pid)
-    sleep 0.2
+    loop do
+      Thread.kill(@player_th) if @player_th
+      return unless @playing
+      begin
+        break unless @pid.is_a?(Integer)
+        Process.kill('QUIT', @pid)
+        _, status = Process.wait2 @pid
+        break if status.exited?
+      rescue Errno::ESRCH
+        break
+      end
+      sleep 0.2
+    end
     reset
   end
 
@@ -769,6 +1015,7 @@ class InOurTime
 
   def load_help_maybe
     return unless help_option?
+    @config[:colour] = false
     help
     puts
     exit 0
@@ -776,37 +1023,43 @@ class InOurTime
 
   def help_screen
     []                                     <<
-      " In Our Time Player (#{@version})"  <<
-      "                                 "  <<
-      " Play/Stop      - X / Enter      "  <<
-      " Next/Prev      - Up / Down      "  <<
-      " Next/Prev Page - Right / Left   "  <<
-      " Sort           - S              "  <<
-      " Search         - ?              "  <<
-      " Theme Toggle   - T              "  <<
-      " List Top/End   - L              "  <<
-      " Update         - U              "  <<
-      " Download       - D              "  <<
-      " Info           - I              "  <<
-      " Help           - H              "  <<
-      " Quit           - Q              "  <<
-      " mpg123 Control -                "  <<
-      "   Pause/Resume - P / Spacebar   "  <<
-      "   Forward Skip - F              "  <<
-      "   Reverse Skip - R              "  <<
+      " In Our Time Payer (#{@version}) "  <<
       "                                 "  <<
+      " Play/Stop          - Enter/X    "  <<
+      " Next/Prev          - Up/Down    "  <<
+      " Next/Prev Page     - Right/Left "  <<
+      " Arrange            - A          "  <<
+      " Search             - ?          "  <<
+      " Theme Toggle       - T          "  <<
+      " Jump Around List   - J          "  <<
+      " Update             - U          "  <<
+      " Download           - D          "  <<
+      " Enqueue            - E          "  <<
+      " Shuffle Play       - S          "  <<
+      " Shuffle Next       - N          "  <<
+      " Info               - I          "  <<
+      " Help               - H          "  <<
+      " Quit               - Q          "  <<
+      " mpg123 Control     -            "  <<
+      "   Pause/Resume     - P/Spacebar "  <<
+      "   Forward Skip     - F          "  <<
+      "   Reverse Skip     - R          "  <<
       "Config: #{CONFIG}                "
   end
 
-  def help_partial x,y; help_screen[x..y]   end
-  def help_title; help_partial(0, 1)        end
-  def help_main; help_partial(2, 13)        end
-  def help_cfg;  help_partial(18, -1)       end
+  def title_xy; [0,0]                          end
+  def main_xy; [1, help_screen.size - 7]       end
+  def mpg_xy; [help_screen.size - 6, -2]       end
+  def cfg_xy; [help_screen.size - 1, -1]       end
+  def help_partial(x); help_screen[x[0]..x[1]] end
+  def help_title; help_partial(title_xy)       end
+  def help_main; help_partial(main_xy)         end
+  def help_cfg;  help_partial(cfg_xy)          end
 
   def help_mpg
-    scr = help_partial(14,17)
-    scr[0].rstrip! << ' (enabled)      ' if     use_mpg123?
-    scr[0].rstrip! << ' (disabled)     ' unless use_mpg123?
+    scr = help_partial(mpg_xy)
+    scr[0].rstrip! << ' (enabled)  ' if     use_mpg123?
+    scr[0].rstrip! << ' (disabled) ' unless use_mpg123?
     scr
   end
 
@@ -817,6 +1070,8 @@ class InOurTime
       @count_colour if use_mpg123?
     when :cfg
       @system_colour
+    when :title
+      @system_colour
     else
       @text_colour
     end
@@ -835,14 +1090,13 @@ class InOurTime
     help_render :title
     help_render :main
     help_render :mpg
-    help_render :cfg
+    #    help_render :cfg
   end
 
   def help
     unless @help
       clear_content
       print_help
-      print_playing_maybe unless help_option?
       @help = true
       render
     else
@@ -966,21 +1220,6 @@ class InOurTime
     render
   end
 
-  def check_process
-    if(@playing && @pid.is_a?(Integer))
-      begin
-        write_player( "\e")
-        if @pid.is_a? Integer
-          Process.kill 0, @pid
-        end
-      rescue Errno::ESRCH
-        reset
-      end
-    else
-      @pid = nil
-    end
-  end
-
   def page_forward
     return unless @line_count < @titles_count
     @selected = @line_count
@@ -1006,23 +1245,23 @@ class InOurTime
   end
 
   def play
-    if(@playing != @sorted_titles[@selected]) || (! @playing)
-      kill_audio
-      title = @sorted_titles[@selected]
-      pr = select_program title
-      run_program pr
-      redraw
-    else
-      kill_audio
-    end
+    title = @sorted_titles[@selected]
+    playing = @playing
+    prg = select_program(title)
+    download prg unless playing
+    download prg if playing && (playing != title)
+    kill_audio
+    return unless (! playing) || (playing != title)
+    run_program prg
+    redraw
   end
 
   def update_key
-      update
-      parse_rss
-      sort_titles
-      @selected = 0
-      draw_selected
+    update
+    parse_rss
+    sort_titles
+    @selected = 0
+    draw_selected
   end
 
   def download_key
@@ -1032,6 +1271,18 @@ class InOurTime
     draw_selected
   end
 
+  def enqueue
+    @queued << @sorted_titles[@selected]
+  end
+
+  def next_program
+    kill_audio
+  end
+
+  def shuffle_key
+    @queued = @sorted_titles.shuffle
+  end
+
   def quit_key
     kill_audio
     quit
@@ -1039,9 +1290,10 @@ class InOurTime
 
   def do_action ip
     case ip
-    when :pause, :forward, :rewind, :list_key, :page_forward, :page_back,
+    when :pause, :forward, :rewind, :jump_key, :page_forward, :page_back,
          :previous, :next, :play, :sort_key, :theme_toggle, :update_key,
-         :info, :help, :quit_key, :search, :download_key
+         :info, :help, :quit_key, :search, :download_key, :enqueue,
+         :next_program, :shuffle_key
       self.send ip
     end
   end
@@ -1051,6 +1303,60 @@ class InOurTime
     @help = nil unless ip == :help
   end
 
+  def ping_player
+    write_player("\e")
+  end
+
+  def check_player_process
+    Process.kill 0, @pid
+  end
+
+  def check_process
+    return unless @playing
+    if @pid.is_a?(Integer)
+      begin
+        write_player("\e")
+        sleep 0.1
+        if @pid.is_a? Integer
+          check_player_process
+        end
+      rescue Errno::ESRCH
+        kill_audio
+      end
+    else
+      kill_audio
+      unless @queued.empty?
+        title = @queued.shift
+        prg = select_program(title)
+        download prg
+        run_program(prg)
+        draw_by_title title
+      end
+    end
+  end
+
+  def check_finished
+    return if use_mpg123?
+    return unless @playing
+    return unless @play_time.ended?
+    kill_audio
+  end
+
+  def check_tic
+    return unless @tic.toc
+    #    check_process if @tic.process
+    #    check_finished if @tic.ended
+    return unless @info.nil?
+    return unless @help.nil?
+    check_playing_time if @tic.playing_time
+   end
+
+  def check_playing_time
+    return unless @playing
+    return unless @play_time.changed? unless use_mpg123?
+    redraw
+  end
+
   def run
     ip = ''
     @tic = Tic.new
@@ -1061,7 +1367,7 @@ class InOurTime
       loop do
         ip = @key.read
         break unless ip == :no_event
-        check_process if @tic.toc
+        check_tic
         do_events
       end
       reset_info_maybe ip

data/lib/iot/keyboard_events.rb

@@ -36,6 +36,7 @@ class KeyboardEvents
   end
 
   def run
+    Thread.abort_on_exception = true
     @key = Thread.new do
       while @event != :quit_key
         str = ''
@@ -72,6 +73,8 @@ class KeyboardEvents
       when "\e"
         @mode = :escape
         :no_event
+      when 'a', 'A'
+        :sort_key
       when 'd', 'D'
         :download_key
       when 'f', 'F'
@@ -80,8 +83,10 @@ class KeyboardEvents
         :help
       when 'i', 'I'
         :info
-      when 'l', 'L'
-        :list_key
+      when 'j', 'J'
+        :jump_key
+      when 'e', 'E'
+        :enqueue
       when 'p', 'P', ' '
         :pause
       when 'q', 'Q', "\u0003", "\u0004"
@@ -89,7 +94,9 @@ class KeyboardEvents
       when 'r', 'R'
         :rewind
       when 's', 'S'
-        :sort_key
+        :shuffle_key
+      when 'n', 'N'
+        :next_program
       when 't', 'T'
         :theme_toggle
       when 'u', 'U'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: in_our_time
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.3
 platform: ruby
 authors:
 - Martyn Jago
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-12 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oga
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Select, play, and download BBC 'In Our Time' podcasts - all from the command