in_our_time 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 118ea99783afae1f37cbacccac7101f6eee07784
-  data.tar.gz: 5c7ef1c9c9aff29c1c810453e1cc3ad6852625e9
+  metadata.gz: a4d33efed1ec31350eb4993c5be89f4506d0200b
+  data.tar.gz: dcada7f6e8bdafe08258d7529785af1fdbbac2ac
 SHA512:
-  metadata.gz: 37c71d0c90d5aaf141081e0b18eb2792fa66b7cfb9dd22eb48224621e45a0160fb3a6d0a53174b9948615caf8f33147b9c8ae87b46d0171edec819ba05ee1760
-  data.tar.gz: da7f11e577a7876950b502be5a5731c92781fb16049d563d4c0dec9c0f2b36923178cdef85866817e6a33d30083c768a7f824744eac76899a48716580d4b08a0
+  metadata.gz: ec29eeae228da573d068ef13d71ee7c05632fda8b99a331045afbc2cbf4950c23bd30112a0d4da05205645bec85c515f9177fd4bbbb347b44eacc0e6f194007c
+  data.tar.gz: ee0742b483f3ea7859ebbc36e72b48dd60743b6c87acc692628326021575642f2286728aa1563571ebcc022d15e96ba6e51e1b346700339cb04072a60c7f7321

data/.gitignore

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

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/config.yml

@@ -0,0 +1,30 @@
+---
+:last_update: 1474712963
+:update_interval: 604800
+:colour: true
+:mpg_player: :afplay
+:sort: :age
+:show_count: true
+:page_height: 20
+:page_width: 80
+:colour_theme: :light_theme
+:light_theme:
+  :selection_colour:
+    :colour: :magenta
+    :background: :light_white
+  :count_sel_colour:
+    :colour: :cyan
+    :background: :light_white
+  :count_colour: :yellow
+  :text_colour: :default
+  :system_colour: :yellow
+:dark_theme:
+  :selection_colour:
+    :colour: :light_yellow
+    :background: :light_black
+  :count_sel_colour:
+    :colur: :blue
+    :background: :yellow
+  :count_colour: :yellow
+  :text_colour: :default
+  :system_colour: :yellow

data/lib/iot/iot.rb

@@ -10,8 +10,12 @@ require 'oga'
 class InOurTime
 
   ROOT            = File.expand_path '~/'
-  IN_OUR_TIME     = File.join ROOT, '.in_our_time'
-  CONFIG          = File.join IN_OUR_TIME, 'config.yml'
+  HERE            = File.dirname(__FILE__)
+  CONFIG_DIR      = '.in_our_time'
+  CONFIG_NAME     = 'config.yml'
+  IN_OUR_TIME     = File.join ROOT, CONFIG_DIR
+  DEFAULT_CONFIG  = File.join HERE, '..','..',CONFIG_NAME
+  CONFIG          = File.join IN_OUR_TIME,CONFIG_NAME
   UPDATE_INTERVAL = 604800
   AUDIO_DIRECTORY = 'audio'
   RSS_DIRECTORY   = 'rss'
@@ -20,7 +24,7 @@ class InOurTime
 
   class KeyboardEvents
 
-    @arrow = 0
+    @mode = :normal
 
     def reset
       $stdin.flush
@@ -34,25 +38,25 @@ class InOurTime
         system("stty -raw echo")
       end
 
-      case @arrow
-      when 1
+      case @mode
+      when :escape
         if str == "["
-          @arrow = 2
+          @mode = :escape_2
         else
-          @arrow = 0
+          @mode = :normal
         end
 
-      when 2
+      when :escape_2
         return :previous     if str == "A"
         return :next         if str == "B"
         return :page_forward if str == "C"
         return :previous     if str == "D"
-        @arrow = 0
+        @mode = :normal
       end
 
       case str
       when "\e"
-        @arrow = 1
+        @mode = :escape
       when "l",'L'
         :list
       when ' '
@@ -117,38 +121,12 @@ class InOurTime
     now - @config[:update_interval] > @config[:last_update]
   end
 
-  def new_config
-    {:last_update => now - UPDATE_INTERVAL - 1,
-     :update_interval => UPDATE_INTERVAL,
-     :colour => true,
-     :mpg_player => :afplay,
-     :sort => :age,
-     :show_count => true,
-     :page_height => PAGE_HEIGHT,
-     :page_width  => PAGE_WIDTH,
-     :colour_theme => :light_theme,
-     :light_theme => {
-       :selection_colour =>  {:colour => :magenta, :background => :light_white},
-       :count_sel_colour =>  {:colour => :cyan, :background => :light_white},
-       :count_colour => :yellow,
-       :text_colour => :default,
-       :system_colour => :yellow
-     },
-     :dark_theme => {
-       :selection_colour => {:colour => :light_yellow, :background => :light_black},
-       :count_sel_colour => {:colur => :blue, :background => :yellow},
-       :count_colour => :yellow,
-       :text_colour => :default,
-       :system_colour => :yellow
-     }
-    }
+  def create_config
+    @config = YAML::load_file(DEFAULT_CONFIG)
+    save_config
   end
 
-  def load_config
-    unless File.exist? CONFIG
-      save_config new_config
-    end
-    @config = YAML::load_file(CONFIG)
+  def do_configs
     @line_count = @config[:page_height]
     theme = @config[:colour_theme]
     @selection_colour = @config[theme][:selection_colour]
@@ -158,8 +136,14 @@ class InOurTime
     @system_colour    = @config[theme][:system_colour]
   end
 
-  def save_config cfg = @config
-    File.open(CONFIG, 'w') { |f| f.write cfg.to_yaml}
+  def load_config
+    create_config unless File.exist? CONFIG
+    @config = YAML::load_file(CONFIG)
+    do_configs
+  end
+
+  def save_config
+    File.open(CONFIG, 'w') { |f| f.write @config.to_yaml}
   end
 
   def rss_addresses
@@ -208,7 +192,7 @@ class InOurTime
       end
       program[:have_locally] = true
     else
-      iot_puts 'audio download failed. Retrying...', @system_colour
+      iot_puts 'Download failed. Retrying...', @system_colour
     end
   end
 
@@ -226,7 +210,7 @@ class InOurTime
 
   def check_remote
     if update_remote?
-      iot_print "checking rss feeds ", @system_colour
+      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]
@@ -240,7 +224,7 @@ class InOurTime
   def uniquify_programs
     @programs = @programs.uniq{|pr| pr[:title]}
     unless @programs.uniq.length == @programs.length
-      iot_puts "Error ensuring Programs unique!", :red
+      print_error_and_delay "Error ensuring Programs unique!"
       exit 1
     end
   end
@@ -314,12 +298,28 @@ class InOurTime
       end
   end
 
+  def clear
+    system 'clear' or system 'cls'
+  end
+
+  def print_error_and_delay message
+    iot_puts message, :red
+    sleep 2
+  end
+
   def run_program prg
     unless prg[:have_locally]
       retries = 0
-      iot_puts "fetching #{prg[:title]}", @system_colour
+      clear
+      iot_puts "Fetching #{prg[:title]}", @system_colour
       10.times do
-        res = Net::HTTP.get_response(URI.parse(prg[:link]))
+        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})"
+          @no_play = true
+          break
+        end
         case res
         when Net::HTTPFound
           iot_puts 'redirecting...', @system_colour
@@ -328,22 +328,26 @@ class InOurTime
           break if download_audio(prg, redirect)
           sleep 2
         else
-          iot_puts 'Error! Expected to be redirected!', :red
-          exit 1
+          print_error_and_delay 'Error! Failed to be redirected!'
+          @no_play = true
+          break
         end
         retries += 1
       end
       if retries >= 10
-        iot_puts "Max retries downloading #{prg[:title]}", :red
-        exit 1
+        print_error_and_delay "Max retries downloading #{prg[:title]}"
+        @no_play = true
       end
     end
-    @play = Thread.new do
-      @playing = prg[:title]
-      system player_cmd + ' ' +
-             filename_from_title(@playing)
-      @playing = nil
+    unless @no_play
+      @play = Thread.new do
+        @playing = prg[:title]
+        system player_cmd + ' ' +
+               filename_from_title(@playing)
+        @playing, @no_play  = nil, nil
+      end
     end
+    @no_play = nil
   end
 
   def print_playing_maybe
@@ -385,7 +389,7 @@ class InOurTime
           iot_print "> " if(idx == @selected) unless @config[:colour]
           show_count_maybe idx
           iot_puts @sorted_titles[idx], @selection_colour if (idx == @selected)
-          iot_puts @sorted_titles[idx], @text_colour         unless(idx == @selected)
+          iot_puts @sorted_titles[idx], @text_colour   unless(idx == @selected)
         end
       end
     else
@@ -401,7 +405,7 @@ class InOurTime
   end
 
   def display_list action
-    system 'clear'
+    clear
     case action
     when :draw_page
       draw_page
@@ -421,7 +425,7 @@ class InOurTime
 
   def help
     unless @help
-      system 'clear'
+      clear
       iot_puts " In Our Time Player (Help)       "
       iot_puts "                                 "
       iot_puts " Next      - N (down arrow)      "
@@ -436,7 +440,7 @@ class InOurTime
       iot_puts "  TL;DR                          "
       iot_puts "Select: up/down arrows           "
       iot_puts "Play:   enter                    "
-      iot_puts "Config: ~/.in_our_time/config.yml"
+      iot_puts "Config: #{CONFIG}                "
       18.upto(@config[:page_height] - 1) {iot_puts ''}
       print_playing_maybe
       @help = true
@@ -495,28 +499,57 @@ class InOurTime
     pages
   end
 
+  def print_subtitle prg
+    clear
+    justify(prg[:subtitle].gsub(/\s+/, ' '))[0].map{|x| iot_puts x}
+    print_program_details prg
+    @info = 1
+    @page_count = 1
+  end
+
+  def print_program_details prg
+    iot_puts "\nDate Broadcast: #{prg[:date]}"
+    iot_puts "Duration:       #{prg[:duration].to_i/60} mins"
+    iot_puts "Availability:   " +
+             (prg[:have_locally] ? "Downloaded" : "Requires Download")
+  end
+
+  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])
+        iot_puts x
+      end
+      count += 1
+    end
+    if count <= @page_count * @config[:page_height] + 1
+      @info = justify(reformat(info))[1] == [] ? -1 : 2
+    else
+      @page_count += 1
+    end
+  end
+
+  def print_guests prg
+    info = prg[:summary].gsub(/\s+/, ' ')
+    clear
+    justify(reformat(info))[1].map{|x| iot_puts x}
+    @info = -1
+  end
+
   def info
-    if @info.nil?
+    case @info
+    when nil
       prg = select_program @sorted_titles[@selected]
-      system 'clear'
-      justify(prg[:subtitle].gsub(/\s+/, ' '))[0].map{|x| iot_puts x}
-      iot_puts "\nDate Broadcast: #{prg[:date]}"
-      iot_puts "Duration:       #{prg[:duration].to_i/60} mins"
-      iot_puts "Availability:   " +
-               (prg[:have_locally] ? "Downloaded" : "Requires Download")
-      @info = 1
-    elsif @info == 1
+      print_subtitle prg
+    when 1
       prg = select_program @sorted_titles[@selected]
-      info = prg[:summary].gsub(/\s+/, ' ')
-      system 'clear'
-      justify(reformat(info))[0].map{|x| iot_puts x}
-      @info = justify(reformat(info))[1] == [] ? -1 : 2
-    elsif @info == 2
+      print_info prg
+    when 2
       prg = select_program @sorted_titles[@selected]
-      info = prg[:summary].gsub(/\s+/, ' ')
-      system 'clear'
-      justify(reformat(info))[1].map{|x| iot_puts x}
-      @info = -1
+      print_guests prg
     else
       display_list :same_page
       @info = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: in_our_time
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Martyn Jago
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-29 00:00:00.000000000 Z
+date: 2016-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oga
@@ -66,6 +66,7 @@ files:
 - Rakefile
 - VERSION
 - bin/iot
+- config.yml
 - dark_theme.png
 - in_our_time.gemspec
 - lib/in_our_time.rb