in_our_time 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d431c6acebb6c984ae2866189aa2ff50b3d52c8
-  data.tar.gz: 91ea04fe56e4b78e57fc46e4a42350b9f7abafde
+  metadata.gz: 5ebc3b3c85e4482305e7c6126b149228e277165a
+  data.tar.gz: eff2a53fb96a38076a283e2c668e09c4d169f090
 SHA512:
-  metadata.gz: 12cdc3af80022e5a5d50cb34b98d8f2a58431225dde9625b0f2327780892d968c0764e006eee719c8abdd45b42d97b337e9eccf615e84f2fa0e920a23263e12d
-  data.tar.gz: a12f8953946ed6708e765f79ed4a9ce1d808f5c63091ef5445f70833678965bfc32e2de3589c5a3cb68ff54ffce9ddf9eca748d476a0b81bfa5d639728ec918b
+  metadata.gz: 418b56bec73a51dae797340183fc2f7b7a9e7a98b7378e7ba82dcb6be441a887e90a6cfcced2a156725816348d4abba73d04ab5b7dec333ea9f7be32d18f4a91
+  data.tar.gz: afd484a3f52597e77c3b2a0b731a86da0f1c89b05b96e534b6751e4f92c1078eca1717cb71acf527cb9076b1f1304203f5d14ddd840af220b40f65e9434635a0

data/.gitignore

@@ -2,3 +2,6 @@
 /rss/
 /in_our_time.org
 /.rubocop_todo.yml
+/.rbenv-gemsets
+/.rubocop.yml
+/Gemfile.lock

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/lib/in_our_time.rb

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

data/lib/iot/iot.rb

@@ -469,9 +469,12 @@ class InOurTime
     end
   end
 
+  def use_mpg123?
+    @config[:mpg_player] == :mpg123
+  end
+
   def player_cmd
-    case @config[:mpg_player]
-    when :mpg123
+    if use_mpg123?
       "mpg123 --remote-err -Cqk#{pre_delay}"
     else
       "afplay"
@@ -487,6 +490,84 @@ class InOurTime
     sleep delay
   end
 
+  def get_search_results search_term
+    distances = {}
+    @sorted_titles.each do |title|
+      title.split(' ').each do |word|
+        if distances[title].nil?
+          distances[title] = Levenshtein::distance(search_term, word)
+        else
+          distances[title] =
+            distances[title] >
+            Levenshtein::distance(search_term, word.downcase)   ?
+              Levenshtein::distance(search_term, word.downcase) :
+              distances[title]
+        end
+      end
+    end
+    results = distances.sort_by{ |k, v| v }
+    results.shuffle! if search_term == ''
+    results
+  end
+
+  def print_search_results results
+    puts
+    puts "0: Search Again!"
+    puts
+    5.times do |count|
+      print "#{count + 1}: "
+      puts results[count][0]
+    end
+    puts
+  end
+
+  def display_search_choice results, choice
+    @key = KeyboardEvents.new
+    begin
+      if choice.to_i > 0 && choice.to_i < 6
+        list_selected results[choice.to_i - 1][0]
+        return
+      end
+    end
+    redraw
+  end
+
+  def get_search_term
+    puts "Enter Search Term or just Return for Random:"
+    puts
+    print "Search Term: "
+    gets.chomp
+  end
+
+  def get_search_choice
+    print "Enter Choice: "
+    temp = gets.chomp
+    temp == '0' ? :search_again : temp
+  end
+
+  def search_init
+    @key.kill
+    sleep 0.2
+    STDIN.echo = true
+    STDIN.cooked!
+    clear
+    sleep 0.2
+  end
+
+  def search
+    choice = ''
+    results = []
+    loop do
+      search_init
+      search_term = get_search_term
+      results = get_search_results(search_term)
+      print_search_results(results)
+      choice = get_search_choice
+      break unless choice == :search_again
+    end
+    display_search_choice results, choice
+  end
+
   def run_program prg
     unless prg[:have_locally]
       retries = 0
@@ -561,7 +642,7 @@ class InOurTime
   end
 
   def control_play?
-    @playing && (@config[:mpg_player] == :mpg123)
+    @playing && use_mpg123?
   end
 
   def forward
@@ -572,6 +653,12 @@ class InOurTime
      write_player ";" if control_play?
   end
 
+  def instructions
+    iot_print "Type", @system_colour
+    iot_print " h ", :light_green
+    iot_print "for instructions", @system_colour
+  end
+
   def print_playing_maybe
     if @playing
       iot_print("Playing: ", @count_colour) unless @paused
@@ -579,7 +666,7 @@ class InOurTime
       iot_puts @playing, @selection_colour
     elsif @started.nil?
       @started = true
-      iot_print "? or h for instructions", @text_colour
+      instructions
     end
   end
 
@@ -654,40 +741,78 @@ class InOurTime
   def load_help_maybe
     return unless help_option?
     help
-    quit
+    puts
+    exit 0
   end
 
   def help_screen
     []                                     <<
       " In Our Time Player (#{@version})"  <<
       "                                 "  <<
-      " Play/Stop      - X or Enter     "  <<
+      " Play/Stop      - X / Enter      "  <<
       " Next/Prev      - Up / Down      "  <<
       " Next/Prev Page - Right / Left   "  <<
       " Sort           - S              "  <<
+      " Search         - ?              "  <<
       " Theme Toggle   - T              "  <<
       " List Top/End   - L              "  <<
       " Update         - U              "  <<
       " Info           - I              "  <<
       " Help           - H              "  <<
       " Quit           - Q              "  <<
-      " mpg123 Control                  "  <<
-      "   Pause/Resume - P / SPACEBAR   "  <<
+      " mpg123 Control -                "  <<
+      "   Pause/Resume - P / Spacebar   "  <<
       "   Forward Skip - F              "  <<
       "   Reverse Skip - R              "  <<
       "                                 "  <<
       "Config: #{CONFIG}                "
   end
 
+  def help_partial x,y; help_screen[x..y]   end
+  def help_title; help_partial(0, 1)        end
+  def help_main; help_partial(2, 12)        end
+  def help_cfg;  help_partial(17, -1)       end
+
+  def help_mpg
+    scr = help_partial(13,16)
+    scr[0].rstrip! << ' (enabled)      ' if     use_mpg123?
+    scr[0].rstrip! << ' (disabled)     ' unless use_mpg123?
+    scr
+  end
+
+  def help_colour scr
+    case scr
+    when :mpg
+      return @selection_colour unless use_mpg123?
+      @count_colour if use_mpg123?
+    when :cfg
+      @system_colour
+    else
+      @text_colour
+    end
+  end
+
+  def rstrip_maybe scr
+    self.rstrip unless scr == :mpg
+  end
+
+  def help_render scr
+    txt = send "help_#{scr}"
+    iot_puts txt.map{|x| x}.join("\n\r"), help_colour(scr)
+  end
+
   def print_help
-    iot_puts help_screen.map{|x|x.rstrip}.join("\n\r"), @system_colour
+    help_render :title
+    help_render :main
+    help_render :mpg
+    help_render :cfg
   end
 
   def help
     unless @help
       clear_content
       print_help
-      print_playing_maybe
+      print_playing_maybe unless help_option?
       @help = true
       render
     else
@@ -697,7 +822,7 @@ class InOurTime
   end
 
   def reformat info
-    ['With','Guests','Producer','Contributors'].map do | x|
+    ['With','Guests','Producer','Contributors'].map do |x|
       [' ', ':'].map do |y|
         [x, x.upcase].map do |z|
           info.gsub!(z + y, "\n" + z + y)
@@ -888,7 +1013,7 @@ class InOurTime
     case ip
     when :pause, :forward, :rewind, :list_key, :page_forward, :page_back,
          :previous, :next, :play, :sort_key, :theme_toggle, :update_key,
-         :info, :help, :quit_key
+         :info, :help, :quit_key, :search
       self.send ip
     end
   end

data/lib/iot/keyboard_events.rb

@@ -67,36 +67,40 @@ class KeyboardEvents
   end
 
   def match_event str
-    case str
-    when "\e"
-      @mode = :escape
-    when "l",'L'
-      @event = :list_key
-    when "u",'U'
-      @event = :update_key
-    when ' '
-      @event = :pause
-    when "q",'Q', "\u0003", "\u0004"
-      @event = :quit_key
-    when 'p', 'P'
-      @event = :pause
-    when 'f', 'F'
-      @event = :forward
-    when 'r', 'R'
-      @event = :rewind
-    when 's', 'S'
-      @event = :sort_key
-    when 't', 'T'
-      @event = :theme_toggle
-    when 'x', 'X', "\r"
-      @event = :play
-    when 'i', 'I'
-      @event = :info
-    when '?', 'h', 'H'
-      @event = :help
-    else
-      return @event = :no_event
-    end
+    @event =
+      case str
+      when "\e"
+        @mode = :escape
+        :no_event
+      when "l",'L'
+        :list_key
+      when "u",'U'
+        :update_key
+      when ' '
+        :pause
+      when "q",'Q', "\u0003", "\u0004"
+        :quit_key
+      when 'p', 'P'
+        :pause
+      when 'f', 'F'
+        :forward
+      when 'r', 'R'
+        :rewind
+      when 's', 'S'
+        :sort_key
+      when 't', 'T'
+        :theme_toggle
+      when 'x', 'X', "\r"
+        :play
+      when 'i', 'I'
+        :info
+      when 'h', 'H'
+        :help
+      when '?'
+        :search
+      else
+        :no_event
+      end
   end
 end
 

data/lib/iot/levenshtein.rb

@@ -0,0 +1,55 @@
+module Levenshtein # :nodoc:
+  # This code is based directly on the Text gem implementation
+  # Copyright (c) 2006-2013 Paul Battley, Michael Neumann, Tim Fletcher.
+  #
+  # Returns a value representing the "cost" of transforming str1 into str2
+  def distance(str1, str2)
+    n = str1.length
+    m = str2.length
+    return m if n.zero?
+    return n if m.zero?
+
+    d = (0..m).to_a
+    x = nil
+
+    # to avoid duplicating an enumerable object, create it outside of the loop
+    str2_codepoints = str2.codepoints
+
+    str1.each_codepoint.with_index(1) do |char1, i|
+      j = 0
+      while j < m
+        cost = (char1 == str2_codepoints[j]) ? 0 : 1
+        x = min3(
+          d[j+1] + 1, # insertion
+          i + 1,      # deletion
+          d[j] + cost # substitution
+        )
+        d[j] = i
+        i = x
+
+        j += 1
+      end
+      d[m] = x
+    end
+
+    x
+  end
+  module_function :distance
+
+  private
+
+  # detects the minimum value out of three arguments. This method is
+  # faster than `[a, b, c].min` and puts less GC pressure.
+  # See https://github.com/yuki24/did_you_mean/pull/1 for a performance
+  # benchmark.
+  def min3(a, b, c)
+    if a < b && a < c
+      a
+    elsif b < c
+      b
+    else
+      c
+    end
+  end
+  module_function :min3
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: in_our_time
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Martyn Jago
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2016-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oga
@@ -73,6 +73,7 @@ files:
 - lib/in_our_time.rb
 - lib/iot/iot.rb
 - lib/iot/keyboard_events.rb
+- lib/iot/levenshtein.rb
 homepage: https://github.com/mjago/In_Our_Time
 licenses:
 - MIT