ektoplayer 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9900059a06f9aa74a7cb9ba1ea0ae4454c277a5f
-  data.tar.gz: ed88fdc3dab3eedffd42de732596ca6ff4bbfab6
+  metadata.gz: 25039a3262bb6332eef51524e8f210e95f9d5bca
+  data.tar.gz: bf810de03fbbeb0b6b78aec743fe22c1b02a79c3
 SHA512:
-  metadata.gz: 6c53f882d896c43c7d51ecdea80e407e3211d248726dd08189fbda66ac3e6a74d285a50034f9f3bef945980b120a3fdd6f3c1db58efc66405980606059352064
-  data.tar.gz: ad2b475b718c3b7aa5e6c6945178000ccffce51680218f0dabbbd1b006068a2878e32bc69966b24b790e77de6f3529496faea563a573d5864cdc1e414d212495
+  metadata.gz: 4ee4ff0aae66122c362b6b9ec918e098296b2814a33ef35dd4c6201b53863b37bac6ddf0c49dfd8f397a2f3b92866590730b8248587312fb957348082b8be20e
+  data.tar.gz: 58e915a5993a2f93e359d30fbfc6ce300b8dd9dd1c7b198b8bc45f46e00f5e42f5a5fe59b73a4c1870382f4d85f51093ce22d88cdfc49871ce3948eaa90fd0fd

data/lib/ektoplayer/application.rb

@@ -10,7 +10,7 @@ require 'date'
 
 module Ektoplayer
    class Application
-      VERSION = '0.1.19'.freeze
+      VERSION = '0.1.20'.freeze
       GITHUB_URL = 'https://github.com/braph/ektoplayer'.freeze
       EKTOPLAZM_URL = 'http://www.ektoplazm.com'.freeze
 
@@ -61,6 +61,7 @@ module Ektoplayer
 
       def run
          puts "\033]0;ektoplayer\007"
+         Process.setproctitle('ektoplayer')
          Thread.report_on_exception=(true) if Thread.respond_to? :report_on_exception
 
          # make each configuration object globally accessible as a singleton
@@ -151,6 +152,30 @@ module Ektoplayer
                   operations.send(:'playlist.play_next') if reason == :track_completed
                end
                
+               # ... bindings ...
+               Bindings.bind_view(:global, main_w, view_ops, operations)
+               %w(splash playlist browser info help).each do |w|
+                  Bindings.bind_view(w, main_w.send(w), view_ops, operations)
+               end
+
+               player.stop
+
+               # Preload playlist
+               if (n = Config[:playlist_load_newest]) > 0
+                  r = client.database.select(
+                     order_by: 'date DESC,album,number',
+                     limit: n
+                  )
+                  playlist.add(*r)
+               end
+
+               # If database is empty, start an initial update
+               if browser.tracks(0).size < 1
+                  operations.send(:update)
+               elsif (c = Config[:small_update_pages]) > 0
+                  operations.send(:update, pages: c)
+               end
+
                if Config[:prefetch]
                   Thread.new do
                      current_download_track = nil
@@ -170,29 +195,6 @@ module Ektoplayer
                   end
                end
 
-               # ... bindings ...
-               Bindings.bind_view(:global, main_w, view_ops, operations)
-               %w(splash playlist browser info help).each do |w|
-                  Bindings.bind_view(w, main_w.send(w), view_ops, operations)
-               end
-
-               player.stop
-
-               # If database is empty, start an initial update
-               if browser.tracks(0).size < 1
-                  operations.send(:update)
-               elsif (c = Config[:small_update_pages]) > 0
-                  operations.send(:update, pages: c)
-               end
-
-               if (n = Config[:playlist_load_newest]) > 0
-                  r = client.database.select(
-                     order_by: 'date DESC,album,number',
-                     limit: n
-                  )
-                  playlist.add(*r)
-               end
-
                rescue
                   Application.log(self, $!)
                end

data/lib/ektoplayer/browsepage.rb

@@ -127,10 +127,6 @@ module Ektoplayer
 
             @albums << album
          end
-
-         Application.log(self, "#{src} #{@albums.size} albums found")
-      rescue
-         Application.log(self, src, $!)
       end
    end
 end

data/lib/ektoplayer/compat.rb

@@ -1,4 +1,4 @@
-unless Array.respond_to? :sum
+unless Array.public_method_defined? :sum
    class Array
       def sum 
          reduce(:+)
@@ -6,7 +6,7 @@ unless Array.respond_to? :sum
    end
 end
 
-unless Integer.respond_to? :clamp
+unless Integer.public_method_defined? :clamp
    class Integer
       def clamp(min, max)
          return min if self < min

data/lib/ektoplayer/config.rb

@@ -52,12 +52,12 @@ module Ektoplayer
       CONFIG_DIR  = File.join(Dir.home, '.config', 'ektoplayer').freeze
       CONFIG_FILE = File.join(CONFIG_DIR, 'ektoplayer.rc').freeze
 
-      DEFAULT_PLAYLIST_FORMAT = %{
-         <number size="3" fg="magenta" />
-         <artist rel="25" fg="blue"    />
-         <album  rel="30" fg="red"     />
-         <title  rel="33" fg="yellow"  />
-         <styles rel="20" fg="cyan"    />
+      DEFAULT_PLAYLIST_FORMAT = %{\
+         <number size="3" fg="magenta" />\
+         <artist rel="25" fg="blue"    />\
+         <album  rel="30" fg="red"     />\
+         <title  rel="33" fg="yellow"  />\
+         <styles rel="20" fg="cyan"    />\
          <bpm    size="3" fg="green" justify="right" />}.squeeze(' ').freeze
 
       DEFAULT_PLAYINGINFO_FORMAT_TOP =
@@ -66,12 +66,12 @@ module Ektoplayer
       DEFAULT_PLAYINGINFO_FORMAT_BOTTOM = 
          '<artist bold="on" fg="blue" /><text> - </text><album bold="on" fg="red" /><text> (</text><year fg="cyan" /><text>)</text>'.freeze
 
-      DEFAULT_PLAYLIST_FORMAT_256 = %{
-         <number size="3" fg="97"  />
-         <artist rel="25" fg="24"  />
-         <album  rel="30" fg="160" />
-         <title  rel="33" fg="178" />
-         <styles rel="20" fg="37"  />
+      DEFAULT_PLAYLIST_FORMAT_256 = %{\
+         <number size="3" fg="97"  />\
+         <artist rel="25" fg="24"  />\
+         <album  rel="30" fg="160" />\
+         <title  rel="33" fg="178" />\
+         <styles rel="20" fg="37"  />\
          <bpm    size="3" fg="28" justify="right" />}.squeeze(' ').freeze
 
       DEFAULT_PLAYINGINFO_FORMAT_TOP_256 =
@@ -156,7 +156,7 @@ module Ektoplayer
             }
 
          reg :threads,
-            'Number of donwload threads during database update',
+            'Number of download threads during database update',
             20, lambda { |v| fail if Integer(v) < 1; Integer(v) }
 
          # - Playlist

data/lib/ektoplayer/icurses/test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 unless ARGV[0]
-   %w(curses ncurses ncursesw ffi_curses).each do |i|
+   %w(curses ncurses ncursesw ffi-curses).each do |i|
       puts i
       fail i unless system($0, i)
    end

data/lib/ektoplayer/theme.rb

@@ -101,12 +101,6 @@ module Ektoplayer
             defs ||= @theme[8][name]   if @current >= 8
             defs ||= @theme[0][name]
 
-            #unless defs
-            #   defs ||= @theme[256][:default] if @current == 256
-            #   defs ||= @theme[8][:default]   if @current >= 8
-            #   defs ||= @theme[0][:default]
-            #end
-
             UI::Colors.set(name, *defs)
          end
       end

data/lib/ektoplayer/ui/widgets/listwidget.rb

@@ -58,27 +58,39 @@ module UI
          false
       end
 
-      def next(*a)  @direction == :up ? search_up(*a): search_down(*a)  end
+      def next(*a)  @direction == :up ? search_up(*a) : search_down(*a) end
       def prev(*a)  @direction == :up ? search_down(*a) : search_up(*a) end
 
       def search_up(current_pos, source)
          start_pos = (current_pos - 1).clamp(0, source.size)
 
+         # search up from current pos to 0
          start_pos.downto(0).each do |i|
             return i if comp(source[i])
          end
 
-         source.size
+         # restart search from bottom to start_pos
+         (source.size - 1).downto(start_pos).each do |i|
+            return i if comp(source[i])
+         end
+
+         nil # not found
       end
 
       def search_down(current_pos, source)
          start_pos = (current_pos + 1).clamp(0, source.size)
 
+         # search down from current pos
          start_pos.upto(source.size).each do |i|
             return i if comp(source[i])
          end
 
-         0
+         # restart search from top to start_pos
+         0.upto(start_pos).each do |i|
+            return i if comp(source[i])
+         end
+
+         nil # not found
       end
    end
 
@@ -95,10 +107,23 @@ module UI
          @selection = ListSelector.new
       end
 
-      def search_next;  self.selected=(@search.next(@selected, @list))  end
-      def search_prev;  self.selected=(@search.prev(@selected, @list))  end
-      def search_up;    self.search_start(:up)                          end
-      def search_down;  self.search_start(:down)                        end
+      def search_next
+         if pos = @search.next(@selected, @list)
+            self.selected=(pos)
+            self.center
+         end
+      end
+
+      def search_prev
+         if pos = @search.prev(@selected, @list)
+            self.selected=(pos)
+            self.center
+         end
+      end
+
+      def search_up;    self.search_start(:up)      end
+      def search_down;  self.search_start(:down)    end
+
       def search_start(direction)
          UI::Input.readline(@pos, @size.update(height: 1), prompt: '> ', add_hist: true) do |result|
             if result
@@ -132,14 +157,13 @@ module UI
 
       def render(index, **opts)
          return unless @item_renderer
-         return Ektoplayer::Application.log(self, 'render todo') unless @list[index]
+         return Ektoplayer::Application.log(self, index, caller) unless @list[index]
 
-         opts[:selection] = (@selection.started? and (
-               opts[:selected] or index.between?(
+         opts[:selection] = (@selection.started? and
+               index.between?(
                   [@selection.start_pos, @selected].min,
                   [@selection.start_pos, @selected].max
                )
-            )
          )
 
          @item_renderer.render(@win, @list[index], index, **opts)
@@ -152,97 +176,135 @@ module UI
 
       def top;         self.selected=(0)                          end
       def bottom;      self.selected=(index_last)                 end
-      def page_up;     self.scroll_up(size.height)                end
-      def page_down;   self.scroll_down(size.height)              end
-      def up(n=1)      self.selected=(selected - n)               end
-      def down(n=1)    self.selected=(selected + n)               end
+      def page_up;     self.scroll_list_up(@size.height)          end
+      def page_down;   self.scroll_list_down(@size.height)        end
+      def up(n=1)      self.scroll_cursor_up(1)                   end
+      def down(n=1)    self.scroll_cursor_down(1)                 end
       def center;      self.force_cursorpos(@size.height / 2)     end
 
       def list=(list)
          with_lock do
             @list = list
-
             @cursor = @selected = 0
             self.selected=(0)
             self.force_cursorpos(0)
-
             want_redraw
          end
       end
 
-      def selected=(new_index)
-         fail ArgumentError unless new_index
-         old_index_bottom = index_bottom
-         old_index_top = index_top
-         old_selected, @selected = @selected, new_index.clamp(0, index_last)
-         return if old_selected == @selected or @list.empty?
+      def scroll_cursor_down(n)
+         fail ArgumentError unless n
+         fail ArgumentError if n.negative?
+         n = n.clamp(0, items_after_cursor)
+         return if n == 0
+         new_cursor, new_selected = @cursor + n, @selected + n
 
          self.lock
 
-         old_cursor, new_cursor = @cursor, @cursor + (@selected - old_selected)
+         # it's faster to redraw the whole screen
+         if n >= @size.height
+            new_cursor = cursor_max
+            want_redraw
+         else
+            # new cursor resides in current screen
+            if new_cursor <= cursor_max
+               if @selection.started?
+                  want_redraw
+               else
+                  write_at(@cursor); render(@selected)
+                  write_at(new_cursor); render(new_selected, selected: true)
+                  want_refresh
+               end
+            else
+               new_cursor = cursor_max
 
-         if new_cursor.between?(0, @size.height - 1)
-            # new selected item resides in current screen,
-            # just want_redraw the old line and the newly selected one
-            @cursor = new_cursor
+               if @selection.started?
+                  want_redraw
+               else
+                  write_at(@cursor); render(@selected)
 
-            # redraw whole screen in selection mode!
-            return want_redraw if @selection.started?
+                  (index_bottom + 1).upto(new_selected - 1).each do |index|
+                     @win.append_bottom; render(index)
+                  end
 
-            write_at(old_cursor); render(old_selected)
-            write_at(new_cursor); render(@selected, selected: true)
-            #_check
-            want_refresh
-         elsif (new_cursor.between?(-(@size.height - 1), (2 * @size.height - 1)))
-            # new selected item is max a half screen size away
-            if @selected < old_selected
-               if lines_after_cursor > (old_selected - @selected)
-                  write_at(old_cursor); render(old_selected)
-               end
+                  @win.append_bottom; render(new_selected, selected: true)
 
-               (old_index_top - 1).downto(@selected + 1).each do |index|
-                  @win.insert_top; render(index)
+                  want_refresh
                end
+            end
+         end
 
-               @win.insert_top; render(@selected, selected: true)
-               @cursor = 0
-               #_check
-            else
-               if lines_before_cursor > (@selected - old_selected)
-                  write_at(old_cursor); render(old_selected)
-               end
+         @cursor, @selected = new_cursor, new_selected
+      ensure
+         self.unlock
+      end
 
-               (old_index_bottom + 1).upto(@selected - 1).each do |index|
-                  @win.append_bottom; render(index)
-               end
+      def scroll_cursor_up(n)
+         fail ArgumentError unless n
+         fail ArgumentError if n.negative?
+         n = n.clamp(0, items_before_cursor)
+         return if n == 0
+         new_cursor, new_selected = @cursor - n, @selected - n
 
-               @win.append_bottom; render(@selected, selected: true)
-               @cursor = cursor_max
-               #_check
-            end
+         self.lock
 
-            want_refresh
-         else
-            #@selected = new_index
-            @cursor = new_index.clamp(0, cursor_max) # todo new_index<>new_cursor? ne muess scho pasn
-            #_check
+         if n >= @size.height
+            new_cursor = 0
             want_redraw
+         else
+            # new cursor resides in current screen
+            if new_cursor >= 0
+               if @selection.started?
+                  want_redraw
+               else
+                  write_at(@cursor); render(@selected)
+                  write_at(new_cursor); render(new_selected, selected: true)
+                  want_refresh
+               end
+            else
+               new_cursor = 0
+
+               if @selection.started?
+                  want_redraw
+               else
+                  write_at(@cursor); render(@selected)
+
+                  (index_top - 1).downto(new_selected + 1).each do |index|
+                     @win.insert_top; render(index)
+                  end
+
+                  @win.insert_top; render(new_selected, selected: true)
+
+                  want_refresh
+               end
+            end
          end
 
+         @cursor, @selected = new_cursor, new_selected
       ensure
          self.unlock
       end
 
+      def selected=(new_index)
+         fail ArgumentError unless new_index
+         fail ArgumentError.new('negative index') if new_index.negative?
+         new_index = new_index.clamp(0, index_last)
+
+         with_lock do
+            @selected = new_index
+            self.force_cursorpos(@cursor)
+            want_redraw
+         end
+      end
+
       # select an item by its current cursor pos
       def select_from_cursorpos(new_cursor)
          fail unless new_cursor.between?(0, cursor_max)
-         # FIXME: clamp with @list.size ????
          return if (new_cursor == @cursor) or @list.empty?
 
          with_lock do
             old_cursor, @cursor = @cursor, new_cursor
             old_selected, @selected = @selected, (@selected - (old_cursor - @cursor)).clamp(0, index_last)
-            #_check
 
             if @selection.started?
                want_redraw
@@ -255,19 +317,20 @@ module UI
       end
 
       def force_cursorpos(new_cursor)
-         self.lock
-         if @selected <= cursor_max
-            @cursor = @selected
-         elsif (diff = (index_last - @selected)) < cursor_max
-            @cursor = @size.height - diff - 1  #cursor_max.clamp(0, index_last - @selected)
-         else
-            @cursor = new_cursor.clamp(0, cursor_max)
+         with_lock do
+            if @selected <= cursor_max / 2
+               @cursor = @selected
+            elsif (diff = (index_last - @selected)) < cursor_max / 2
+               @cursor = @size.height - diff - 1
+            else
+               @cursor = new_cursor.clamp(cursor_max / 2, cursor_max)
+            end
+
+            want_redraw
          end
-         want_redraw
-         self.unlock
       end
 
-      def scroll_up(n=1)
+      def scroll_list_up(n=1)
          fail ArgumentError unless n
          n = n.clamp(0, items_before_cursor)
          return if n == 0 or @list.empty?
@@ -290,19 +353,17 @@ module UI
 
             write_at(@cursor); render(@selected, selected: true)
 
-            #_check
             want_refresh
          else
-            @selected -= n # TODO: move up?
+            @selected -= n
             force_cursorpos(@cursor)
-            #_check # todo: move up
             want_redraw
          end
 
          self.unlock
       end
 
-      def scroll_down(n=1)
+      def scroll_list_down(n=1)
          fail ArgumentError unless n
          n = n.clamp(0, items_after_cursor)
          return if n == 0 or @list.empty?
@@ -310,7 +371,6 @@ module UI
 
          if index_bottom == index_last
             select_from_cursorpos((@cursor + n).clamp(0, cursor_max))
-            #_check
          elsif n < @size.height
             old_index_bottom = index_bottom
             old_selected, @selected = @selected, @selected + n
@@ -325,27 +385,23 @@ module UI
 
             write_at(@cursor); render(@selected, selected: true)
 
-            #_check
             want_refresh
          else
             @selected += n
             force_cursorpos(@cursor)
-            #_check
             want_redraw
          end
 
          self.unlock
-         #_check
       end
 
       def draw
          @win.erase
          return if @list.empty?
-         @selected = @selected.clamp(0, index_last)
-         #_check
+         #@selected = @selected.clamp(0, index_last)
 
          @cursor.times do |i|
-            unless row = @list[@selected - (@cursor - i)]
+            unless @list[@selected - (@cursor - i)]
                @cursor = i
                break
             end
@@ -353,15 +409,12 @@ module UI
             write_at(i); render(@selected - (@cursor - i))
          end
 
-         #_check
          write_at(@cursor); render(@selected, selected: true)
 
          (@cursor + 1).upto(@size.height - 1).each_with_index do |c, i|
-            break unless row = @list[@selected + i + 1]
+            break unless @list[@selected + i + 1]
             write_at(c); render(@selected + i + 1)
          end
-
-         #_check
       end
 
       def on_mouse_click(mevent, mevent_transformed)
@@ -387,16 +440,8 @@ module UI
       def items_before_cursor;  @selected;                   end
       def items_after_cursor;   @list.size - @selected - 1   end
       def cursor_min;    0                                   end
-      def cursor_max;    [@size.height, @list.size].min - 1  end
-
-      private def _check # debug method
-         return
-         fail "@selected = nil"           unless @selected
-         fail "@selected = #{@selected}"  unless @selected >= 0
-         fail "@selected > @list.size"    if @selected >= @list.size
-         fail "@cursor = nil"             unless @cursor
-         fail "@cursor = #{@cursor}"      unless @cursor >= 0
-         fail "@cursor > max"             if @cursor > @win.maxy
+      def cursor_max
+         @list.empty? ? 0 : [@list.size, @size.height].min - 1
       end
    end
 end

data/lib/ektoplayer/updater.rb

@@ -20,8 +20,18 @@ module Ektoplayer
 
       def update(start_url: FREE_MUSIC_URL, pages: 0, parallel: 10)
          queue = parallel > 0 ? SizedQueue.new(parallel) : Queue.new 
-         insert_browserpage(bp = BrowsePage.new(start_url))
          results = Queue.new
+         bp = BrowsePage.new(start_url)
+         results << bp
+
+         insert_thread = Thread.new do
+            loop do
+               result = results.pop
+               @db.transaction
+               insert_browserpage(result)
+               @db.commit
+            end
+         end
 
          if pages > 0
             bp.page_urls[(bp.current_page_index + 1)..(bp.current_page_index + pages + 1)]
@@ -30,24 +40,24 @@ module Ektoplayer
          end.
          each do |url|
             queue << Thread.new do
-               results << BrowsePage.new(url)
+
+               3.times do |try|
+                  begin
+                     bp = BrowsePage.new(url)
+                     Application.log(self, url, bp.albums.size, "albums found")
+                     results << bp
+                     break
+                  rescue
+                     Application.log(self, url, $!, "(retry ##{try})")
+                  end
+               end
+
                queue.pop # unregister our thread
             end.priority
-
-            if results.size > 40
-               @db.transaction
-               40.times { insert_browserpage(results.pop(true)) }
-               @db.commit
-            end
          end
 
-         sleep 1 while not queue.empty?
-
-         @db.transaction
-         while (result = queue.pop(true) rescue nil)
-            insert_browserpage(result)
-         end
-         @db.commit
+         sleep 1 until queue.empty?
+         insert_thread.kill
       rescue
          Application.log(self, $!)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ektoplayer
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors:
 - Benjamin Abendroth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2017-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3