ektoplayer 0.1.12 → 0.1.16

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

@@ -20,6 +20,7 @@ module UI
 
    class ListSelector
       attr_reader :start_pos
+
       def start(pos)
          @start_pos = pos
       end
@@ -35,51 +36,49 @@ module UI
    end
 
    class ListSearch
-      attr_accessor :direction, :source
+      attr_accessor :direction
+
+      def initialize(search: '', direction: :down)
+         @search, @direction = search, direction
+      end
 
-      def initialize(search: '', source: [], direction: :down)
-         @source, @result, @current = source, [], 0
-         @direction = direction
-         self.search=(search)
+      def search=(search)
+         @search = Regexp.new(search.downcase) rescue search.downcase
       end
 
-      def comp(item, search)
+      private def comp(item)
          if item.is_a?String or item.is_a?Symbol
-            return item.downcase =~ Regexp.new(search.downcase)
+            return item.downcase =~ @search
          elsif item.is_a?Hash
             %w(title artist album).each do |key|
-               return true if self.comp(item[key], search)
+               return true if comp(item[key])
             end
          end
 
          false
       end
 
-      def search=(search)
-         fail unless search
-         @search = search
-         @current = 0
-         @result = @source.size.times.select {|i| self.comp(@source[i], search) }
-      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 current; @current or 0 end #or 0                         end
-      def next(p)  @direction == :up ? search_up(p): search_down(p)  end
-      def prev(p)  @direction == :up ? search_down(p) : search_up(p) end
+      def search_up(current_pos, source)
+         start_pos = (current_pos - 1).clamp(0, source.size)
 
-      def search_up(p)
-         @current = (
-            @result.reverse.select { |v| v < p }[0] or @result[-1]
-         )
+         start_pos.downto(0).each do |i|
+            return i if comp(source[i])
+         end
 
-         self
+         source.size
       end
 
-      def search_down(p)
-         @current = (
-            @result.select { |v| v > p }[0] or @result[0]
-         )
+      def search_down(current_pos, source)
+         start_pos = (current_pos + 1).clamp(0, source.size)
+
+         start_pos.upto(source.size).each do |i|
+            return i if comp(source[i])
+         end
 
-         self
+         0
       end
    end
 
@@ -96,14 +95,13 @@ module UI
          @selection = ListSelector.new
       end
 
-      def search_next;  self.selected=(@search.next(@selected).current)  end
-      def search_prev;  self.selected=(@search.prev(@selected).current)  end
-      def search_up;    self.search_start(:up)                end
-      def search_down;  self.search_start(:down)              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_start(direction)
          UI::Input.readline(@pos, @size.update(height: 1), prompt: '> ', add_hist: true) do |result|
             if result
-               @search.source=(@list)
                @search.direction=(direction)
                @search.search=(result)
                search_next
@@ -163,8 +161,11 @@ module UI
       def list=(list)
          with_lock do
             @list = list
+
             @cursor = @selected = 0
             self.selected=(0)
+            self.force_cursorpos(0)
+
             want_redraw
          end
       end
@@ -178,7 +179,7 @@ module UI
 
          self.lock
 
-         old_cursor, new_cursor = @cursor, @cursor + @selected - old_selected
+         old_cursor, new_cursor = @cursor, @cursor + (@selected - old_selected)
 
          if new_cursor.between?(0, @size.height - 1)
             # new selected item resides in current screen,
@@ -189,7 +190,7 @@ module UI
             return want_redraw if @selection.started?
 
             write_at(old_cursor); render(old_selected)
-            write_at(new_cursor); render(new_index, selected: true)
+            write_at(new_cursor); render(@selected, selected: true)
             _check
             want_refresh
          elsif (new_cursor.between?(-(@size.height - 1), (2 * @size.height - 1)))

data/lib/ektoplayer/ui/widgets.rb

@@ -145,6 +145,9 @@ module UI
          super(**opts)
          @win = ICurses.newwin(@size.height, @size.width, @pos.y, @pos.x)
          @win.keypad(true)
+         @win.idlok(true)
+         @win.leaveok(true)
+         @win.bkgdset(UI::Colors.init_pair_cached(:default, :default))
       end
 
       def layout
@@ -154,6 +157,10 @@ module UI
       end
 
       def refresh
+         @win.refresh
+      end
+
+      def noutrefresh
          @win.noutrefresh
       end
    end
@@ -164,6 +171,10 @@ module UI
       def initialize(**opts)
          super(**opts)
          @win = ICurses.newpad(@size.height, @size.width)
+         @win.keypad(true)
+         @win.idlok(true)
+         @win.leaveok(true)
+         @win.bkgdset(UI::Colors.init_pair_cached(:default, :default))
          @pad_minrow = @pad_mincol = 0
       end
 
@@ -230,6 +241,14 @@ module UI
       end
 
       def refresh
+         @win.prefresh(
+            @pad_minrow, @pad_mincol,
+            @pos.y, @pos.x,
+            @pos.y + @size.height - 1, @pos.x + @size.width - 1
+         )
+      end
+
+      def noutrefresh
          @win.pnoutrefresh(
             @pad_minrow, @pad_mincol,
             @pos.y, @pos.x,

data/lib/ektoplayer/ui.rb

@@ -27,7 +27,7 @@ module UI
          @@widget = nil
 
          %w(initscr cbreak noecho start_color use_default_colors).
-            each {|_|ICurses.send(_)}
+            each(&ICurses.method(:send))
          ICurses.mousemask(ICurses::ALL_MOUSE_EVENTS | ICurses::REPORT_MOUSE_POSITION)
          ICurses.stdscr.keypad(true)
          UI::Colors.start
@@ -50,11 +50,6 @@ module UI
          widget
       end
 
-      #def self.getch(timeout=-1)
-      #   ICurses.stdscr.timeout(timeout)
-      #   UI::Input::KEYMAP_WORKAROUND[ICurses.stdscr.getch]
-      #end
-      
       def self.update_screen(force_redraw=false, force_resize=false)
          @@updating ||= Mutex.new
          @@want_resize ||= false
@@ -97,12 +92,9 @@ module UI
       KEYMAP_WORKAROUND.default_proc = proc { |h,k| k }
       KEYMAP_WORKAROUND.freeze
 
-      #def self.getch(timeout=-1)
-      #   KEYMAP_WORKAROUND[@@widget.getch(timeout)]
-      #end
-
       def self.start_loop
          @@readline_obj ||= ReadlineWindow.new
+         inactive = 0
 
          loop do
             unless @@readline_obj.active?
@@ -112,14 +104,20 @@ module UI
                begin
                   UI::Canvas.widget.win.keypad(true)
 
-                  if (c = UI::Canvas.widget.win.getch1(600))
+                  if (c = (UI::Canvas.widget.win.getch1(500).ord rescue -1)) > -1
+                     inactive = 0
+
                      if c == ICurses::KEY_MOUSE
                         if c = ICurses.getmouse
                            UI::Canvas.widget.mouse_click(c)
                         end
                      else
-                        c = KEYMAP_WORKAROUND[c.ord]
-                        UI::Canvas.widget.key_press(c) if c >= 0
+                        UI::Canvas.widget.key_press(KEYMAP_WORKAROUND[c])
+                     end
+                  else
+                     if (inactive += 1) > 40
+                        s = STDIN.readpartial(10)
+                        ICurses.ungetch(s[0].ord) if s.size == 1
                      end
                   end
 
@@ -133,7 +131,7 @@ module UI
                   win = UI::Canvas.widget.win
                   win.keypad(false)
                   @@readline_obj.redraw
-                  next unless (c = (win.getch1(100).ord rescue -1)) > 0
+                  next unless (c = (win.getch1(100).ord rescue -1)) > -1
 
                   if c == 10 or c == 4
                      @@readline_obj.feed(?\n.ord)
@@ -142,16 +140,14 @@ module UI
 
                      if c == 27 # pass 3-character escape sequence
                         win.timeout(5)
-                        if (c = (win.getch.ord rescue -1)) > 0
+                        if (c = (win.getch.ord rescue -1)) > -1
                            @@readline_obj.feed(c)
-                           if (c = (win.getch.ord rescue -1)) > 0
+                           if (c = (win.getch.ord rescue -1)) > -1
                               @@readline_obj.feed(c)
                            end
                         end
                      end
                   end
-               #rescue
-                  # getch() returned something weird that could not be chr()d
                end while @@readline_obj.active?
             end
          end
@@ -168,24 +164,27 @@ module UI
       def initialize
          Readline.input, @readline_in_write = IO.pipe
          Readline.output = File.open(File::NULL, ?w)
+         @window = ICurses.newwin(0,0,0,0)
          @thread = nil
       end
 
       def active?; @thread; end
 
       def redraw
-         return unless @window
+         @window.resize(@size.height, @size.width)
+         @window.mvwin(@pos.y, @pos.x)
          @window.erase
          buffer = @prompt + Readline.line_buffer.to_s
          @window.addstr(buffer[(buffer.size - @size.width).clamp(0, buffer.size)..-1])
          @window.move(0, Readline.point + @prompt.size)
          @window.refresh
+      rescue
+         nil
       end
 
       def readline(pos, size, prompt: '', add_hist: false, &block)
          @thread ||= Thread.new do
-            @size, @prompt = size, prompt
-            @window = ICurses.newwin(size.height, size.width, pos.y, pos.x)
+            @size, @pos, @prompt = size, pos, prompt
 
             begin
                Readline.set_screen_size(size.height, size.width)
@@ -194,7 +193,7 @@ module UI
                block.(Readline.readline(prompt, add_hist))
             ensure
                @window.clear
-               @window = @thread = nil
+               @thread = nil
                UI::Canvas.update_screen(true)
             end
          end
@@ -308,7 +307,7 @@ module ICurses
       def size;    UI::Size.new(height: maxy, width: maxx)   end
 
       def cursor=(new)
-         move(new.y, new.x) # or fail "Could not set cursor: #{new} #{size}"
+         move(new.y, new.x)  #or warn "Could not set cursor: #{new} #{size}"
       end
 
       def pos=(new)

data/lib/ektoplayer/updater.rb

@@ -9,9 +9,8 @@ module Ektoplayer
    FREE_MUSIC_URL = "#{MAIN_URL}/section/free-music".freeze
 
    class DatabaseUpdater
-      ALBUM_STR_TAGS = Set.new(%w(url title date category cover_url
-            description download_count rating votes
-            released_by released_by_url posted_by posted_by_url).map(&:to_sym)).freeze
+      ALBUM_STR_TAGS = Set.new(%w(url title date cover_url
+            description download_count rating votes).map(&:to_sym)).freeze
 
       TRACK_STR_TAGS = Set.new(%w(url number title remix artist bpm).map(&:to_sym)).freeze
 
@@ -33,7 +32,7 @@ module Ektoplayer
             queue << Thread.new do
                results << BrowsePage.new(url)
                queue.pop # unregister our thread
-            end.priority=(-10)
+            end.priority
 
             if results.size > 40
                @db.transaction

data/lib/ektoplayer/views/browser.rb

@@ -6,8 +6,13 @@ module Ektoplayer
       class Browser < UI::ListWidget
          def initialize(**opts)
             super(**opts)
-            self.item_renderer=(TrackRenderer.new(
-               width: @size.width, format: Config[:'browser.format']))
+            if ICurses.colors == 256
+               f = Config[:'playlist.format_256']
+            else
+               f = Config[:'playlist.format']
+            end
+
+            self.item_renderer=(TrackRenderer.new(width: @size.width, format: f))
          end
 
          def attach(browser)

data/lib/ektoplayer/views/help.rb

@@ -5,7 +5,10 @@ require_relative '../theme'
 module Ektoplayer
    module Views
       class Help < UI::Pad
-         def draw
+         def draw;
+         end
+
+         def layout
             self.pad_size=(UI::Size.new(
                height: (Bindings.bindings.values.map(&:size).sum +
                         Bindings.bindings.size * 2),
@@ -32,7 +35,7 @@ module Ektoplayer
                   @win.mvaddstr(@win.cury, 18, name.to_s)
 
                   @win.attrset(Theme[:'help.command_desc'])
-                  @win.mvaddstr(@win.cury, 43, Bindings.commands[name.to_sym])
+                  @win.mvaddstr(@win.cury, 45, Bindings.commands[name.to_sym])
 
                   @win.next_line
                end

data/lib/ektoplayer/views/info.rb

@@ -20,7 +20,7 @@ module Ektoplayer
                player, playlist, trackloader, database
 
             Thread.new do
-               loop { sleep 1; with_lock { want_redraw } }
+               loop { sleep 1; draw if visible? }
             end.priority=(-10)
          end
 
@@ -59,20 +59,18 @@ module Ektoplayer
          def draw_download(file, percent, error)
             @win.attrset(Theme[:'info.download.file'])
             @win.mvaddstr(@win.cury + 1, START_TAG, file)
+            @win.addch(32) # ' '
 
             @win.attrset(Theme[:'info.download.percent'])
-            @win.addstr(" #{percent}")
+            @win.addstr(percent.to_s)
 
             if error
+               @win.addch(32) # ' '
                @win.attrset(Theme[:'info.download.error'])
-               @win.addstr(" #{error}")
+               @win.addstr(error.to_s)
             end
          end
 
-         def get_cover_url(album)
-            "#{Application::EKTOPLAZM_COVER_BASE_URL}/#{album}"
-         end
-
          def draw
             return unless @player
 
@@ -87,7 +85,7 @@ module Ektoplayer
 
             if @track = (@playlist[@playlist.current_playing] rescue nil)
                draw_heading('Current track')
-               draw_tag('Number', "%0.2d" % @track['number'])
+               draw_tag('Number', '%0.2d' % @track['number'])
                draw_tag('Title',  @track['title'])
                draw_tag('Remix',  @track['remix']) if @track['remix']
                draw_tag('Artist', @track['artist'])
@@ -97,22 +95,18 @@ module Ektoplayer
                @win.next_line
 
                draw_heading('Current album')
-               draw_tag('Album'); draw_url(@track['album_url'], @track['album'])
+
+               draw_tag('Album')
+               draw_url(Application.album_url(@track['album_url']), @track['album'])
                draw_tag('Artist',       @track['album__artist']) if @track['album_artist']
                draw_tag('Date',         @track['date'])
 
-               if url = @track['released_by_url']
-                  draw_tag('Released by'); draw_url(url, @track['released_by'])
-               end
-
-               if url = @track['posted_by_url']
-                  draw_tag('Posted by');   draw_url(url, @track['posted_by'])
-               end
-
                draw_tag('Styles',       @track['styles'].gsub(?,, ', '))
                draw_tag('Downloads',    @track['download_count'])
-               draw_tag('Rating',  "%0.2d%% (%d Votes)" % [@track['rating'], @track['votes']])
-               draw_tag('Cover'); draw_url(get_cover_url(@track['cover_url']), 'Cover')
+               draw_tag('Rating',  '%0.2d%% (%d Votes)' % [@track['rating'], @track['votes']])
+               draw_tag('Cover')
+               draw_url(Application.cover_url(@track['cover_url']), 'Cover')
+
                @win.next_line
 
                # -- description
@@ -123,14 +117,14 @@ module Ektoplayer
 
                Nokogiri::HTML("<p>#{@track['description']}</p>").css(?p).each do |p|
                   p.children.each do |element|
-                     if element[:href]
+                     if element['href']
                         if (line_length += element.text.size) > wrap_length
                            @win.move(@win.cury + 1, START_TAG)
                            line_length = START_TAG
                         end
 
-                        draw_url(element[:href], element.text.strip)
                         @win.addch(32) # ' '
+                        draw_url(element['href'], element.text.strip)
                      else
                         element.text.split(' ').each do |text|
                            if (line_length += text.size) > wrap_length
@@ -138,10 +132,10 @@ module Ektoplayer
                               line_length = START_TAG
                            end
 
+                           @win.addch(32) # ' '
                            @win.attrset(Theme[:'info.description'])
                            @win.mv_left(1) if text =~ /^[\.,:;]$/ 
                            @win << text
-                           @win.addch(32) # ' '
                         end
                      end
                   end
@@ -155,9 +149,8 @@ module Ektoplayer
                draw_heading('Downloads')
                @trackloader.downloads.each do |dl|
                   name = File.basename(dl.filename)
-                  percent = Float(dl.progress) / dl.total * 100
-                  percent = '%0.2f' % percent
-                  draw_download(name, ?( + percent + '%)', dl.error)
+                  percent = '%0.2f' % dl.progress
+                  draw_download(name, "(#{percent}%)", dl.error)
                end
                @win.next_line
             end
@@ -166,12 +159,14 @@ module Ektoplayer
             draw_info('Version', Application::VERSION)
             draw_info('Tracks in database', @database.track_count)
             draw_info('Albums in database', @database.album_count)
-            draw_info('Cache dir size', "%dMB" % (Dir.size(Config[:cache_dir]) / (1024 ** 2)))
-            draw_info('Archive dir size', "%dMB" % (Dir.size(Config[:archive_dir]) / (1024 ** 2)))
+            draw_info('Tracks in playlist', @playlist.size)
+            draw_info('Cache dir size', '%dMB' % (Dir.size(Config[:cache_dir]) / (1024 ** 2) rescue 0))
+            draw_info('Archive dir size', '%dMB' % (Dir.size(Config[:archive_dir]) / (1024 ** 2) rescue 0))
             draw_info('Ektoplazm URL'); draw_url(Application::EKTOPLAZM_URL)
             draw_info('Github URL'); draw_url(Application::GITHUB_URL)
 
             self.pad_size=(@size.update(height: [@win.cursor.y + 2, @size.height].max))
+            noutrefresh
          end
       end
    end

data/lib/ektoplayer/views/playinginfo.rb

@@ -28,23 +28,9 @@ module Ektoplayer
             with_lock { @track = t; want_redraw }
          end
 
-         def length=(l)
-            return if @length == l.to_i
-            @length = l.to_i
-            draw_position_and_length
-         end
-
-         def position=(p)
-            return if @position == p.to_i
-            @position = p.to_i
-            draw_position_and_length
-         end
-
          def draw_position_and_length
-            return unless visible?
             @win.attrset(Theme[:'playinginfo.position'])
             @win.mvaddstr(0, 0, "[#{Common::to_time(@position)}/#{Common::to_time(@length)}]")
-            @win.noutrefresh
          end
 
          def attach(playlist, player)
@@ -53,15 +39,22 @@ module Ektoplayer
             player.events.on(:play)   { self.playing! }
 
             player.events.on(:position_change) do
-               self.position=(player.position)
-               self.length=(player.length)
+               old_pos, old_length = @position, @length
+               @position = player.position.to_i
+               @length = player.length.to_i
+
+               if old_pos != @position or old_length != @length
+                  if visible?
+                     draw_position_and_length 
+                     refresh
+                  end
+               end
             end
 
             playlist.events.on(:current_changed) {
                self.track=(playlist[playlist.current_playing])
             }
 
-            # TODO: move mouse?
             self.mouse.on(ICurses::BUTTON1_CLICKED) do |mevent|
                player.toggle
             end
@@ -88,9 +81,17 @@ module Ektoplayer
          def draw
             @win.erase
             draw_position_and_length
+
+            if ICurses.colors == 256
+               top_format = Config[:'playinginfo.format_top_256']
+               bottom_format = Config[:'playinginfo.format_bottom_256']
+            else
+               top_format = Config[:'playinginfo.format_top']
+               bottom_format = Config[:'playinginfo.format_bottom']
+            end
             
             if @track
-               fill(Config[:'playinginfo.format1']).each_with_index do |fmt,i|
+               fill(top_format).each_with_index do |fmt,i|
                   @win.center(fmt[:sum]) if i == 0
                   @win.attrset(UI::Colors.set(nil, *fmt[:curses_attrs]))
                   @win << fmt[:filled]
@@ -101,7 +102,7 @@ module Ektoplayer
 
                @win.next_line
 
-               fill(Config[:'playinginfo.format2']).each_with_index do |fmt,i|
+               fill(bottom_format).each_with_index do |fmt,i|
                   @win.center(fmt[:sum]) if i == 0
                   @win.attrset(UI::Colors.set(nil, *fmt[:curses_attrs]))
                   @win << fmt[:filled]

data/lib/ektoplayer/views/playlist.rb

@@ -8,9 +8,14 @@ module Ektoplayer
       class Playlist < UI::ListWidget
          def initialize(**opts)
             super(**opts)
-            self.item_renderer=(TrackRenderer.new(
-               width: @size.width, format: Config[:'playlist.format']
-            ))
+
+            if ICurses.colors == 256
+               f = Config[:'playlist.format_256']
+            else
+               f = Config[:'playlist.format']
+            end
+
+            self.item_renderer=(TrackRenderer.new(width: @size.width, format: f))
          end
          
          def attach(playlist)