ektoplayer 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1567475105c5b1d0e3a099a4324ca19cdd67efe8
-  data.tar.gz: e48caa107e5f934866a720023a5cb86fbb9153a9
+  metadata.gz: 5e5ff8d4fa934d30ecd7374ab072cc6a4fe76fdc
+  data.tar.gz: 598356fac5e4260e419a967afb96d960c29f05d9
 SHA512:
-  metadata.gz: f5b706485a36e6398a981314c93f244ad4c85e35afbe55cce4e2d211752059abd3cfe743316d5edc85011f01002ecf35b5895e0aab54551bff565e407b1e7db0
-  data.tar.gz: 12636fee134acc3f234ddbb6f7637e6a2ca0186998d76929820eb1f5a36c347ed5ec6c86aab8f128be13cf7240b9d01ad8e68c68b3dd15ac8347c783cb765ead
+  metadata.gz: 8deb97e80245b3dcbb3fcdf9847b213781ed7148b10a55ea1e89cbe931bfbc0c2087adc03d21fc42f3d3797bd15efa0c6cc379a02f82a7bdaaa55a7f4ed66f5d
+  data.tar.gz: 96dec00f1913908bca31b7917889f298caf3480a224e006b93f55d6648e78848de26870a5539ac9e84bd55b711b287d88fd8f16171478e743de40baf84a4d371

data/lib/ektoplayer/application.rb

@@ -10,7 +10,7 @@ require 'date'
 
 module Ektoplayer
    class Application
-      VERSION = '0.1.16'.freeze
+      VERSION = '0.1.17'.freeze
       GITHUB_URL = 'https://github.com/braph/ektoplayer'.freeze
       EKTOPLAZM_URL = 'http://www.ektoplazm.com'.freeze
 
@@ -186,7 +186,10 @@ module Ektoplayer
                end
 
                if (n = Config[:playlist_load_newest]) > 0
-                  r = client.database.select(order_by: 'date desc,album,number', limit: n)
+                  r = client.database.select(
+                     order_by: 'date DESC,album,number',
+                     limit: n
+                  )
                   playlist.add(*r)
                end
 

data/lib/ektoplayer/database.rb

@@ -3,6 +3,12 @@ require_relative 'events'
 
 module Ektoplayer 
    class Database
+      SELECT_DESCRIPTION = %q[
+         SELECT description
+         FROM   albums
+         WHERE  url = ?
+      ].squeeze(' ').freeze
+
       SELECT_ARCHIVES = %q[
          SELECT archive_url, archive_type
          FROM   archive_urls
@@ -141,7 +147,7 @@ module Ektoplayer
       end
 
       def select(
-         columns: ?*,
+         columns: 'number,artist,album,title,styles,date,year,rating,votes,download_count,bpm,album_url,url',
          filters: [],
          group_by: 'url',
          order_by: 'album,number',
@@ -187,6 +193,10 @@ module Ektoplayer
          execute(SELECT_ARCHIVES, [url])
       end
 
+      def get_description(album_url)
+         @db.get_first_value(SELECT_DESCRIPTION, [album_url])
+      end
+
       def track_count
          @db.get_first_value('SELECT COUNT(*) FROM tracks')
       end

data/lib/ektoplayer/icurses/ncurses.rb

@@ -39,7 +39,7 @@ module Ncurses
       end
 
       if $USING_CURSES == 'ncurses'
-         ### FIX: 'attrset' in ncurses is broken!
+         ### FIX: 'attrset' in ncurses seems broken?
          def attrset(attributes)
             Ncurses.send(:wattr_get, @w, old_a=[], old_c=[], nil)
             Ncurses.send(:wattroff, @w, old_a[0] | old_c[0])
@@ -62,6 +62,11 @@ module ICurses
    def initscr; end # do nothing
    module_function :initscr
 
+   def stdscr
+      ICurses::IWindow.new Ncurses.stdscr
+   end
+   module_function :stdscr
+
    def newwin(*a)
       ICurses::IWindow.new( Ncurses.newwin(*a) )
    end

data/lib/ektoplayer/icurses/sugar.rb

@@ -2,7 +2,8 @@ module ICurses
    class IMouseEvent
       attr_accessor :x, :y, :z, :bstate
 
-      def initialize(mouse_event=nil)
+      def initialize(mouse_event=nil, bstate: 0, x: 0, y: 0, z: 0)
+         @x, @y, @z, @bstate = x, y, z, bstate
          from_mouse_event!(mouse_event)
       end
 
@@ -12,16 +13,16 @@ module ICurses
       def from_mouse_event!(m)
          @x, @y, @z, @bstate = m.x, m.y, m.z, m.bstate 
       rescue
-         @x, @y, @z, @bstate = m[:x], m[:y], m[:z], m[:bstate]
-      rescue
-         @x= @y= @z= @bstate = 0
+         begin @x, @y, @z, @bstate = m[:x], m[:y], m[:z], m[:bstate]
+         rescue
+         end
       end
 
       def update!(x: nil, y: nil, z: nil, bstate: nil)
          @x = x if x
          @y = y if y
          @z = z if z
-         @bstate = (bstate or @bstate)
+         @bstate = bstate if bstate
       end
    end
 end
@@ -36,7 +37,6 @@ module ICurses
                method_missing(meth_up, *args)
             end
          )
-
          module_function(meth)
       elsif not respond_to? meth_up
          alias_method(meth_up, meth) rescue (

data/lib/ektoplayer/models/browser.rb

@@ -120,9 +120,7 @@ module Ektoplayer
             end
 
             def tracks(index)
-               @database.select(
-                  order_by: 'album,' + CONTENTS[index].to_s + ",album,number" 
-               )
+               @database.select(order_by: 'album,' + CONTENTS[index].to_s + ',album,number')
             end
          end
       end

data/lib/ektoplayer/models/database.rb

@@ -21,6 +21,10 @@ module Ektoplayer
 
          def track_count; @client.database.track_count  end
          def album_count; @client.database.album_count  end
+
+         def get_description(*a)
+            @client.database.get_description(*a)
+         end
        
          def updating?
             @update_thread and @update_thread.alive?

data/lib/ektoplayer/players/mpg_wrapper_player.rb

@@ -133,7 +133,7 @@ class MpgWrapperPlayer
             Thread.new do
                begin
                   @mpg123_in, @mpg123_out, mpg123_err, @mpg123_thread =
-                     Open3.popen3('mpg123', '-o', 'jack,pulse,alsa,oss', '--fuzzy', '-b', '1024', '-R')
+                     Open3.popen3('mpg123', '-o', 'alsa,jack,pulse,oss', '--fuzzy', '-R')
 
                   while (line = @mpg123_out.readline)
                      cmd, line = line.split(' ', 2)

data/lib/ektoplayer/ui/escapesequencetranslator.rb

@@ -0,0 +1,42 @@
+require_relative '../icurses'
+
+module UI
+   class EscapeSequenceTranslator
+      KEYS = {
+         ?\r     => ICurses::KEY_ENTER,
+         ?\r.ord => ICurses::KEY_ENTER
+      }
+
+      def self.reg(key, fallback, curses_key)
+         code = `tput #{key} 2>/dev/null` rescue ''
+         code = fallback if code.empty?
+         KEYS[code] = curses_key if not code.empty?
+      end
+      
+      self.reg('kcuu1', "\033[A",  ICurses::KEY_UP)
+      self.reg('kcud1', "\033[B",  ICurses::KEY_DOWN)
+      self.reg('kcuf1', "\033[C",  ICurses::KEY_RIGHT)
+      self.reg('kcub1', "\033[D",  ICurses::KEY_LEFT)
+      self.reg('khome', "\033[1~", ICurses::KEY_HOME)
+      self.reg('kich1', "\033[2~", ICurses::KEY_IC)
+      self.reg('kdch1', "\033[3~", ICurses::KEY_DC)
+      self.reg('kend',  "\033[4~", ICurses::KEY_END)
+      self.reg('kpp',   "\033[5~", ICurses::KEY_PPAGE)
+      self.reg('knp',   "\033[6~", ICurses::KEY_NPAGE)
+      (0..60).each { |i| self.reg("kf#{i}", '', ICurses.const_get("KEY_F#{i}")) }
+
+      KEYS.freeze
+
+      def self.to_curses(key)
+         if KEYS.include? key
+            KEYS[key]
+         elsif key.is_a? Integer
+            key
+         elsif ((key.is_a? String or key.is_a? Array) and key[0] == 27.chr and key[1] == ?[ and key[2] == ?M)
+            ICurses::IMouseEvent.new(bstate: ICurses::BUTTON1_CLICKED, x: key[4].ord - 33, y: key[5].ord - 33)
+         elsif key.size == 1
+            key.ord rescue nil
+         end
+      end
+   end
+end

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

@@ -191,7 +191,7 @@ module UI
 
             write_at(old_cursor); render(old_selected)
             write_at(new_cursor); render(@selected, selected: true)
-            _check
+            #_check
             want_refresh
          elsif (new_cursor.between?(-(@size.height - 1), (2 * @size.height - 1)))
             # new selected item is max a half screen size away
@@ -206,7 +206,7 @@ module UI
 
                @win.insert_top; render(@selected, selected: true)
                @cursor = 0
-               _check
+               #_check
             else
                if lines_before_cursor > (@selected - old_selected)
                   write_at(old_cursor); render(old_selected)
@@ -218,14 +218,14 @@ module UI
 
                @win.append_bottom; render(@selected, selected: true)
                @cursor = cursor_max
-               _check
+               #_check
             end
 
             want_refresh
          else
             #@selected = new_index
             @cursor = new_index.clamp(0, cursor_max) # todo new_index<>new_cursor? ne muess scho pasn
-            _check
+            #_check
             want_redraw
          end
 
@@ -242,7 +242,7 @@ module UI
          with_lock do
             old_cursor, @cursor = @cursor, new_cursor
             old_selected, @selected = @selected, (@selected - (old_cursor - @cursor)).clamp(0, index_last)
-            _check
+            #_check
 
             if @selection.started?
                want_redraw
@@ -290,12 +290,12 @@ module UI
 
             write_at(@cursor); render(@selected, selected: true)
 
-            _check
+            #_check
             want_refresh
          else
             @selected -= n # TODO: move up?
             force_cursorpos(@cursor)
-            _check # todo: move up
+            #_check # todo: move up
             want_redraw
          end
 
@@ -310,7 +310,7 @@ module UI
 
          if index_bottom == index_last
             select_from_cursorpos((@cursor + n).clamp(0, cursor_max))
-            _check
+            #_check
          elsif n < @size.height
             old_index_bottom = index_bottom
             old_selected, @selected = @selected, @selected + n
@@ -325,24 +325,24 @@ module UI
 
             write_at(@cursor); render(@selected, selected: true)
 
-            _check
+            #_check
             want_refresh
          else
             @selected += n
             force_cursorpos(@cursor)
-            _check
+            #_check
             want_redraw
          end
 
          self.unlock
-         _check
+         #_check
       end
 
       def draw
          @win.erase
          return if @list.empty?
          @selected = @selected.clamp(0, index_last)
-         _check
+         #_check
 
          @cursor.times do |i|
             unless row = @list[@selected - (@cursor - i)]
@@ -353,7 +353,7 @@ module UI
             write_at(i); render(@selected - (@cursor - i))
          end
 
-         _check
+         #_check
          write_at(@cursor); render(@selected, selected: true)
 
          (@cursor + 1).upto(@size.height - 1).each_with_index do |c, i|
@@ -361,7 +361,7 @@ module UI
             write_at(c); render(@selected + i + 1)
          end
 
-         _check
+         #_check
       end
 
       def on_mouse_click(mevent, mevent_transformed)
@@ -373,7 +373,7 @@ module UI
 
       protected
 
-      def write_at(pos)   @win.line_start(pos).clrtoeol   end
+      def write_at(pos)   @win.move(pos, 0)               end
 
       def index_first;   0                                end
       def index_last;    [@list.size, 1].max - 1          end

data/lib/ektoplayer/ui/widgets.rb

@@ -48,7 +48,7 @@ module UI
             layout;
             @want ^= WANT_LAYOUT
          end
-         return   if not visible?
+         return if not visible?
 
          if @want & WANT_REDRAW > 0
             draw
@@ -66,7 +66,7 @@ module UI
             layout;
             @want ^= WANT_LAYOUT
          end
-         return   if not visible?
+         return if not visible?
 
          if @want & WANT_REDRAW > 0 or force_redraw
             draw
@@ -120,7 +120,7 @@ module UI
       def mouse_click(mevent)
          if new_event = mouse_event_transform(mevent)
             trigger(@mouse, new_event)
-            trigger(@mouse_event, new_event)
+            trigger(@mouse_section, new_event)
          end
       end
 

data/lib/ektoplayer/ui.rb

@@ -1,35 +1,24 @@
-require_relative 'icurses'
 require 'readline'
 require 'io/console'
 
+require_relative 'icurses'
 require_relative 'ui/colors'
+require_relative 'ui/escapesequencetranslator'
 require_relative 'events'
 
 module UI
    class WidgetSizeError < Exception; end
 
    class Canvas
-      extend ICurses
-
-      def self.size
-         UI::Size.new(height: ICurses.lines, width: ICurses.cols)
-      end
-
-      def self.cursor
-         #UI::Point.new(y: ICurses.cury, x: ICurses.curx)
-      end
-
-      def self.pos
-         UI::Point.new
-      end
-
       def self.start
          @@widget = nil
+         @@want_resize = false
+         @@updating = Mutex.new
 
          %w(initscr cbreak noecho start_color use_default_colors).
             each(&ICurses.method(:send))
          ICurses.mousemask(ICurses::ALL_MOUSE_EVENTS | ICurses::REPORT_MOUSE_POSITION)
-         ICurses.stdscr.keypad(true)
+         ICurses.stdscr.getch1(1) # first getch() clears screen?
          UI::Colors.start
 
          self.enable_resize_detection
@@ -39,21 +28,19 @@ module UI
          Signal.trap('WINCH') { @@want_resize = true }
       end
 
-      def self.widget;      @@widget                   end
-      def self.widget=(w)   @@widget = w               end
-      def self.stop;        ICurses.endwin             end
-      def self.visible?;    true                       end
-      def self.inivsibile?; false                      end
+      def self.widget;      @@widget          end
+      def self.widget=(w)   @@widget = w      end
+      def self.stop;        ICurses.endwin    end
 
       def self.sub(cls, **opts)
-         @@widget ||= (widget = cls.new(parent: self, **opts))
+         opts[:size] ||= UI::Size.new(height: ICurses.lines, width: ICurses.cols)
+         opts[:pos]  ||= UI::Point.new
+         widget = cls.new(**opts)
+         @@widget ||= widget
          widget
       end
 
       def self.update_screen(force_redraw=false, force_resize=false)
-         @@updating ||= Mutex.new
-         @@want_resize ||= false
-
          if @@updating.try_lock
             begin
                if @@want_resize or force_resize
@@ -78,7 +65,7 @@ module UI
 
       def self.run
          self.start
-         return yield
+         yield
       ensure
          self.stop
       end
@@ -87,51 +74,56 @@ module UI
    class Input
       KEYMAP_WORKAROUND = {
          13  => ICurses::KEY_ENTER,
-         127 => ICurses::KEY_BACKSPACE
+         127 => ICurses::KEY_BACKSPACE,
       }
       KEYMAP_WORKAROUND.default_proc = proc { |h,k| k }
       KEYMAP_WORKAROUND.freeze
 
       def self.start_loop
          @@readline_obj ||= ReadlineWindow.new
-         inactive = 0
 
          loop do
             unless @@readline_obj.active?
+               ICurses.stdscr.keypad(true)
                ICurses.curs_set(0)
                ICurses.nonl
 
-               begin
-                  UI::Canvas.widget.win.keypad(true)
+               until @@readline_obj.active?
+                  c = EscapeSequenceTranslator.to_curses(s = STDIN.readpartial(10))
+                  #Ektoplayer::Application.log(self, s)
 
-                  if (c = (UI::Canvas.widget.win.getch1(500).ord rescue -1)) > -1
-                     inactive = 0
+                  if c.is_a? ICurses::IMouseEvent
+                     UI::Canvas.widget.mouse_click(c)
+                  elsif c
+                     UI::Canvas.widget.key_press(c)
+                  end
 
-                     if c == ICurses::KEY_MOUSE
-                        if c = ICurses.getmouse
-                           UI::Canvas.widget.mouse_click(c)
+                  inactivity_count = 0
+                  until @@readline_obj.active? or inactivity_count > 10
+                     if (c = (ICurses.stdscr.getch1(1000).ord rescue -1)) > -1
+                        inactivity_count = 0
+
+                        if c == ICurses::KEY_MOUSE
+                           if (c = ICurses.getmouse)
+                              UI::Canvas.widget.mouse_click(c)
+                           end
+                        else
+                           UI::Canvas.widget.key_press(KEYMAP_WORKAROUND[c])
                         end
                      else
-                        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
+                        inactivity_count += 1
+                        GC.start
                      end
                   end
-
-                  ICurses.doupdate
-               end while !@@readline_obj.active?
+               end
             else
+               ICurses.stdscr.keypad(false)
                ICurses.curs_set(1)
                ICurses.nl
 
                begin
-                  win = UI::Canvas.widget.win
-                  win.keypad(false)
                   @@readline_obj.redraw
-                  next unless (c = (win.getch1(100).ord rescue -1)) > -1
+                  next unless (c = (ICurses.stdscr.getch1(100).ord rescue -1)) > -1
 
                   if c == 10 or c == 4
                      @@readline_obj.feed(?\n.ord)
@@ -139,10 +131,10 @@ module UI
                      @@readline_obj.feed(c)
 
                      if c == 27 # pass 3-character escape sequence
-                        win.timeout(5)
-                        if (c = (win.getch.ord rescue -1)) > -1
+                        ICurses.stdscr.timeout(5)
+                        if (c = (ICurses.stdscr.getch.ord rescue -1)) > -1
                            @@readline_obj.feed(c)
-                           if (c = (win.getch.ord rescue -1)) > -1
+                           if (c = (ICurses.stdscr.getch.ord rescue -1)) > -1
                               @@readline_obj.feed(c)
                            end
                         end
@@ -168,7 +160,7 @@ module UI
          @thread = nil
       end
 
-      def active?; @thread; end
+      def active?; !@thread.nil?  end
 
       def redraw
          @window.resize(@size.height, @size.width)
@@ -245,8 +237,8 @@ module UI
          Size.new(width: (width or @width), height: (height or @height))
       end
 
-      def calc(height: 0, width: 0)
-         Size.new(height: @height + height, width: @width + width)
+      def calc(width: 0, height: 0)
+         Size.new(width: @width + width, height: @height + height)
       end
 
       def ==(s)  s.height == @height and s.width == @width    end
@@ -300,7 +292,6 @@ module ICurses
    class IWindow
       alias :height :maxy
       alias :width  :maxx
-      alias :clear_line :clrtoeol
 
       def cursor;  UI::Point.new(y: cury, x: curx)           end
       def pos;     UI::Point.new(y: begy, x: begx)           end
@@ -331,7 +322,6 @@ module ICurses
       def on_column(n)     move(cury, n)                        ;self;end
       def next_line;       move(cury + 1, 0)                    ;self;end
       def mv_left(n)       move(cury, curx - 1)                 ;self;end
-      def line_start(l=0)  move(l, 0)                           ;self;end
       def from_left(size)  move(cury, size)                     ;self;end
       def from_right(size) move(cury, (maxx - size))            ;self;end
       def center(size)     move(cury, (maxx / 2) - (size / 2))  ;self;end
@@ -363,11 +353,7 @@ module ICurses
       end
 
       def to_s
-         name = ICurses.constants.
-            select { |c| c =~ /^BUTTON_/ }.
-            select { |c| ICurses.const_get(c) & @bstate > 0 }[0]
-         name ||= @button
-         "[(IMouseEvent) button=#{name}, x=#{x}, y=#{y}, z=#{z}]"
+         "[(IMouseEvent) bstate=#{bstate}, x=#{x}, y=#{y}, z=#{z}]"
       end
    end
 end

data/lib/ektoplayer/views/info.rb

@@ -111,11 +111,12 @@ module Ektoplayer
 
                # -- description
                draw_heading('Description')
+               description = @database.get_description(@track['album_url'])
                line_length = START_TAG
                wrap_length = @size.width.clamp(1, LINE_WRAP)
                @win.move(@win.cury + 1, START_TAG)
 
-               Nokogiri::HTML("<p>#{@track['description']}</p>").css(?p).each do |p|
+               Nokogiri::HTML("<p>#{description}</p>").css(?p).each do |p|
                   p.children.each do |element|
                      if element['href']
                         if (line_length += element.text.size) > wrap_length

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ektoplayer
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Benjamin Abendroth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -91,6 +91,7 @@ files:
 - lib/ektoplayer/trackloader.rb
 - lib/ektoplayer/ui.rb
 - lib/ektoplayer/ui/colors.rb
+- lib/ektoplayer/ui/escapesequencetranslator.rb
 - lib/ektoplayer/ui/widgets.rb
 - lib/ektoplayer/ui/widgets/container.rb
 - lib/ektoplayer/ui/widgets/labelwidget.rb