in_our_time 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdf0f4fb7f458ec6f36151a8b43765be9ef5e5fc
-  data.tar.gz: 12ef0612de0983287a45af693b3124b49e8987a7
+  metadata.gz: 95c440df705ea2afb85d4c4ea6caa5fa03b67732
+  data.tar.gz: c61b39babdf2dbd70ea44df6656cfb108b829d42
 SHA512:
-  metadata.gz: 43ec3359f3ed982d34e8e6c79a6b6aaafd1b70dc22994196691f705aefd33f93b4fe26027d6481132e6ff7702f0832196d662ba2187d639bc4c691a85db51731
-  data.tar.gz: a651827754058efa7c8bb613bc6965ede3f9b13b914efefc04c696724c2438b612a68869da81792e451392b278c489f0ce03c523ecee8eb5e0e184bb4b1b9971
+  metadata.gz: aff9aa5de8973ea63ed168df39bf1e540dd7de222e7fcc4bf4c90551659eb74a17432893ad89aaf8ec6f9b7defcdc79ce5b059e1981d89134ab3d0489ee3f05c
+  data.tar.gz: 94d19d14be5efafcdb409b82f5765cc263308aac43052804812ca3df7cce1ce3f97a55caae14d0ca35139c89da2d5c09e576179a24ee8e6dfd41bc06d8f481fd

data/README.md

@@ -0,0 +1,27 @@
+## 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).
+
+When played, podcast is archived locally for offline access in the future.
+
+Checks regularly for new podcasts and adds to the list.
+
+![compile image](https://raw.githubusercontent.com/mjago/In_Our_Time/master/light_theme.png)
+
+![compile image](https://raw.githubusercontent.com/mjago/In_Our_Time/master/dark_theme.png)
+
+## Installation:
+
+```sh
+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**.
+

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/in_our_time.gemspec

@@ -19,5 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>= 2.0.0'
   spec.add_runtime_dependency 'nokogiri', '>= 1.6.8'
+  spec.add_runtime_dependency 'colorize', '>= 0.8.1'
   spec.add_development_dependency 'version', '>= 1.0.0'
 end

data/lib/in_our_time.rb

@@ -1,4 +1,3 @@
 require_relative 'iot/iot.rb'
-require_relative 'iot/colour_prompt.rb'
 
 InOurTime.new

data/lib/iot/iot.rb

@@ -5,10 +5,12 @@ require 'net/http'
 require 'open-uri'
 require 'yaml'
 require 'fileutils'
+require 'colorize'
 
 class InOurTime
-  ROOT = File.expand_path '~/'
-  IN_OUR_TIME = File.join ROOT, '.in_our_time'
+
+  ROOT            = File.expand_path '~/'
+  IN_OUR_TIME     = File.join ROOT, '.in_our_time'
   CONFIG          = File.join IN_OUR_TIME, 'config.yml'
   UPDATE_INTERVAL = 604800
   AUDIO_DIRECTORY = 'audio'
@@ -20,11 +22,14 @@ class InOurTime
 
     @arrow = 0
 
+    def reset
+      $stdin.flush
+    end
+
     def input
-      sleep 0.001
       begin
         system("stty raw -echo")
-        str = STDIN.getc
+        str = $stdin.getc
       ensure
         system("stty -raw echo")
       end
@@ -82,14 +87,14 @@ class InOurTime
     run
   end
 
-  def iot_print x, role = :default
-    colour_print(role, x) if @config[:colour]
-    print(x) unless @config[:colour]
+  def iot_print x, col = @text_colour
+    print x.colorize col if @config[:colour]
+    print x          unless @config[:colour]
   end
 
-  def iot_puts x, role = :default
-    colour_puts(role, x) if @config[:colour]
-    puts(x) unless @config[:colour]
+  def iot_puts x, col = @text_colour
+    puts x.colorize col if @config[:colour]
+    puts x          unless @config[:colour]
   end
 
   def now
@@ -120,7 +125,22 @@ class InOurTime
      :sort => :age,
      :show_count => true,
      :page_height => PAGE_HEIGHT,
-     :page_width  => PAGE_WIDTH
+     :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
+     }
     }
   end
 
@@ -130,6 +150,12 @@ class InOurTime
     end
     @config = YAML::load_file(CONFIG)
     @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]
   end
 
   def save_config cfg = @config
@@ -176,13 +202,13 @@ 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])}...", :yellow
+        iot_print "writing #{filename_from_title(program[:title])}...", @system_colour
         f.print(res.body)
-        iot_puts " written.", :yellow
+        iot_puts " written.", @system_colour
       end
       program[:have_locally] = true
     else
-      iot_puts 'audio download failed. Retrying...', :yellow
+      iot_puts 'audio download failed. Retrying...', @system_colour
     end
   end
 
@@ -200,9 +226,9 @@ class InOurTime
 
   def check_remote
     if update_remote?
-      iot_print "checking rss feeds ", :yellow
+      iot_print "checking rss feeds ", @system_colour
       local_rss.length.times do |count|
-        print '.'
+        iot_print '.', @system_colour
         fetch_uri rss_addresses[count], rss_files[count]
       end
       iot_puts ''
@@ -294,12 +320,12 @@ class InOurTime
   def run_program prg
     unless prg[:have_locally]
       retries = 0
-      iot_puts "fetching #{prg[:title]}", :yellow
+      iot_puts "fetching #{prg[:title]}", @system_colour
       10.times do
         res = Net::HTTP.get_response(URI.parse(prg[:link]))
         case res
         when Net::HTTPFound
-          iot_puts 'redirecting...', :yellow
+          iot_puts 'redirecting...', @system_colour
           @doc = Nokogiri::XML(res.body)
           redirect = @doc.css("body p a").text
           break if download_audio(prg, redirect)
@@ -326,10 +352,10 @@ class InOurTime
   def print_playing_maybe
     iot_puts ''
     if @playing
-      iot_puts "Playing '#{@playing}'"
+      iot_puts "Playing '#{@playing}'", @selection_colour
     elsif @started.nil?
       @started = true
-      iot_puts "? or h for instructions"
+      iot_puts "? or h for instructions", @text_colour
     else
       iot_puts ''
     end
@@ -344,15 +370,16 @@ class InOurTime
   end
 
   def idx_format idx
-    sprintf("%03d, ", idx + 1)
+    sprintf("%03d", idx + 1)
   end
 
   def show_count_maybe idx
     if have_locally?(@sorted_titles[idx])
-      iot_print idx_format(idx), :cyan if @config[:show_count]
+      iot_print idx_format(idx), @count_sel_colour  if @config[:show_count]
     else
-      iot_print idx_format(idx), :yellow if @config[:show_count]
+      iot_print idx_format(idx), @count_colour if @config[:show_count]
     end
+    iot_print ' '
   end
 
   def draw_page
@@ -361,16 +388,16 @@ class InOurTime
         if idx < @sorted_titles.length
           iot_print "> " if(idx == @selected) unless @config[:colour]
           show_count_maybe idx
-          iot_puts @sorted_titles[idx],  :purple    if    (idx == @selected)
-          iot_puts @sorted_titles[idx],  :default unless(idx == @selected)
+          iot_puts @sorted_titles[idx], @selection_colour if (idx == @selected)
+          iot_puts @sorted_titles[idx], @text_colour         unless(idx == @selected)
         end
       end
     else
       @line_count = 0
       0.upto(@config[:page_height] - 1) do |idx|
-        iot_print "> " if(idx == @selected)
+        iot_print "> ", @selection_colour if(idx == @selected)
         show_count_maybe(idx) unless @sorted_titles[idx].nil?
-        iot_puts @sorted_titles[idx] unless @sorted_titles[idx].nil?
+        iot_puts @sorted_titles[idx], @text_colour unless @sorted_titles[idx].nil?
       end
     end
     @line_count += @config[:page_height]
@@ -458,10 +485,10 @@ class InOurTime
 
   def info
     if @info.nil?
+      prg = select_program @sorted_titles[@selected]
       system 'clear'
       iot_puts ''
-      prg = select_program @sorted_titles[@selected]
-      iot_puts justify(prg[:subtitle].gsub(/\s+/, ' '))
+      justify(prg[:subtitle].gsub(/\s+/, ' ')).map{|x| iot_puts x}
       iot_puts ''
       iot_puts "Date Broadcast: #{prg[:date]}"
       iot_puts "Duration:       #{prg[:duration].to_i/60} mins"
@@ -469,11 +496,11 @@ class InOurTime
                (prg[:have_locally] ? "Downloaded" : "Requires Download")
       @info = 1
     elsif @info == 1
-      system 'clear'
-      iot_puts ''
       prg = select_program @sorted_titles[@selected]
       info = prg[:summary].gsub(/\s+/, ' ')
-      iot_puts justify(reformat(info))
+      system 'clear'
+      iot_puts ''
+      justify(reformat(info)).map{|x| iot_puts x}
       @info = -1
     else
       display_list :same_page
@@ -482,53 +509,58 @@ class InOurTime
   end
 
   def run
+    action = :unknown
     display_list :same_page
     key = KeyboardEvents.new
     loop do
+      unless action == :unknown
+        key.reset
+      end
+
       ip = key.input
       @info = nil unless ip == :info
       @help = nil unless ip == :help
 
-      case ip
-      when :list
-        @line_count = 0
-        @selected = 0
-        display_list :draw_page
-      when :page_forward
-        @selected = @line_count
-        display_list :draw_page
-      when :previous
-        @selected -= 1 if @selected > 0
-        if @selected >= @line_count -
-           @config[:page_height]
-          display_list :same_page
-        else
-          display_list :previous_page
-        end
-      when :next
-        @selected += 1
-        if @selected <= @line_count - 1
-          display_list :same_page
-        else
+      action =
+        case ip
+        when :list
+          @line_count = 0
+          @selected = 0
+          display_list :draw_page
+        when :page_forward
+          @selected = @line_count
           display_list :draw_page
+        when :previous
+          @selected -= 1 if @selected > 0
+          if @selected >= @line_count -
+             @config[:page_height]
+            display_list :same_page
+          else
+            display_list :previous_page
+          end
+        when :next
+          @selected += 1
+          if @selected <= @line_count - 1
+            display_list :same_page
+          else
+            display_list :draw_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
+        when :info
+          info
+        when :help
+          help
+        when :quit
+          kill_audio
+          exit 0
         end
-      when :play
-        kill_audio
-        title = @sorted_titles[@selected]
-        pr = select_program title
-        run_program pr
-        display_list :same_page
-      when :stop
-        kill_audio
-      when :info
-        info
-      when :help
-        help
-      when :quit
-        kill_audio
-        exit 0
-      end
-      sleep 0.001
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: in_our_time
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Martyn Jago
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.8
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: version
   requirement: !ruby/object:Gem::Requirement
@@ -48,13 +62,15 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
+- README.md
 - Rakefile
 - VERSION
 - bin/iot
+- dark_theme.png
 - in_our_time.gemspec
 - lib/in_our_time.rb
-- lib/iot/colour_prompt.rb
 - lib/iot/iot.rb
+- light_theme.png
 homepage: https://github.com/mjago/In_Our_Time
 licenses:
 - MIT

data/lib/iot/colour_prompt.rb

@@ -1,129 +0,0 @@
-# ==========================================
-#   Unity Project - A Test Framework for C
-#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
-#   [Released under MIT License. Please refer to license.txt for details]
-# ==========================================
-
-if RUBY_PLATFORM =~/(win|w)32$/
-  begin
-    require 'Win32API'
-  rescue LoadError
-    puts "ERROR! \"Win32API\" library not found"
-    puts "\"Win32API\" is required for colour on a windows machine"
-    puts "  try => \"gem install Win32API\" on the command line"
-    puts
-  end
-  # puts
-  # puts 'Windows Environment Detected...'
-  # puts 'Win32API Library Found.'
-  # puts
-end
-
-class ColourCommandLine
-  def initialize
-    if RUBY_PLATFORM =~/(win|w)32$/
-      get_std_handle = Win32API.new("kernel32", "GetStdHandle", ['L'], 'L')
-      @set_console_txt_attrb =
-        Win32API.new("kernel32","SetConsoleTextAttribute",['L','N'], 'I')
-      @hout = get_std_handle.call(-11)
-    end
-  end
-
-  def change_to(new_colour)
-    if RUBY_PLATFORM =~/(win|w)32$/
-      @set_console_txt_attrb.call(@hout,self.win32_colour(new_colour))
-    else
-      "\033[30;#{posix_colour(new_colour)};22m"
-    end
-  end
-
-  def win32_colour(colour)
-    case colour
-    when :black then 0
-    when :dark_blue then 1
-    when :dark_green then 2
-    when :dark_cyan then 3
-    when :dark_red then 4
-    when :dark_purple then 5
-    when :dark_yellow, :narrative then 6
-    when :default_white, :default, :dark_white then 7
-    when :silver then 8
-    when :blue then 9
-    when :green, :success then 10
-    when :cyan, :output then 11
-    when :red, :failure then 12
-    when :purple then 13
-    when :yellow then 14
-    when :white then 15
-    else
-      0
-    end
-  end
-
-  def posix_colour(colour)
-    # ANSI Escape Codes - Foreground colors
-    # | Code | Color                     |
-    # | 39   | Default foreground color  |
-    # | 30   | Black                     |
-    # | 31   | Red                       |
-    # | 32   | Green                     |
-    # | 33   | Yellow                    |
-    # | 34   | Blue                      |
-    # | 35   | Magenta                   |
-    # | 36   | Cyan                      |
-    # | 37   | Light gray                |
-    # | 90   | Dark gray                 |
-    # | 91   | Light red                 |
-    # | 92   | Light green               |
-    # | 93   | Light yellow              |
-    # | 94   | Light blue                |
-    # | 95   | Light magenta             |
-    # | 96   | Light cyan                |
-    # | 97   | White                     |
-
-    case colour
-    when :black then 30
-    when :red, :failure then 31
-    when :green, :success then 32
-    when :yellow then 33
-    when :blue, :narrative then 34
-    when :purple, :magenta then 35
-    when :cyan, :output then 36
-    when :white, :default_white then 37
-    when :default then 39
-    when :dark_gray     then 90  # Dark gray
-    when :light_red     then 91  # Light red
-    when :light_green   then 92  # Light green
-    when :light_yellow  then 93  # Light yellow
-    when :light_blue    then 94  # Light blue
-    when :light_magenta then 95  # Light magenta
-    when :light_cyan    then 96  # Light cyan
-    when :White         then 97  # White
-
-    else
-      39
-    end
-  end
-
-  def out_c(mode, colour, str, out = :stdout)
-    buf = case out
-          when :stdout
-            $stdout
-          else
-            out = out
-          end
-    case RUBY_PLATFORM
-    when /(win|w)32$/
-      change_to(colour)
-      buf.puts str if mode == :puts
-      buf.print str if mode == :print
-      change_to(:default_white)
-    else
-      buf.puts("#{change_to(colour)}#{str}\033[0m") if mode == :puts
-      $stdout.print("#{change_to(colour)}#{str}\033[0m") if mode == :print
-    end
-  end
-end # ColourCommandLine
-
-def colour_puts(role,str, out = :stdout)  ColourCommandLine.new.out_c(:puts, role, str, out)  end
-def colour_print(role,str, out = :stdout) ColourCommandLine.new.out_c(:print, role, str, out) end