in_our_time 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ebc3b3c85e4482305e7c6126b149228e277165a
-  data.tar.gz: eff2a53fb96a38076a283e2c668e09c4d169f090
+  metadata.gz: 956e4e9773aad8f71897640c04d397bd566f512d
+  data.tar.gz: 39f0098a0bb42d7f4a16d04fb518f68bfb2fb61a
 SHA512:
-  metadata.gz: 418b56bec73a51dae797340183fc2f7b7a9e7a98b7378e7ba82dcb6be441a887e90a6cfcced2a156725816348d4abba73d04ab5b7dec333ea9f7be32d18f4a91
-  data.tar.gz: afd484a3f52597e77c3b2a0b731a86da0f1c89b05b96e534b6751e4f92c1078eca1717cb71acf527cb9076b1f1304203f5d14ddd840af220b40f65e9434635a0
+  metadata.gz: 62af2485c95313e901ac884a6eb111a8cc2d407aafa64a1feda55e27c48ac85c1c3183781d4cc0d8c5f672aeeddf11a6bffc693aaafbde34d957e21d04605d30
+  data.tar.gz: b6bb8e7f15b7f92ce50fe922fc04f418c7058506dbd78b09ce069bd1b8ad77b13a18064dbdf1dbc578df45e379c947f849ae1d294271e28bcd9f0acaa17980cd

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/lib/iot/iot.rb

@@ -74,13 +74,14 @@ class InOurTime
   end
 
   def quit code = 0
+    @key.kill if @key
+    @tic.kill if @tic
+    sleep 0.5
     STDIN.echo = true
     STDIN.cooked!
-    clear
+    puts "\n\n#{@error_msg}" if @error_msg
     puts 'Quitting...'
-    clear
-    @key.kill
-    @tic.kill
+    sleep 0.5
     exit code
   end
 
@@ -89,9 +90,15 @@ class InOurTime
     do_events while Time.now - @start_time < 1.5
   end
 
-  def iot_print x, col = @text_colour
-    @content << x.colorize(col) if @config[:colour]
-    @content << x           unless @config[:colour]
+  def iot_print x, col = @text_colour, now = false
+    content = ''
+      content << x.colorize(col) if @config[:colour]
+      content << x unless @config[:colour]
+      unless now
+        @content << content
+      else
+        $stdout << content
+      end
   end
 
   def iot_puts x = '', col = @text_colour
@@ -281,8 +288,9 @@ class InOurTime
     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
+        iot_puts "writing #{File.basename(filename_from_title(program[:title]))}", @system_colour
         render
+        sleep 0.2
         f.print(res.body)
         iot_puts " written.", @system_colour
         render
@@ -306,10 +314,10 @@ class InOurTime
 
   def update
     clear_content
-    iot_print "Checking rss feeds ", @system_colour
+    clear
+    iot_print "Checking rss feeds ", @system_colour, :now
     local_rss.length.times do |count|
-      iot_print '.', @system_colour
-      render
+      iot_print '.', @system_colour, :now
       fetch_uri rss_addresses[count], rss_files[count]
     end
     @config[:last_update] = now
@@ -384,20 +392,28 @@ class InOurTime
     @sorted_titles.sort_by!(&:downcase) unless @sort == :age
   end
 
+  def get_line_count idx
+    idx += 1
+    while idx % @page_height != 0
+      idx += 1
+    end
+    idx
+  end
+
   def sort_selected title
-    @sorted_titles.each_with_index do |st, idx|
+    @sorted_titles.each_with_index do |st, sel|
       if st == title
-        selected = idx
-        idx += 1
-        while idx % @page_height != 0
-          idx += 1
-        end
-        return selected, idx
+        return sel, get_line_count(sel)
       end
     end
   end
 
-  def list_selected title
+  def draw_selected
+    @line_count = get_line_count(@selected)
+    redraw
+  end
+
+  def draw_by_title title
     @selected, @line_count = sort_selected(title)
     redraw
   end
@@ -405,7 +421,7 @@ class InOurTime
   def list_key
     title = @playing ? @playing : (@sorted_titles[@last_selected || 0])
     if top_or_end?
-      list_selected title
+      draw_by_title title
     else
       @last_selected = @selected
       list_top_or_end
@@ -427,20 +443,20 @@ class InOurTime
 
   def list_top
     @last_selected = @selected
-    title = @sorted_titles.first
-    list_selected title
+    @selected = 0
+    draw_selected
   end
 
   def list_end
     @last_selected = @selected
-    title = @sorted_titles.last
-    list_selected title
+    @selected = @titles_count - 1
+    draw_selected
   end
 
   def sort_key
     title = @sorted_titles[@selected]
     toggle_sort
-    list_selected title
+    draw_by_title title
   end
 
   def toggle_sort
@@ -451,7 +467,8 @@ class InOurTime
   end
 
   def redraw
-    display_list :same_page
+    @line_count -= @page_height
+    draw_page
   end
 
   def date
@@ -473,11 +490,16 @@ class InOurTime
     @config[:mpg_player] == :mpg123
   end
 
+  def get_player
+    return 'afplay' if @config[:mpg_player] == :afplay
+    @config[:mpg_player].to_s
+  end
+
   def player_cmd
     if use_mpg123?
       "mpg123 --remote-err -Cqk#{pre_delay}"
     else
-      "afplay"
+      get_player
     end
   end
 
@@ -525,7 +547,7 @@ class InOurTime
     @key = KeyboardEvents.new
     begin
       if choice.to_i > 0 && choice.to_i < 6
-        list_selected results[choice.to_i - 1][0]
+        draw_by_title(results[choice.to_i - 1][0])
         return
       end
     end
@@ -568,48 +590,73 @@ class InOurTime
     display_search_choice results, choice
   end
 
-  def run_program prg
-    unless prg[:have_locally]
-      retries = 0
-      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
-        end
-        retries += 1
+  def download prg
+    return if prg[:have_locally]
+    retries = 0
+    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
-      if retries >= 10
-        print_error_and_delay "Max retries downloading #{prg[:title]}"
+      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
       end
+      retries += 1
     end
+    if retries >= 10
+      print_error_and_delay "Max retries downloading #{prg[:title]}"
+      render
+      @no_play = true
+    end
+  end
+
+  # Cross-platform way of finding an executable in the $PATH.
+  #
+  #   which('ruby') #=> /usr/bin/ruby
+
+  def which(cmd)
+    exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+      exts.each { |ext|
+        exe = File.join(path, "#{cmd}#{ext}")
+        return exe if File.executable?(exe) && !File.directory?(exe)
+      }
+    end
+    return nil
+  end
+
+  def unknown_player cmd
+    @error_msg = "Error: Unknown MPG Player: #{cmd}\r"
+    quit 1
+  end
+
+  def run_program prg
+    download prg
     unless @no_play
       @playing = prg[:title]
+      player = player_cmd.split(' ').first
+      unknown_player(player) unless which(player)
       window_title prg[:title]
-      @cmd = player_cmd + ' ' + filename_from_title(@playing)
+      cmd = player_cmd + ' ' + filename_from_title(@playing)
       @messages = []
-      @p_out, @p_in, @pid = PTY.spawn(@cmd)
+      @p_out, @p_in, @pid = PTY.spawn(cmd)
     end
     @no_play = nil
   end
@@ -716,24 +763,6 @@ class InOurTime
     render
   end
 
-  def display_list action
-    case action
-    when :next_page
-      draw_page
-    when :previous_page
-      if @line_count > 0
-        @line_count -= (@page_height * 2)
-      else
-        @line_count = @titles_count
-        @selected = @line_count
-      end
-      draw_page
-    when :same_page
-      @line_count -= @page_height
-      draw_page
-    end
-  end
-
   def help_option?
     ARGV[0] == '-h' || ARGV[0] == '--help' || ARGV[0] == '-?'
   end
@@ -757,6 +786,7 @@ class InOurTime
       " Theme Toggle   - T              "  <<
       " List Top/End   - L              "  <<
       " Update         - U              "  <<
+      " Download       - D              "  <<
       " Info           - I              "  <<
       " Help           - H              "  <<
       " Quit           - Q              "  <<
@@ -770,11 +800,11 @@ class InOurTime
 
   def help_partial x,y; help_screen[x..y]   end
   def help_title; help_partial(0, 1)        end
-  def help_main; help_partial(2, 12)        end
-  def help_cfg;  help_partial(17, -1)       end
+  def help_main; help_partial(2, 13)        end
+  def help_cfg;  help_partial(18, -1)       end
 
   def help_mpg
-    scr = help_partial(13,16)
+    scr = help_partial(14,17)
     scr[0].rstrip! << ' (enabled)      ' if     use_mpg123?
     scr[0].rstrip! << ' (disabled)     ' unless use_mpg123?
     scr
@@ -954,44 +984,36 @@ class InOurTime
   def page_forward
     return unless @line_count < @titles_count
     @selected = @line_count
-    display_list :next_page
+    draw_selected
   end
 
   def page_back
     @selected = @line_count - @page_height * 2
     @selected = @selected < 0 ? 0 : @selected
-    list_selected @sorted_titles[@selected]
+    draw_selected
   end
 
   def previous
-    @selected -= 1 if @selected > 0
-    if @selected >= @line_count -
-                    @page_height
-      redraw
-    else
-      display_list :previous_page
-    end
+    return if @selected <= 0
+    @selected -= 1
+    draw_selected
   end
 
   def next
     return if @selected >= (@titles_count - 1)
     @selected += 1
-    if @selected <= @line_count - 1
-      redraw
-    else
-      display_list :next_page
-    end
+    draw_selected
   end
 
   def play
-    if @playing
-      kill_audio
-    else
+    if(@playing != @sorted_titles[@selected]) || (! @playing)
       kill_audio
       title = @sorted_titles[@selected]
       pr = select_program title
       run_program pr
       redraw
+    else
+      kill_audio
     end
   end
 
@@ -999,9 +1021,15 @@ class InOurTime
       update
       parse_rss
       sort_titles
-      @line_count = 0
       @selected = 0
-      display_list :next_page
+      draw_selected
+  end
+
+  def download_key
+    title = @sorted_titles[@selected]
+    pr = select_program title
+    download pr
+    draw_selected
   end
 
   def quit_key
@@ -1013,7 +1041,7 @@ class InOurTime
     case ip
     when :pause, :forward, :rewind, :list_key, :page_forward, :page_back,
          :previous, :next, :play, :sort_key, :theme_toggle, :update_key,
-         :info, :help, :quit_key, :search
+         :info, :help, :quit_key, :search, :download_key
       self.send ip
     end
   end

data/lib/iot/keyboard_events.rb

@@ -72,30 +72,30 @@ class KeyboardEvents
       when "\e"
         @mode = :escape
         :no_event
-      when "l",'L'
+      when 'd', 'D'
+        :download_key
+      when 'f', 'F'
+        :forward
+      when 'h', 'H'
+        :help
+      when 'i', 'I'
+        :info
+      when 'l', 'L'
         :list_key
-      when "u",'U'
-        :update_key
-      when ' '
+      when 'p', 'P', ' '
         :pause
-      when "q",'Q', "\u0003", "\u0004"
+      when 'q', 'Q', "\u0003", "\u0004"
         :quit_key
-      when 'p', 'P'
-        :pause
-      when 'f', 'F'
-        :forward
       when 'r', 'R'
         :rewind
       when 's', 'S'
         :sort_key
       when 't', 'T'
         :theme_toggle
+      when 'u', 'U'
+        :update_key
       when 'x', 'X', "\r"
         :play
-      when 'i', 'I'
-        :info
-      when 'h', 'H'
-        :help
       when '?'
         :search
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: in_our_time
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Martyn Jago