in_our_time 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fba0bd53285d9df8789fb1d0464650ed0c769a41
-  data.tar.gz: e190622c306d519d8d0a568d629c3f06dc1a5a79
+  metadata.gz: 6d431c6acebb6c984ae2866189aa2ff50b3d52c8
+  data.tar.gz: 91ea04fe56e4b78e57fc46e4a42350b9f7abafde
 SHA512:
-  metadata.gz: 5293b5c48c8a45a2dc7efc464f0ce3c87fdffddd9546e7c4223d339335ef4cd400f8c989fd5c4d227ebd1afd1559a5e72abeea28dfce4287ce9036e8045e0e9a
-  data.tar.gz: 86738cce5846617abd0f2aac1d019c88eca1a59143792e59c6c7b5137ebcfeaf690fc151ef2334ec9b3d0ebace094170eb1aa381039cc99c96fca7738ce9a239
+  metadata.gz: 12cdc3af80022e5a5d50cb34b98d8f2a58431225dde9625b0f2327780892d968c0764e006eee719c8abdd45b42d97b337e9eccf615e84f2fa0e920a23263e12d
+  data.tar.gz: a12f8953946ed6708e765f79ed4a9ce1d808f5c63091ef5445f70833678965bfc32e2de3589c5a3cb68ff54ffce9ddf9eca748d476a0b81bfa5d639728ec918b

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/lib/iot/iot.rb

@@ -51,7 +51,6 @@ class InOurTime
 
   def initialize
     @content = ''
-    @programs = []
     @selected = 0
     clear
     print "\e[?25h"
@@ -313,7 +312,6 @@ class InOurTime
       render
       fetch_uri rss_addresses[count], rss_files[count]
     end
-#    iot_puts
     @config[:last_update] = now
     save_config
   end
@@ -323,35 +321,57 @@ class InOurTime
   end
 
   def uniquify_programs
-    @programs = @programs.uniq{|pr| pr[:title]}
+    @programs.uniq!{|pr| pr[:title]}
     return if @programs.uniq.length == @programs.length
     print_error_and_delay "Error ensuring Programs unique!"
     quit 1
   end
 
+  def tags
+    ['title', 'itunes:subtitle',
+     'itunes:summary', 'itunes:duration',
+     'pubDate', 'link']
+  end
+
+  def build_program(bin)
+    title = bin[tags[0]].shift.text
+    { title:    title,
+      subtitle: bin[tags[1]].shift.text,
+      summary:  bin[tags[2]].shift.text,
+      duration: bin[tags[3]].shift.text,
+      date:     bin[tags[4]].shift.text[0..15],
+      link:     bin[tags[5]].shift.text,
+      have_locally: have_locally?(title)
+    }
+  end
+
+  def build_programs bin
+    bin['title'].size.times do
+      @programs << build_program(bin)
+    end
+  end
+
+  def item_path name
+    "rss/channel/item/#{name}"
+  end
+
+  def clear_programs
+    @programs = []
+  end
+
   def parse_rss
+    clear_programs
     rss_files.each do |file|
       @doc = Oga.parse_xml(File.open(file))
-      titles    = @doc.xpath('rss/channel/item/title')
-      subtitles = @doc.xpath('rss/channel/item/itunes:subtitle')
-      summarys  = @doc.xpath('rss/channel/item/itunes:summary')
-      durations = @doc.xpath('rss/channel/item/itunes:duration')
-      dates     = @doc.xpath('rss/channel/item/pubDate')
-      links     = @doc.xpath('rss/channel/item/link')
-
-      0.upto(titles.length - 1) do |idx|
-        program = {}
-        program[:title] = titles[idx].text
-        program[:subtitle] = subtitles[idx].text
-        program[:summary]  = summarys[idx].text
-        program[:duration] = durations[idx].text
-        program[:date] = (dates[idx].text)[0..15]
-        program[:link] = links[idx].text
-        program[:have_locally] = have_locally?(titles[idx].text)
-        @programs << program
+      bin = {}
+      tags.each do |tag|
+        bin[tag] = [] if bin[tag].nil?
+        bin[tag] = @doc.xpath(item_path(tag))
       end
+      build_programs(bin)
     end
     uniquify_programs
+    @titles_count = @programs.length
   end
 
   def select_program title
@@ -360,9 +380,8 @@ class InOurTime
   end
 
   def sort_titles
-    @sorted_titles = []
     @sorted_titles = @programs.collect { |pr| pr[:title] }
-    @sorted_titles.sort! unless @sort == :age
+    @sorted_titles.sort_by!(&:downcase) unless @sort == :age
   end
 
   def sort_selected title
@@ -383,37 +402,39 @@ class InOurTime
     redraw
   end
 
-  def list_playing
-    title = @sorted_titles[@selected]
-    if title == @playing
-      list_top
+  def list_key
+    title = @playing ? @playing : (@sorted_titles[@last_selected || 0])
+    if top_or_end?
+      list_selected title
     else
-      list_selected @playing
+      @last_selected = @selected
+      list_top_or_end
     end
   end
 
-  def list_stopped
-    if @selected == 0
-      title = @sorted_titles[@last_selected || 0]
-      list_selected title
-    else
+  def list_top_or_end
+    @list_top = @list_top? nil : true
+    if @list_top
       list_top
+    else
+      list_end
     end
   end
 
-  def list_key
-    if @playing
-      list_playing
-    else
-      list_stopped
-    end
+  def top_or_end?
+    @selected == 0 || @selected == @titles_count - 1
   end
 
   def list_top
     @last_selected = @selected
-    @line_count = 0
-    @selected = 0
-    display_list :next_page
+    title = @sorted_titles.first
+    list_selected title
+  end
+
+  def list_end
+    @last_selected = @selected
+    title = @sorted_titles.last
+    list_selected title
   end
 
   def sort_key
@@ -441,7 +462,7 @@ class InOurTime
     x = DateTime.strptime("Mon, 20 Jun 2016", '%a, %d %b %Y')
     y = DateTime.strptime(date, '%a, %d %b %Y')
     if y < x
-      return '410' unless @playing == 'Abelard and Heloise'
+      return '415' unless @playing == 'Abelard and Heloise'
       '0' if @playing == 'Abelard and Heloise'
     else
       '435'
@@ -586,9 +607,9 @@ class InOurTime
 
   def draw_page
     clear_content
-    if @line_count <= @sorted_titles.length
+    if @line_count <= @titles_count
       @line_count.upto(@line_count + @page_height - 1) do |idx|
-        if idx < @sorted_titles.length
+        if idx < @titles_count
           iot_print "> " if(idx == @selected) unless @config[:colour]
           show_count_maybe idx
           iot_puts @sorted_titles[idx], @selection_colour if (idx == @selected)
@@ -616,7 +637,7 @@ class InOurTime
       if @line_count > 0
         @line_count -= (@page_height * 2)
       else
-        @line_count = @sorted_titles.length
+        @line_count = @titles_count
         @selected = @line_count
       end
       draw_page
@@ -640,21 +661,20 @@ class InOurTime
     []                                     <<
       " In Our Time Player (#{@version})"  <<
       "                                 "  <<
-      " Play/Stop     - X or Enter      "  <<
-      " Previous/Next - Down / Up       "  <<
-      " Next Page     - SPACE           "  <<
-      " Sort          - S               "  <<
-      " Theme Toggle  - T               "  <<
-      " List Top      - L               "  <<
-      " Update        - U               "  <<
-      " Info          - I               "  <<
-      " Help          - H               "  <<
-      " Quit          - Q               "  <<
-      "                                 "  <<
-      " mpg123 Controls:                "  <<
-      "  Pause/Resume - P               "  <<
-      "  Forward Skip - F               "  <<
-      "  Reverse Skip - R               "  <<
+      " Play/Stop      - X or Enter     "  <<
+      " Next/Prev      - Up / Down      "  <<
+      " Next/Prev Page - Right / Left   "  <<
+      " Sort           - S              "  <<
+      " Theme Toggle   - T              "  <<
+      " List Top/End   - L              "  <<
+      " Update         - U              "  <<
+      " Info           - I              "  <<
+      " Help           - H              "  <<
+      " Quit           - Q              "  <<
+      " mpg123 Control                  "  <<
+      "   Pause/Resume - P / SPACEBAR   "  <<
+      "   Forward Skip - F              "  <<
+      "   Reverse Skip - R              "  <<
       "                                 "  <<
       "Config: #{CONFIG}                "
   end
@@ -807,10 +827,17 @@ class InOurTime
   end
 
   def page_forward
+    return unless @line_count < @titles_count
     @selected = @line_count
     display_list :next_page
   end
 
+  def page_back
+    @selected = @line_count - @page_height * 2
+    @selected = @selected < 0 ? 0 : @selected
+    list_selected @sorted_titles[@selected]
+  end
+
   def previous
     @selected -= 1 if @selected > 0
     if @selected >= @line_count -
@@ -822,6 +849,7 @@ class InOurTime
   end
 
   def next
+    return if @selected >= (@titles_count - 1)
     @selected += 1
     if @selected <= @line_count - 1
       redraw
@@ -858,10 +886,9 @@ class InOurTime
 
   def do_action ip
     case ip
-    when :pause, :forward, :rewind,
-         :list_key, :page_forward, :previous,
-         :next, :play, :sort_key, :theme_toggle,
-         :update_key, :info, :help, :quit_key
+    when :pause, :forward, :rewind, :list_key, :page_forward, :page_back,
+         :previous, :next, :play, :sort_key, :theme_toggle, :update_key,
+         :info, :help, :quit_key
       self.send ip
     end
   end

data/lib/iot/keyboard_events.rb

@@ -53,7 +53,7 @@ class KeyboardEvents
               @event = :previous     if str == "A"
               @event = :next         if str == "B"
               @event = :page_forward if str == "C"
-              @event = :previous     if str == "D"
+              @event = :page_back    if str == "D"
               @mode  = :normal
             else
               break if @event == :no_event
@@ -75,7 +75,7 @@ class KeyboardEvents
     when "u",'U'
       @event = :update_key
     when ' '
-      @event = :page_forward
+      @event = :pause
     when "q",'Q', "\u0003", "\u0004"
       @event = :quit_key
     when 'p', 'P'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: in_our_time
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Martyn Jago
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oga