in_our_time 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf0d05644a0136dc6303c04a2f5337f9f0120b40
-  data.tar.gz: 164058d08b3fa8ed5c712b93b907a209afb00790
+  metadata.gz: 2cf2c996c094b425c9b23dfdc1d333be877ad11b
+  data.tar.gz: 27014f8d06c891f07bcb92db25325718d08affc6
 SHA512:
-  metadata.gz: 8090701ea1243be0213807a7b10540b6d6b1e5c5a28a3a73e069d4f99f62c560f40c74c05fb0064870b03b57b2163c8f77be5c650667bc6a0928a246249d0290
-  data.tar.gz: 070414c04c8b5722e226e41e0b179107ac97fd0defe7424a9b9a19077055c76dc30c4ce11082c3b569e0ee869b9a4375792609d5eb65dc9383ae36dc88e34d27
+  metadata.gz: c124de122df9bc9ac02db4c35461e48ca010a3d99a806e222ef5ec5108512e2a4ff9b931afc1b741c38a99f4a86dd24f1f4a9e97176792850bacb6bc74db8c67
+  data.tar.gz: e6b1afc628991379da911fdcd8a4a6cd051859c05f396e085b765658779758d3e35f119d63d47721148caef008fd7c58c01f24f49661690d09ea945586d0e626

data/README.md

@@ -1,3 +1,5 @@
+[![Gem Version](https://badge.fury.io/rb/in_our_time.svg)](https://badge.fury.io/rb/in_our_time)
+
 ## In Our Time
 
 Select, automatically download, and play **BBC In Our Time** podcasts easily, from the command line.
@@ -8,9 +10,13 @@ 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)
+- Light Theme
+
+![compile image](https://raw.githubusercontent.com/mjago/In_Our_Time/master/images/light_theme.png)
+
+- Dark Theme
 
-![compile image](https://raw.githubusercontent.com/mjago/In_Our_Time/master/dark_theme.png)
+![compile image](https://raw.githubusercontent.com/mjago/In_Our_Time/master/images/dark_theme.png)
 
 ## Installation:
 
@@ -24,7 +30,7 @@ Config can be found at '~/.in_our_time/config.yml'
 
 ## mp3 player:
 
-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**:
+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

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.4

data/lib/iot/iot.rb

@@ -48,61 +48,65 @@ class InOurTime
     end
 
     def run
-      loop do
-        str = ''
+      Thread.new do
         loop do
-          str = STDIN.getch
-          if str == "\e"
-            @mode = :escape
-          else
-            case @mode
-            when :escape
-              if str == "["
-                @mode = :escape_2
-              else
+          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
-              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
+              else
+                break if @event == :no_event
+              end
             end
+            ke_events
           end
-          ke_events
-        end
 
-        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
+          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
-        ke_events
       end
     end
   end
@@ -113,9 +117,11 @@ class InOurTime
     end
 
     def run
-      loop do
-        sleep 1
-        @flag = true
+      Thread.new do
+        loop do
+          sleep 1
+          @flag = true
+        end
       end
     end
 
@@ -127,7 +133,6 @@ class InOurTime
 
   def initialize
     @programs, @selected = [], 0
-    @lock = Mutex.new
     setup
     load_config
     load_version
@@ -260,7 +265,7 @@ class InOurTime
 
   def filename_from_title title
     temp = title.gsub(/[^0-9a-z ]/i, '').gsub(' ', '_').strip + '.mp3'
-    File.join(File.join IN_OUR_TIME, AUDIO_DIRECTORY, temp.downcase)
+    File.join IN_OUR_TIME, AUDIO_DIRECTORY, temp.downcase
   end
 
   def download_audio program, addr
@@ -280,27 +285,27 @@ class InOurTime
 
   def have_locally? title
     filename = filename_from_title(title)
-    if File.exists?(filename)
-      return true
-    end
-    false
+    File.exists?(filename) ? true : false
   end
 
   def rss_files
     local_rss.map{|f| File.join IN_OUR_TIME, RSS_DIRECTORY, f }
   end
 
-  def check_remote
-    if update_remote?
-      iot_print "Checking rss feeds ", @system_colour
-      local_rss.length.times do |count|
-        iot_print '.', @system_colour
-        fetch_uri rss_addresses[count], rss_files[count]
-      end
-      iot_puts
-      @config[:last_update] = now
-      save_config
+  def update
+    clear
+    iot_print "Checking rss feeds ", @system_colour
+    local_rss.length.times do |count|
+      iot_print '.', @system_colour
+      fetch_uri rss_addresses[count], rss_files[count]
     end
+    iot_puts
+    @config[:last_update] = now
+    save_config
+  end
+
+  def check_remote
+    update if update_remote?
   end
 
   def uniquify_programs
@@ -337,11 +342,7 @@ class InOurTime
   end
 
   def select_program title
-    @programs.each do |pr|
-      if pr[:title].strip == title.strip
-        return pr
-      end
-    end
+    @programs.map{|pr| return pr if(pr[:title].strip == title.strip)}
     nil
   end
 
@@ -401,9 +402,7 @@ class InOurTime
   end
 
   def clear
-    @lock.synchronize do
-      system 'clear' or system 'cls'
-    end
+    system 'clear' or system 'cls'
   end
 
   def print_error_and_delay message
@@ -590,6 +589,7 @@ class InOurTime
       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
@@ -730,19 +730,11 @@ class InOurTime
   end
 
   def run
-    ip = ''
-    @tic = Tic.new
-    @tic_thread = Thread.new do
-      @tic.run
-    end
+    ip, action = '', :unknown
+    @tic, @key = Tic.new, KeyboardEvents.new
+    @tic.run
+    @key.run
 
-    @key = KeyboardEvents.new
-    key_thread = Thread.new do
-      @key.run
-    end
-#    sleep 0.015
-
-    action = :unknown
     redraw
     loop do
 
@@ -762,12 +754,8 @@ class InOurTime
 
       action =
         case ip
-        when :pause
-          pause
-        when :forward
-          forward
-        when :rewind
-          rewind
+        when :pause, :forward, :rewind
+          self.send ip
         when :list
           @line_count = 0
           @selected = 0
@@ -803,6 +791,13 @@ class InOurTime
           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

metadata

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