in_our_time 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4d33efed1ec31350eb4993c5be89f4506d0200b
-  data.tar.gz: dcada7f6e8bdafe08258d7529785af1fdbbac2ac
+  metadata.gz: ed0b5b221412272a4878b2d8d4292a55785cc1c1
+  data.tar.gz: 3381834d2955875c617f2d5ad97fe5ec89cabba5
 SHA512:
-  metadata.gz: ec29eeae228da573d068ef13d71ee7c05632fda8b99a331045afbc2cbf4950c23bd30112a0d4da05205645bec85c515f9177fd4bbbb347b44eacc0e6f194007c
-  data.tar.gz: ee0742b483f3ea7859ebbc36e72b48dd60743b6c87acc692628326021575642f2286728aa1563571ebcc022d15e96ba6e51e1b346700339cb04072a60c7f7321
+  metadata.gz: 718ce0b3cc69e71799797625f28d101d2e030aa2818a5b85e2dd07521703a4619597ae9527c3ea0bfbbc22f1ad76be8b460f613c007f2dd81fd9f3a9e2f6584e
+  data.tar.gz: 94eccc73c95354135426ab82920b27c03fc9240ca4ea2eb9a2acd6aa6d4d61c8895ceb139fba4caf81f3b2859020d2eb35879993507ef0deb6501e50c8609b22

data/README.md

@@ -1,10 +1,12 @@
 ## In Our Time
 
-Select, auto-download, and play **BBC In Our Time** podcasts easily, from the command line [link](http://www.bbc.co.uk/programmes/b006qykl).
+Select, automatically download, and play **BBC In Our Time** podcasts easily, from the command line.
 
-When played, podcast is archived locally for offline access in the future.
+- [BBC In Our Time](http://www.bbc.co.uk/programmes/b006qykl).
 
-Checks regularly for new podcasts and adds to the list.
+Podcast is archived locally for offline access in the future.
+
+Regularly checks for new podcasts.
 
 ![compile image](https://raw.githubusercontent.com/mjago/In_Our_Time/master/light_theme.png)
 
@@ -16,12 +18,24 @@ Checks regularly for new podcasts and adds to the list.
 gem install in_our_time
 iot
 ```
-
 ## Config:
 
 Config can be found at '~/.in_our_time/config.yml'
 
 ## mp3 player:
 
-By default uses **afplay** on **OSX** but can also be configured to use **mpg123**. Use **aplay** on **Linux**.
+By default uses **afplay** as the media player but gains **Forward skip**, **Reverse Skip**, **Pause** and **Resume** controls when used with - [mpg123](https://www.mpg123.de/). Install **mpg123** and modify the config.yml file to use **mpg123**:
+
+```sh
+:mpg_player: :mpg123
+```
 
+## Command line options:
+Version:
+```sh
+iot --version
+```
+Help:
+```sh
+iot --help
+```

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/iot/iot.rb

@@ -6,6 +6,7 @@ require 'yaml'
 require 'fileutils'
 require 'colorize'
 require 'oga'
+require 'pty'
 
 class InOurTime
 
@@ -14,6 +15,7 @@ class InOurTime
   CONFIG_DIR      = '.in_our_time'
   CONFIG_NAME     = 'config.yml'
   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
@@ -64,9 +66,11 @@ class InOurTime
       when "q",'Q', "\u0003", "\u0004"
         :quit
       when 'p', 'P'
-        :previous
-      when 'n', 'N'
-        :next
+        :pause
+      when 'f', 'F'
+        :forward
+      when 'r', 'R'
+        :rewind
       when 's', 'S'
         :stop
       when 'x', 'X', "\r"
@@ -85,12 +89,20 @@ class InOurTime
     @programs, @selected = [], 0
     setup
     load_config
+    load_version
+    load_help_maybe
+    display_version
     check_remote
     parse_rss
     sort_titles
+    version_display_wait
     run
   end
 
+  def version_display_wait
+    sleep 0.01 while Time.now - @start_time < 1
+  end
+
   def iot_print x, col = @text_colour
     print x.colorize col if @config[:colour]
     print x          unless @config[:colour]
@@ -106,6 +118,7 @@ class InOurTime
   end
 
   def setup
+    @start_time = Time.now
     iot = IN_OUR_TIME
     audio = File.join iot, AUDIO_DIRECTORY
     pages = File.join iot, RSS_DIRECTORY
@@ -117,6 +130,17 @@ class InOurTime
     end
   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
+    exit 0 if ARGV[0] == '-v' || ARGV[0] == '--version'
+  end
+
+  def load_version
+    File.open(VERSION) {|f| @version = f.readline.strip}
+  end
+
   def update_remote?
     now - @config[:update_interval] > @config[:last_update]
   end
@@ -276,28 +300,23 @@ class InOurTime
   def pre_delay
     x = DateTime.strptime("Mon, 20 Jun 2016", '%a, %d %b %Y')
     y = DateTime.strptime(date, '%a, %d %b %Y')
-    y < x ? '410' : '435'
+    if y < x
+      return '410' unless @playing == 'Abelard and Heloise'
+      '0' if @playing == 'Abelard and Heloise'
+    else
+      '435'
+    end
   end
 
   def player_cmd
     case @config[:mpg_player]
     when :mpg123
-      "mpg123 -qk#{pre_delay}"
+      "mpg123 --remote-err -Cqk#{pre_delay}"
     else
       "afplay"
     end
   end
 
-  def kill_cmd
-    "killall " +
-      case @config[:mpg_player]
-      when :mpg123
-        "mpg123"
-      else
-        "afplay"
-      end
-  end
-
   def clear
     system 'clear' or system 'cls'
   end
@@ -340,19 +359,62 @@ class InOurTime
       end
     end
     unless @no_play
-      @play = Thread.new do
-        @playing = prg[:title]
-        system player_cmd + ' ' +
-               filename_from_title(@playing)
-        @playing, @no_play  = nil, nil
-      end
+      @playing = prg[:title]
+      window_title prg[:title]
+      @cmd = player_cmd + ' ' + filename_from_title(@playing)
+      @messages = []
+      @p_out, @p_in, @pid = PTY.spawn(@cmd)
     end
     @no_play = nil
   end
 
+  def window_title title = ''
+    puts "\"\033]0;#{title}\007"
+  end
+
+  def reset
+    @pid, @playing, @paused = nil, nil, nil
+    window_title
+    display_list :same_page
+  end
+
+  def write_player str
+    begin
+      @p_in.puts str
+    rescue Errno::EIO
+      reset
+    end
+  end
+
+  def pause
+    if control_play?
+      @paused  = @paused ? false : true
+      write_player " "
+      display_list :same_page
+    end
+  end
+
+  def control_play?
+    if @config[:mpg_player] == :mpg123
+      if @playing
+        true
+      end
+    end
+  end
+
+  def forward
+     write_player ":" if control_play?
+  end
+
+  def rewind
+     write_player ";" if control_play?
+  end
+
   def print_playing_maybe
     if @playing
-      iot_puts "\nPlaying '#{@playing}'", @selection_colour
+      iot_print("\nPlaying: ", @count_colour) unless @paused
+      iot_print("\nPaused: ", @count_colour) if @paused
+      iot_puts @playing, @selection_colour
     elsif @started.nil?
       @started = true
       iot_puts "\n? or h for instructions", @text_colour
@@ -361,11 +423,18 @@ class InOurTime
     end
   end
 
+  def kill_cmd
+    "killall " +
+      @config[:mpg_player].to_s
+  end
+
   def kill_audio
     if @playing
-      system kill_cmd if @play
-      @play.kill if @play
-      @playing = nil
+      if @pid.is_a? Fixnum
+        Process.kill('QUIT', @pid)
+        sleep 0.2
+        reset
+      end
     end
   end
 
@@ -407,7 +476,7 @@ class InOurTime
   def display_list action
     clear
     case action
-    when :draw_page
+    when :next_page
       draw_page
     when :previous_page
       if @line_count > 0
@@ -423,25 +492,32 @@ class InOurTime
     end
   end
 
+  def load_help_maybe
+    if ARGV[0] == '-h' || ARGV[0] == '--help' || ARGV[0] == '-?'
+      help
+      exit 0
+    end
+  end
+
   def help
     unless @help
       clear
-      iot_puts " In Our Time Player (Help)       "
-      iot_puts "                                 "
-      iot_puts " Next      - N (down arrow)      "
-      iot_puts " Previous  - P (up arrow)        "
-      iot_puts " Next Page -    (SPACE)          "
-      iot_puts " Play      - X (return)          "
-      iot_puts " Stop      - S                   "
-      iot_puts " List      - L                   "
-      iot_puts " Info      - I                   "
-      iot_puts " Help      - H                   "
-      iot_puts " Quit      - Q                   "
-      iot_puts "  TL;DR                          "
-      iot_puts "Select: up/down arrows           "
-      iot_puts "Play:   enter                    "
-      iot_puts "Config: #{CONFIG}                "
-      18.upto(@config[:page_height] - 1) {iot_puts ''}
+      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        - X or Enter    ", @system_colour
+      iot_puts " Stop        - S             ", @system_colour
+      iot_puts " List Page 1 - L             ", @system_colour
+      iot_puts " Info        - I             ", @system_colour
+      iot_puts " Help        - H             ", @system_colour
+      iot_puts " Quit        - Q             ", @system_colour
+      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 "                             ", @system_colour
+      iot_puts "Config: #{CONFIG}"            , @system_colour
       print_playing_maybe
       @help = true
     else
@@ -566,18 +642,38 @@ class InOurTime
       end
 
       ip = key.input
+
+      if @pid.is_a? Fixnum
+        begin
+          write_player( "\e")
+          if @pid.is_a? Fixnum
+            Process.kill 0, @pid
+          end
+        rescue Errno::ESRCH
+          reset
+        end
+      else
+        @pid = nil
+      end
+
       @info = nil unless ip == :info
       @help = nil unless ip == :help
 
       action =
         case ip
+        when :pause
+          pause
+        when :forward
+          forward
+        when :rewind
+          rewind
         when :list
           @line_count = 0
           @selected = 0
-          display_list :draw_page
+          display_list :next_page
         when :page_forward
           @selected = @line_count
-          display_list :draw_page
+          display_list :next_page
         when :previous
           @selected -= 1 if @selected > 0
           if @selected >= @line_count -
@@ -591,7 +687,7 @@ class InOurTime
           if @selected <= @line_count - 1
             display_list :same_page
           else
-            display_list :draw_page
+            display_list :next_page
           end
         when :play
           kill_audio

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: in_our_time
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Martyn Jago
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-01 00:00:00.000000000 Z
+date: 2016-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oga