in_our_time 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed0b5b221412272a4878b2d8d4292a55785cc1c1
-  data.tar.gz: 3381834d2955875c617f2d5ad97fe5ec89cabba5
+  metadata.gz: cf0d05644a0136dc6303c04a2f5337f9f0120b40
+  data.tar.gz: 164058d08b3fa8ed5c712b93b907a209afb00790
 SHA512:
-  metadata.gz: 718ce0b3cc69e71799797625f28d101d2e030aa2818a5b85e2dd07521703a4619597ae9527c3ea0bfbbc22f1ad76be8b460f613c007f2dd81fd9f3a9e2f6584e
-  data.tar.gz: 94eccc73c95354135426ab82920b27c03fc9240ca4ea2eb9a2acd6aa6d4d61c8895ceb139fba4caf81f3b2859020d2eb35879993507ef0deb6501e50c8609b22
+  metadata.gz: 8090701ea1243be0213807a7b10540b6d6b1e5c5a28a3a73e069d4f99f62c560f40c74c05fb0064870b03b57b2163c8f77be5c650667bc6a0928a246249d0290
+  data.tar.gz: 070414c04c8b5722e226e41e0b179107ac97fd0defe7424a9b9a19077055c76dc30c4ce11082c3b569e0ee869b9a4375792609d5eb65dc9383ae36dc88e34d27

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/iot/iot.rb

@@ -7,6 +7,7 @@ require 'fileutils'
 require 'colorize'
 require 'oga'
 require 'pty'
+require 'io/console'
 
 class InOurTime
 
@@ -26,67 +27,107 @@ class InOurTime
 
   class KeyboardEvents
 
-    @mode = :normal
+    def initialize
+      @mode = :normal
+      @event = :no_event
+    end
 
     def reset
-      $stdin.flush
+      STDIN.flush
     end
 
-    def input
-      begin
-        system("stty raw -echo")
-        str = $stdin.getc
-      ensure
-        system("stty -raw echo")
-      end
+    def ke_events
+      sleep 0.001
+    end
 
-      case @mode
-      when :escape
-        if str == "["
-          @mode = :escape_2
-        else
-          @mode = :normal
+    def read
+      ret_val = @event
+    #  reset
+      @event = :no_event
+      ret_val
+    end
+
+    def run
+      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
 
-      when :escape_2
-        return :previous     if str == "A"
-        return :next         if str == "B"
-        return :page_forward if str == "C"
-        return :previous     if str == "D"
-        @mode = :normal
+        case str
+        when "\e"
+          @mode = :escape
+        when "l",'L'
+          @event = :list
+        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
 
-      case str
-      when "\e"
-        @mode = :escape
-      when "l",'L'
-        :list
-      when ' '
-        :page_forward
-      when "q",'Q', "\u0003", "\u0004"
-        :quit
-      when 'p', 'P'
-        :pause
-      when 'f', 'F'
-        :forward
-      when 'r', 'R'
-        :rewind
-      when 's', 'S'
-        :stop
-      when 'x', 'X', "\r"
-        :play
-      when 'i', 'I'
-        :info
-      when '?', 'h'
-        :help
-      else
-        :unknown
+  class Tic
+    def initialize
+      @flag = false
+    end
+
+    def run
+      loop do
+        sleep 1
+        @flag = true
       end
     end
+
+    def toc
+      ret_val, @flag = @flag, false
+      ret_val
+    end
   end
 
   def initialize
     @programs, @selected = [], 0
+    @lock = Mutex.new
     setup
     load_config
     load_version
@@ -99,18 +140,27 @@ class InOurTime
     run
   end
 
+  def do_events
+    sleep 0.003
+  end
+
+  def quit code = 0
+    system("stty -raw echo")
+    exit code
+  end
+
   def version_display_wait
-    sleep 0.01 while Time.now - @start_time < 1
+    do_events 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]
+    STDOUT.print x.colorize col if @config[:colour]
+    STDOUT.print x          unless @config[:colour]
   end
 
-  def iot_puts x, col = @text_colour
-    puts x.colorize col if @config[:colour]
-    puts x          unless @config[:colour]
+  def iot_puts x = '', col = @text_colour
+    iot_print x, col
+    iot_print "\n\r"
   end
 
   def now
@@ -134,7 +184,7 @@ class InOurTime
     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'
+    quit if ARGV[0] == '-v' || ARGV[0] == '--version'
   end
 
   def load_version
@@ -151,13 +201,21 @@ class InOurTime
   end
 
   def do_configs
-    @line_count = @config[:page_height]
     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]
+    @sort = @config[:sort]
   end
 
   def load_config
@@ -239,7 +297,7 @@ class InOurTime
         iot_print '.', @system_colour
         fetch_uri rss_addresses[count], rss_files[count]
       end
-      iot_puts ''
+      iot_puts
       @config[:last_update] = now
       save_config
     end
@@ -249,7 +307,7 @@ class InOurTime
     @programs = @programs.uniq{|pr| pr[:title]}
     unless @programs.uniq.length == @programs.length
       print_error_and_delay "Error ensuring Programs unique!"
-      exit 1
+      quit 1
     end
   end
 
@@ -290,7 +348,32 @@ class InOurTime
   def sort_titles
     @sorted_titles = []
     @sorted_titles = @programs.collect { |pr| pr[:title] }
-    @sorted_titles.sort! unless @config[:sort] == :age
+    @sorted_titles.sort! unless @sort == :age
+  end
+
+  def sort_selected title
+    @sorted_titles.each_with_index do |st, idx|
+      if st == title
+        selected = idx
+        idx += 1
+        while idx % @config[:page_height] != 0
+          idx += 1
+        end
+        return selected, idx
+      end
+    end
+  end
+
+  def sort
+    title = @sorted_titles[@selected]
+    @sort = @sort == :age ? :alphabet : :age
+    sort_titles
+    @selected, @line_count = sort_selected(title)
+    redraw
+  end
+
+  def redraw
+    display_list :same_page
   end
 
   def date
@@ -318,7 +401,9 @@ class InOurTime
   end
 
   def clear
-    system 'clear' or system 'cls'
+    @lock.synchronize do
+      system 'clear' or system 'cls'
+    end
   end
 
   def print_error_and_delay message
@@ -369,13 +454,13 @@ class InOurTime
   end
 
   def window_title title = ''
-    puts "\"\033]0;#{title}\007"
+    STDOUT.puts "\"\033]0;#{title}\007"
   end
 
   def reset
     @pid, @playing, @paused = nil, nil, nil
     window_title
-    display_list :same_page
+    redraw
   end
 
   def write_player str
@@ -390,16 +475,12 @@ class InOurTime
     if control_play?
       @paused  = @paused ? false : true
       write_player " "
-      display_list :same_page
+      redraw
     end
   end
 
   def control_play?
-    if @config[:mpg_player] == :mpg123
-      if @playing
-        true
-      end
-    end
+    @playing && (@config[:mpg_player] == :mpg123)
   end
 
   def forward
@@ -495,7 +576,7 @@ class InOurTime
   def load_help_maybe
     if ARGV[0] == '-h' || ARGV[0] == '--help' || ARGV[0] == '-?'
       help
-      exit 0
+      quit
     end
   end
 
@@ -503,25 +584,26 @@ class InOurTime
     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        - 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
+      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 " 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
       print_playing_maybe
       @help = true
     else
-      display_list :same_page
+      redraw
       @help = nil
     end
   end
@@ -627,33 +709,52 @@ class InOurTime
       prg = select_program @sorted_titles[@selected]
       print_guests prg
     else
-      display_list :same_page
+      redraw
       @info = nil
     end
   end
 
+  def check_process
+    if(@playing && @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
+  end
+
   def run
+    ip = ''
+    @tic = Tic.new
+    @tic_thread = Thread.new do
+      @tic.run
+    end
+
+    @key = KeyboardEvents.new
+    key_thread = Thread.new do
+      @key.run
+    end
+#    sleep 0.015
+
     action = :unknown
-    display_list :same_page
-    key = KeyboardEvents.new
+    redraw
     loop do
+
       unless action == :unknown
-        key.reset
+        @key.reset
       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
+      loop do
+        ip = @key.read
+        break unless ip == :no_event
+        check_process if @tic.toc
+        do_events
       end
 
       @info = nil unless ip == :info
@@ -678,33 +779,39 @@ class InOurTime
           @selected -= 1 if @selected > 0
           if @selected >= @line_count -
              @config[:page_height]
-            display_list :same_page
+            redraw
           else
             display_list :previous_page
           end
         when :next
           @selected += 1
           if @selected <= @line_count - 1
-            display_list :same_page
+            redraw
           else
             display_list :next_page
           end
         when :play
-          kill_audio
-          title = @sorted_titles[@selected]
-          pr = select_program title
-          run_program pr
-          display_list :same_page
-        when :stop
-          kill_audio
+          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 :info
           info
         when :help
           help
         when :quit
           kill_audio
-          exit 0
+          quit
         end
+      do_events
     end
   end
 end

metadata

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