in_our_time 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cf2c996c094b425c9b23dfdc1d333be877ad11b
-  data.tar.gz: 27014f8d06c891f07bcb92db25325718d08affc6
+  metadata.gz: fba0bd53285d9df8789fb1d0464650ed0c769a41
+  data.tar.gz: e190622c306d519d8d0a568d629c3f06dc1a5a79
 SHA512:
-  metadata.gz: c124de122df9bc9ac02db4c35461e48ca010a3d99a806e222ef5ec5108512e2a4ff9b931afc1b741c38a99f4a86dd24f1f4a9e97176792850bacb6bc74db8c67
-  data.tar.gz: e6b1afc628991379da911fdcd8a4a6cd051859c05f396e085b765658779758d3e35f119d63d47721148caef008fd7c58c01f24f49661690d09ea945586d0e626
+  metadata.gz: 5293b5c48c8a45a2dc7efc464f0ce3c87fdffddd9546e7c4223d339335ef4cd400f8c989fd5c4d227ebd1afd1559a5e72abeea28dfce4287ce9036e8045e0e9a
+  data.tar.gz: 86738cce5846617abd0f2aac1d019c88eca1a59143792e59c6c7b5137ebcfeaf690fc151ef2334ec9b3d0ebace094170eb1aa381039cc99c96fca7738ce9a239

data/.gitignore

@@ -1,3 +1,4 @@
 /audio/
 /rss/
 /in_our_time.org
+/.rubocop_todo.yml

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.4.0

data/in_our_time.gemspec

@@ -24,3 +24,4 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'colorize', '>= 0.8.1'
   spec.add_development_dependency 'version', '>= 1.0.0'
 end
+

data/lib/iot/iot.rb

@@ -8,9 +8,9 @@ require 'colorize'
 require 'oga'
 require 'pty'
 require 'io/console'
+require_relative 'keyboard_events'
 
 class InOurTime
-
   ROOT            = File.expand_path '~/'
   HERE            = File.dirname(__FILE__)
   CONFIG_DIR      = '.in_our_time'
@@ -22,102 +22,19 @@ class InOurTime
   UPDATE_INTERVAL = 604800
   AUDIO_DIRECTORY = 'audio'
   RSS_DIRECTORY   = 'rss'
-  PAGE_HEIGHT     = 20
-  PAGE_WIDTH      = 80
-
-  class KeyboardEvents
-
-    def initialize
-      @mode = :normal
-      @event = :no_event
-    end
-
-    def reset
-      STDIN.flush
-    end
-
-    def ke_events
-      sleep 0.001
-    end
-
-    def read
-      ret_val = @event
-    #  reset
-      @event = :no_event
-      ret_val
-    end
-
-    def run
-      Thread.new do
-        loop do
-          str = ''
-          loop do
-            str = STDIN.getch
-            if str == "\e"
-              @mode = :escape
-            else
-              case @mode
-              when :escape
-                if str == "["
-                  @mode = :escape_2
-                else
-                  @mode = :normal
-                end
-              when :escape_2
-                @event =  :previous     if str == "A"
-                @event =  :next         if str == "B"
-                @event = :page_forward  if str == "C"
-                @event = :previous      if str == "D"
-                @mode = :normal
-
-              else
-                break if @event == :no_event
-              end
-            end
-            ke_events
-          end
-
-          case str
-          when "\e"
-            @mode = :escape
-          when "l",'L'
-            @event = :list
-          when "u",'U'
-            @event = :update
-          when ' '
-            @event = :page_forward
-          when "q",'Q', "\u0003", "\u0004"
-            @event = :quit
-          when 'p', 'P'
-            @event = :pause
-          when 'f', 'F'
-            @event = :forward
-          when 'r', 'R'
-            @event = :rewind
-          when 's', 'S'
-            @event = :sort
-          when 'x', 'X', "\r"
-            @event = :play
-          when 'i', 'I'
-            @event = :info
-          when '?', 'h'
-            @event = :help
-          else
-            @event = :no_event
-          end
-          ke_events
-        end
-      end
-    end
-  end
 
   class Tic
     def initialize
       @flag = false
+      run
+    end
+
+    def kill
+      Thread.kill(@th_tic) if @th_tic
     end
 
     def run
-      Thread.new do
+      @th_tic = Thread.new do
         loop do
           sleep 1
           @flag = true
@@ -126,41 +43,56 @@ class InOurTime
     end
 
     def toc
-      ret_val, @flag = @flag, false
+      ret_val = @flag
+      @flag = false
       ret_val
     end
   end
 
   def initialize
-    @programs, @selected = [], 0
+    @content = ''
+    @programs = []
+    @selected = 0
+    clear
+    print "\e[?25h"
     setup
     load_config
     load_version
     load_help_maybe
-    display_version
+    opening_title
     check_remote
     parse_rss
     sort_titles
     version_display_wait
+    STDIN.echo = false
+    STDIN.raw!
     run
   end
 
   def do_events
     sleep 0.003
+    sleep 0.1
   end
 
   def quit code = 0
-    system("stty -raw echo")
+    STDIN.echo = true
+    STDIN.cooked!
+    clear
+    puts 'Quitting...'
+    clear
+    @key.kill
+    @tic.kill
     exit code
   end
 
   def version_display_wait
-    do_events while Time.now - @start_time < 1
+    return if dev_mode?
+    do_events while Time.now - @start_time < 1.5
   end
 
   def iot_print x, col = @text_colour
-    STDOUT.print x.colorize col if @config[:colour]
-    STDOUT.print x          unless @config[:colour]
+    @content << x.colorize(col) if @config[:colour]
+    @content << x           unless @config[:colour]
   end
 
   def iot_puts x = '', col = @text_colour
@@ -168,6 +100,15 @@ class InOurTime
     iot_print "\n\r"
   end
 
+  def clear_content
+    @content.clear
+  end
+
+  def render
+    clear
+    $stdout << @content
+  end
+
   def now
     Time.now.to_i
   end
@@ -179,16 +120,44 @@ class InOurTime
     pages = File.join iot, RSS_DIRECTORY
     Dir.mkdir iot unless Dir.exist? iot
     Dir.mkdir audio unless Dir.exist? audio
-    unless Dir.exist? pages
-      Dir.mkdir pages
-      local_rss.map{|f| FileUtils.touch(File.join pages, f)}
-    end
+    return if Dir.exist?(pages)
+    Dir.mkdir pages
+    local_rss.map{|f| FileUtils.touch(File.join pages, f)}
+  end
+
+  def dev_mode?
+    ENV['IN_OUR_TIME'] == 'development'
+  end
+
+  def puts_title colour
+    title =
+    %q{  _____          ____               _______ _
+ |_   _|        / __ \             |__   __(_)
+   | |  _ __   | |  | |_   _ _ __     | |   _ _ __ ___   ___
+   | | | '_ \  | |  | | | | | '__|    | |  | | '_ ` _ \ / _ \
+  _| |_| | | | | |__| | |_| | |       | |  | | | | | | |  __/
+ |_____|_| |_|  \____/ \__,_|_|       |_|  |_|_| |_| |_|\___|
+}
+
+    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)
+    iot_puts
+  end
+
+  def opening_title
+    return if dev_mode?
+    puts_title :light_green
+    render
+    sleep 0.5
+    clear_content
+    puts_title @system_colour
+    display_version
+    render
   end
 
   def display_version
-    clear
-    iot_print("Loading ", @system_colour) unless ARGV[0] == '-v' || ARGV[0] == '--version'
-    iot_puts "In Our Time Player (#{@version})", @system_colour
+    iot_print("Loading ", :light_green) unless ARGV[0] == '-v' || ARGV[0] == '--version'
+    iot_puts "In Our Time Player (#{@version})", :light_green
     quit if ARGV[0] == '-v' || ARGV[0] == '--version'
   end
 
@@ -201,31 +170,71 @@ class InOurTime
   end
 
   def create_config
-    @config = YAML::load_file(DEFAULT_CONFIG)
+    @config = YAML.load_file(DEFAULT_CONFIG)
     save_config
   end
 
-  def do_configs
+  def init_theme
     theme = @config[:colour_theme]
     @selection_colour = @config[theme][:selection_colour]
     @count_sel_colour = @config[theme][:count_sel_colour]
     @count_colour     = @config[theme][:count_colour]
     @text_colour      = @config[theme][:text_colour]
     @system_colour    = @config[theme][:system_colour]
-    rows, cols = $stdout.winsize
-    while(rows % 10 != 0) ; rows -=1 ; end
-    while(cols % 10 != 0) ; cols -=1 ; end
-    rows = 10 if rows < 10
-    cols = 20 if cols < 20
-    @config[:page_height] = rows if(@config[:page_height] == :auto)
-    @config[:page_width]  = cols if(@config[:page_width]  == :auto)
-    @line_count = @config[:page_height]
+  end
+
+  def theme_toggle
+    theme = @config[:colour_theme]
+    @config[:colour_theme] = theme == :light_theme ?
+                               :dark_theme : :light_theme
+    save_config
+    init_theme
+    redraw
+  end
+
+  def set_height
+    height = window_height
+    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)
+  end
+
+  def set_width
+    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)
+  end
+
+  def window_height
+    $stdout.winsize.first
+  end
+
+  def window_width
+    $stdout.winsize[1]
+  end
+
+  def set_dimensions
+    set_height
+    set_width
+  end
+
+  def init_line_count
+    @line_count = @page_height
+  end
+
+  def do_configs
+    init_theme
+    set_dimensions
+    init_line_count
     @sort = @config[:sort]
   end
 
   def load_config
     create_config unless File.exist? CONFIG
-    @config = YAML::load_file(CONFIG)
+    @config = YAML.load_file(CONFIG)
     do_configs
   end
 
@@ -264,28 +273,32 @@ class InOurTime
   end
 
   def filename_from_title title
-    temp = title.gsub(/[^0-9a-z ]/i, '').gsub(' ', '_').strip + '.mp3'
+    temp = title.gsub(/[^0-9a-z ]/i, '').tr(' ', '_').strip + '.mp3'
     File.join IN_OUR_TIME, AUDIO_DIRECTORY, temp.downcase
   end
 
-  def download_audio program, addr
+  def download_audio(program, addr)
     res = Net::HTTP.get_response(URI.parse(addr))
     case res
     when Net::HTTPOK
       File.open(filename_from_title(program[:title]) , 'wb') do |f|
         iot_print "writing #{filename_from_title(program[:title])}...", @system_colour
+        render
         f.print(res.body)
         iot_puts " written.", @system_colour
+        render
       end
       program[:have_locally] = true
     else
       iot_puts 'Download failed. Retrying...', @system_colour
+      render
+      nil
     end
   end
 
   def have_locally? title
     filename = filename_from_title(title)
-    File.exists?(filename) ? true : false
+    File.exist?(filename) ? true : false
   end
 
   def rss_files
@@ -293,13 +306,14 @@ class InOurTime
   end
 
   def update
-    clear
+    clear_content
     iot_print "Checking rss feeds ", @system_colour
     local_rss.length.times do |count|
       iot_print '.', @system_colour
+      render
       fetch_uri rss_addresses[count], rss_files[count]
     end
-    iot_puts
+#    iot_puts
     @config[:last_update] = now
     save_config
   end
@@ -310,10 +324,9 @@ class InOurTime
 
   def uniquify_programs
     @programs = @programs.uniq{|pr| pr[:title]}
-    unless @programs.uniq.length == @programs.length
-      print_error_and_delay "Error ensuring Programs unique!"
-      quit 1
-    end
+    return if @programs.uniq.length == @programs.length
+    print_error_and_delay "Error ensuring Programs unique!"
+    quit 1
   end
 
   def parse_rss
@@ -326,7 +339,7 @@ class InOurTime
       dates     = @doc.xpath('rss/channel/item/pubDate')
       links     = @doc.xpath('rss/channel/item/link')
 
-      0.upto (titles.length - 1) do |idx|
+      0.upto(titles.length - 1) do |idx|
         program = {}
         program[:title] = titles[idx].text
         program[:subtitle] = subtitles[idx].text
@@ -357,7 +370,7 @@ class InOurTime
       if st == title
         selected = idx
         idx += 1
-        while idx % @config[:page_height] != 0
+        while idx % @page_height != 0
           idx += 1
         end
         return selected, idx
@@ -365,12 +378,55 @@ class InOurTime
     end
   end
 
-  def sort
+  def list_selected title
+    @selected, @line_count = sort_selected(title)
+    redraw
+  end
+
+  def list_playing
+    title = @sorted_titles[@selected]
+    if title == @playing
+      list_top
+    else
+      list_selected @playing
+    end
+  end
+
+  def list_stopped
+    if @selected == 0
+      title = @sorted_titles[@last_selected || 0]
+      list_selected title
+    else
+      list_top
+    end
+  end
+
+  def list_key
+    if @playing
+      list_playing
+    else
+      list_stopped
+    end
+  end
+
+  def list_top
+    @last_selected = @selected
+    @line_count = 0
+    @selected = 0
+    display_list :next_page
+  end
+
+  def sort_key
     title = @sorted_titles[@selected]
+    toggle_sort
+    list_selected title
+  end
+
+  def toggle_sort
     @sort = @sort == :age ? :alphabet : :age
+    @config[:sort] = @sort
+    save_config
     sort_titles
-    @selected, @line_count = sort_selected(title)
-    redraw
   end
 
   def redraw
@@ -402,43 +458,47 @@ class InOurTime
   end
 
   def clear
-    system 'clear' or system 'cls'
+    system('clear') || system('cls')
   end
 
-  def print_error_and_delay message
+  def print_error_and_delay message, delay = 2
     iot_puts message, :red
-    sleep 2
+    sleep delay
   end
 
   def run_program prg
     unless prg[:have_locally]
       retries = 0
-      clear
+      clear_content
       iot_puts "Fetching #{prg[:title]}", @system_colour
+      render
       10.times do
         begin
           res = Net::HTTP.get_response(URI.parse(prg[:link]))
         rescue SocketError => e
           print_error_and_delay "Error: Failed to connect to Internet! (#{e.class})"
+          render
           @no_play = true
           break
         end
         case res
         when Net::HTTPFound
           iot_puts 'redirecting...', @system_colour
+          render
           @doc = Oga.parse_xml(res.body)
           redirect = @doc.css("body p a").text
           break if download_audio(prg, redirect)
           sleep 2
         else
           print_error_and_delay 'Error! Failed to be redirected!'
+          render
           @no_play = true
-          break
         end
         retries += 1
       end
       if retries >= 10
         print_error_and_delay "Max retries downloading #{prg[:title]}"
+        render
         @no_play = true
       end
     end
@@ -457,7 +517,9 @@ class InOurTime
   end
 
   def reset
-    @pid, @playing, @paused = nil, nil, nil
+    @pid = nil
+    @playing = nil
+    @paused = nil
     window_title
     redraw
   end
@@ -471,11 +533,10 @@ class InOurTime
   end
 
   def pause
-    if control_play?
-      @paused  = @paused ? false : true
-      write_player " "
-      redraw
-    end
+    return unless control_play?
+    @paused = @paused ? false : true
+    write_player " "
+    redraw
   end
 
   def control_play?
@@ -492,30 +553,22 @@ class InOurTime
 
   def print_playing_maybe
     if @playing
-      iot_print("\nPlaying: ", @count_colour) unless @paused
-      iot_print("\nPaused: ", @count_colour) if @paused
+      iot_print("Playing: ", @count_colour) unless @paused
+      iot_print("Paused: ", @count_colour) if @paused
       iot_puts @playing, @selection_colour
     elsif @started.nil?
       @started = true
-      iot_puts "\n? or h for instructions", @text_colour
-    else
-      iot_puts "\n"
+      iot_print "? or h for instructions", @text_colour
     end
   end
 
-  def kill_cmd
-    "killall " +
-      @config[:mpg_player].to_s
-  end
-
   def kill_audio
-    if @playing
-      if @pid.is_a? Fixnum
-        Process.kill('QUIT', @pid)
-        sleep 0.2
-        reset
-      end
-    end
+    return unless @playing
+    @playing = nil
+    return unless @pid.is_a?(Integer)
+    Process.kill('QUIT', @pid)
+    sleep 0.2
+    reset
   end
 
   def idx_format idx
@@ -524,7 +577,7 @@ class InOurTime
 
   def show_count_maybe idx
     if have_locally?(@sorted_titles[idx])
-      iot_print idx_format(idx), @count_sel_colour  if @config[:show_count]
+      iot_print idx_format(idx), @count_sel_colour if @config[:show_count]
     else
       iot_print idx_format(idx), @count_colour if @config[:show_count]
     end
@@ -532,8 +585,9 @@ class InOurTime
   end
 
   def draw_page
+    clear_content
     if @line_count <= @sorted_titles.length
-      @line_count.upto(@line_count + @config[:page_height] - 1) do |idx|
+      @line_count.upto(@line_count + @page_height - 1) do |idx|
         if idx < @sorted_titles.length
           iot_print "> " if(idx == @selected) unless @config[:colour]
           show_count_maybe idx
@@ -543,65 +597,79 @@ class InOurTime
       end
     else
       @line_count = 0
-      0.upto(@config[:page_height] - 1) do |idx|
+      0.upto(@page_height - 1) do |idx|
         iot_print "> ", @selection_colour if(idx == @selected)
         show_count_maybe(idx) unless @sorted_titles[idx].nil?
         iot_puts @sorted_titles[idx], @text_colour unless @sorted_titles[idx].nil?
       end
     end
-    @line_count += @config[:page_height]
+    @line_count += @page_height
     print_playing_maybe
+    render
   end
 
   def display_list action
-    clear
     case action
     when :next_page
       draw_page
     when :previous_page
       if @line_count > 0
-        @line_count -= (@config[:page_height] * 2)
+        @line_count -= (@page_height * 2)
       else
         @line_count = @sorted_titles.length
         @selected = @line_count
       end
       draw_page
     when :same_page
-      @line_count -= @config[:page_height]
+      @line_count -= @page_height
       draw_page
     end
   end
 
+  def help_option?
+    ARGV[0] == '-h' || ARGV[0] == '--help' || ARGV[0] == '-?'
+  end
+
   def load_help_maybe
-    if ARGV[0] == '-h' || ARGV[0] == '--help' || ARGV[0] == '-?'
-      help
-      quit
-    end
+    return unless help_option?
+    help
+    quit
+  end
+
+  def help_screen
+    []                                     <<
+      " In Our Time Player (#{@version})"  <<
+      "                                 "  <<
+      " Play/Stop     - X or Enter      "  <<
+      " Previous/Next - Down / Up       "  <<
+      " Next Page     - SPACE           "  <<
+      " Sort          - S               "  <<
+      " Theme Toggle  - T               "  <<
+      " List Top      - L               "  <<
+      " Update        - U               "  <<
+      " Info          - I               "  <<
+      " Help          - H               "  <<
+      " Quit          - Q               "  <<
+      "                                 "  <<
+      " mpg123 Controls:                "  <<
+      "  Pause/Resume - P               "  <<
+      "  Forward Skip - F               "  <<
+      "  Reverse Skip - R               "  <<
+      "                                 "  <<
+      "Config: #{CONFIG}                "
+  end
+
+  def print_help
+    iot_puts help_screen.map{|x|x.rstrip}.join("\n\r"), @system_colour
   end
 
   def help
     unless @help
-      clear
-      iot_puts " In Our Time Player (#{@version})"
-      iot_puts " Next      - N or Down Key ", @system_colour
-      iot_puts " Previous  - P or Up Key   ", @system_colour
-      iot_puts " Next Page - SPACE         ", @system_colour
-      iot_puts " Play/Stop - X or Enter    ", @system_colour
-      iot_puts " Sort      - S             ", @system_colour
-      iot_puts " List Top  - L             ", @system_colour
-      iot_puts " Update    - U             ", @system_colour
-      iot_puts " Info      - I             ", @system_colour
-      iot_puts " Help      - H             ", @system_colour
-      iot_puts " Quit      - Q             ", @system_colour
-      iot_puts
-      iot_puts " mpg123 Controls:          ", @system_colour
-      iot_puts "    Pause/Resume - P       ", @system_colour
-      iot_puts "    Forward Skip - F       ", @system_colour
-      iot_puts "    Reverse Skip - R       ", @system_colour
-      iot_puts
-      iot_puts "Config: #{CONFIG}", @system_colour
+      clear_content
+      print_help
       print_playing_maybe
       @help = true
+      render
     else
       redraw
       @help = nil
@@ -609,8 +677,7 @@ class InOurTime
   end
 
   def reformat info
-    ['With','Guests',
-     'Producer','Contributors'].map do | x|
+    ['With','Guests','Producer','Contributors'].map do | x|
       [' ', ':'].map do |y|
         [x, x.upcase].map do |z|
           info.gsub!(z + y, "\n" + z + y)
@@ -629,19 +696,25 @@ class InOurTime
   end
 
   def last_line? info, top
-    info[top..-1].length < @config[:page_width]
+    info[top..-1].length < @page_width
   end
 
   def justify info
     pages = [[],[]]
-    page, top, bottom = 0, 0, @config[:page_width]
+    page = 0
+    top = 0
+    bottom = @page_width
     loop do
       shift = top_space info[top..bottom]
-      top, bottom = top + shift, bottom + shift
+      top = top + shift
+      bottom = bottom + shift
       loop do
-        if idx = info[top..bottom].index("\n")
+        idx = info[top..bottom].index("\n")
+        if idx
           pages[page] << info[top..top + idx]
-          page,bottom,top = 1,top + idx + @config[:page_width] + 1, top + idx + 1
+          page = 1
+          bottom = top + idx + @page_width + 1
+          top = top + idx + 1
         else
           break if bottom_space? info[bottom]
           bottom -= 1
@@ -652,13 +725,15 @@ class InOurTime
         break
       end
       pages[page] << info[top..bottom]
-      bottom, top = bottom + @config[:page_width], bottom
+      top = bottom
+      bottom = bottom + @page_width
     end
     pages
   end
 
   def print_subtitle prg
     clear
+    puts_title @system_colour
     justify(prg[:subtitle].gsub(/\s+/, ' '))[0].map{|x| iot_puts x}
     print_program_details prg
     @info = 1
@@ -674,16 +749,15 @@ class InOurTime
 
   def print_info prg
     info = prg[:summary].gsub(/\s+/, ' ')
-    clear
     count = 1
     justify(reformat(info))[0].each do |x|
-      if (count > (@page_count - 1) * @config[:page_height]) &&
-         (count <= @page_count * @config[:page_height])
+      if (count > (@page_count - 1) * @page_height) &&
+         (count <= @page_count * @page_height)
         iot_puts x
       end
       count += 1
     end
-    if count <= @page_count * @config[:page_height] + 1
+    if count <= @page_count * @page_height + 1
       @info = justify(reformat(info))[1] == [] ? -1 : 2
     else
       @page_count += 1
@@ -698,6 +772,7 @@ class InOurTime
   end
 
   def info
+    clear_content
     case @info
     when nil
       prg = select_program @sorted_titles[@selected]
@@ -711,14 +786,16 @@ class InOurTime
     else
       redraw
       @info = nil
+      return
     end
+    render
   end
 
   def check_process
-    if(@playing && @pid.is_a?(Fixnum))
+    if(@playing && @pid.is_a?(Integer))
       begin
         write_player( "\e")
-        if @pid.is_a? Fixnum
+        if @pid.is_a? Integer
           Process.kill 0, @pid
         end
       rescue Errno::ESRCH
@@ -729,83 +806,86 @@ class InOurTime
     end
   end
 
-  def run
-    ip, action = '', :unknown
-    @tic, @key = Tic.new, KeyboardEvents.new
-    @tic.run
-    @key.run
+  def page_forward
+    @selected = @line_count
+    display_list :next_page
+  end
 
-    redraw
-    loop do
+  def previous
+    @selected -= 1 if @selected > 0
+    if @selected >= @line_count -
+                    @page_height
+      redraw
+    else
+      display_list :previous_page
+    end
+  end
 
-      unless action == :unknown
-        @key.reset
-      end
+  def next
+    @selected += 1
+    if @selected <= @line_count - 1
+      redraw
+    else
+      display_list :next_page
+    end
+  end
 
+  def play
+    if @playing
+      kill_audio
+    else
+      kill_audio
+      title = @sorted_titles[@selected]
+      pr = select_program title
+      run_program pr
+      redraw
+    end
+  end
+
+  def update_key
+      update
+      parse_rss
+      sort_titles
+      @line_count = 0
+      @selected = 0
+      display_list :next_page
+  end
+
+  def quit_key
+    kill_audio
+    quit
+  end
+
+  def do_action ip
+    case ip
+    when :pause, :forward, :rewind,
+         :list_key, :page_forward, :previous,
+         :next, :play, :sort_key, :theme_toggle,
+         :update_key, :info, :help, :quit_key
+      self.send ip
+    end
+  end
+
+  def reset_info_maybe ip
+    @info = nil unless ip == :info
+    @help = nil unless ip == :help
+  end
+
+  def run
+    ip = ''
+    @tic = Tic.new
+    @key = KeyboardEvents.new
+    redraw
+
+    loop do
       loop do
         ip = @key.read
         break unless ip == :no_event
         check_process if @tic.toc
         do_events
       end
-
-      @info = nil unless ip == :info
-      @help = nil unless ip == :help
-
-      action =
-        case ip
-        when :pause, :forward, :rewind
-          self.send ip
-        when :list
-          @line_count = 0
-          @selected = 0
-          display_list :next_page
-        when :page_forward
-          @selected = @line_count
-          display_list :next_page
-        when :previous
-          @selected -= 1 if @selected > 0
-          if @selected >= @line_count -
-             @config[:page_height]
-            redraw
-          else
-            display_list :previous_page
-          end
-        when :next
-          @selected += 1
-          if @selected <= @line_count - 1
-            redraw
-          else
-            display_list :next_page
-          end
-        when :play
-          if @playing
-            kill_audio
-            @playing = nil
-          else
-            kill_audio
-            title = @sorted_titles[@selected]
-            pr = select_program title
-            run_program pr
-            redraw
-          end
-        when :sort
-          sort
-        when :update
-          update
-          parse_rss
-          sort_titles
-          @line_count = 0
-          @selected = 0
-          display_list :next_page
-        when :info
-          info
-        when :help
-          help
-        when :quit
-          kill_audio
-          quit
-        end
+      reset_info_maybe ip
+      do_action ip
       do_events
     end
   end

data/lib/iot/keyboard_events.rb

@@ -0,0 +1,102 @@
+class KeyboardEvents
+  def initialize
+    update_wait
+    @mode = :normal
+    @event = :no_event
+    @alive = true
+    run
+  end
+
+  def reset
+    STDIN.flush
+  end
+
+  def do_events
+    sleep 0.001
+  end
+
+  def kill
+    @alive = nil
+    Thread.kill(@key) if @key
+  end
+
+  def update_wait
+    @wait = Time.now + 0.02
+  end
+
+  def reset_event
+    @event = :no_event unless @event == :quit_key
+  end
+
+  def read
+    update_wait unless @event == :no_event
+    ret_val = @event
+    reset_event
+    ret_val
+  end
+
+  def run
+    @key = Thread.new do
+      while @event != :quit_key
+        str = ''
+        loop do
+          str = STDIN.getch
+          next if Time.now < @wait
+          if str == "\e"
+            @mode = :escape
+          else
+            case @mode
+            when :escape
+              @mode =
+                str == "[" ? :escape_2 : :normal
+            when :escape_2
+              @event = :previous     if str == "A"
+              @event = :next         if str == "B"
+              @event = :page_forward if str == "C"
+              @event = :previous     if str == "D"
+              @mode  = :normal
+            else
+              break if @event == :no_event
+            end
+          end
+          do_events
+        end
+        match_event str
+      end
+    end
+  end
+
+  def match_event str
+    case str
+    when "\e"
+      @mode = :escape
+    when "l",'L'
+      @event = :list_key
+    when "u",'U'
+      @event = :update_key
+    when ' '
+      @event = :page_forward
+    when "q",'Q', "\u0003", "\u0004"
+      @event = :quit_key
+    when 'p', 'P'
+      @event = :pause
+    when 'f', 'F'
+      @event = :forward
+    when 'r', 'R'
+      @event = :rewind
+    when 's', 'S'
+      @event = :sort_key
+    when 't', 'T'
+      @event = :theme_toggle
+    when 'x', 'X', "\r"
+      @event = :play
+    when 'i', 'I'
+      @event = :info
+    when '?', 'h', 'H'
+      @event = :help
+    else
+      return @event = :no_event
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: in_our_time
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Martyn Jago
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-27 00:00:00.000000000 Z
+date: 2016-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oga
@@ -72,6 +72,7 @@ files:
 - in_our_time.gemspec
 - lib/in_our_time.rb
 - lib/iot/iot.rb
+- lib/iot/keyboard_events.rb
 homepage: https://github.com/mjago/In_Our_Time
 licenses:
 - MIT
@@ -92,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Select, play, and download BBC 'In Our Time' podcasts - all from the command