ektoplayer 0.1.12 → 0.1.16

data/lib/ektoplayer/config.rb

@@ -24,12 +24,14 @@ module Ektoplayer
 
       def self.parse_simple_format(format)
          self._parse_markup(format).map do |fmt|
-            attrs = []
-            attrs << :bold      if fmt[:bold]
-            attrs << :blink     if fmt[:blink]
-            attrs << :standout  if fmt[:standout]
-            attrs << :underline if fmt[:underline]
-            fmt[:curses_attrs] = [ (fmt[:fg] and fmt[:fg].to_sym), (fmt[:bg] and fmt[:bg].to_sym), *attrs]
+            fmt[:curses_attrs] = [
+               (fmt[:fg] and Integer(fmt[:fg]) rescue fmt[:fg].to_sym),
+               (fmt[:bg] and Integer(fmt[:bg]) rescue fmt[:bg].to_sym),
+            ]
+            fmt[:curses_attrs] << :bold      if fmt[:bold]
+            fmt[:curses_attrs] << :blink     if fmt[:blink]
+            fmt[:curses_attrs] << :standout  if fmt[:standout]
+            fmt[:curses_attrs] << :underline if fmt[:underline]
             fmt
          end
       end
@@ -56,14 +58,28 @@ module Ektoplayer
          <album  rel="30" fg="red"     />
          <title  rel="33" fg="yellow"  />
          <styles rel="20" fg="cyan"    />
-         <bpm    size="4" fg="green" justify="right" />}.squeeze(' ').freeze
+         <bpm    size="3" fg="green" justify="right" />}.squeeze(' ').freeze
 
-      DEFAULT_PLAYINGINFO_FORMAT1 =
+      DEFAULT_PLAYINGINFO_FORMAT_TOP =
          '<text fg="black">&lt;&lt; </text><title bold="on" fg="yellow" /><text fg="black"> &gt;&gt;</text>'.freeze
 
-      DEFAULT_PLAYINGINFO_FORMAT2 = 
+      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"  />
+         <bpm    size="3" fg="28" justify="right" />}.squeeze(' ').freeze
+
+      DEFAULT_PLAYINGINFO_FORMAT_TOP_256 =
+         '<text fg="236">&lt;&lt; </text><title bold="on" fg="178" /><text fg="236"> &gt;&gt;</text>'.freeze
+
+      DEFAULT_PLAYINGINFO_FORMAT_BOTTOM_256 = 
+         '<artist bold="on" fg="24" /><text> - </text><album bold="on" fg="160" /><text> (</text><year fg="37" /><text>)</text>'.freeze
+
       def register(key, description, default, method=nil)
          # parameter `description` is used by tools/mkconfig.rb, but not here
 
@@ -118,7 +134,7 @@ module Ektoplayer
 
          reg :playlist_load_newest,
             %{How many tracks from database should be added to
-              the playlist on application start.}, 300
+              the playlist on application start.}, 1000
 
          reg :use_cache,
             %{Enable/disable local mp3 cache.
@@ -143,12 +159,20 @@ module Ektoplayer
             'Number of donwload threads during database update',
             20, lambda { |v| fail if Integer(v) < 1; Integer(v) }
 
-         reg 'browser.format', 'Format of browser columns',
+         # - Playlist
+         reg 'playlist.format', 'Format of playlist columns',
             DEFAULT_PLAYLIST_FORMAT, ColumnFormat.method(:parse_column_format)
 
-         reg 'playlist.format', 'Format of playlist columns',
+         reg 'playlist.format_256', 'Format of playlist columns (256 colors)',
+            DEFAULT_PLAYLIST_FORMAT_256, ColumnFormat.method(:parse_column_format)
+
+         # - Browser
+         reg 'browser.format', 'Format of browser columns',
             DEFAULT_PLAYLIST_FORMAT, ColumnFormat.method(:parse_column_format)
 
+         reg 'browser.format_256', 'Format of browser columns (256 colors)',
+            DEFAULT_PLAYLIST_FORMAT_256, ColumnFormat.method(:parse_column_format)
+
          # - Progressbar
          reg 'progressbar.display',
             'Enable/disable progressbar', true
@@ -163,12 +187,24 @@ module Ektoplayer
          reg 'playinginfo.display',
             'Enable/display playinginfo', true
 
-         reg 'playinginfo.format1',
-             'Format of first line in playinginfo', DEFAULT_PLAYINGINFO_FORMAT1,
+         reg 'playinginfo.format_top',
+             'Format of first line in playinginfo',
+             DEFAULT_PLAYINGINFO_FORMAT_TOP,
+             ColumnFormat.method(:parse_simple_format)
+
+         reg 'playinginfo.format_top_256',
+             'Format of first line in playinginfo (256 colors)',
+             DEFAULT_PLAYINGINFO_FORMAT_TOP_256,
+             ColumnFormat.method(:parse_simple_format)
+
+         reg 'playinginfo.format_bottom',
+             'Format of second line in playinginfo',
+             DEFAULT_PLAYINGINFO_FORMAT_BOTTOM,
              ColumnFormat.method(:parse_simple_format)
 
-         reg 'playinginfo.format2',
-             'Format of second line in playinginfo', DEFAULT_PLAYINGINFO_FORMAT2,
+         reg 'playinginfo.format_bottom_256',
+             'Format of second line in playinginfo (256 colors)',
+             DEFAULT_PLAYINGINFO_FORMAT_BOTTOM_256,
              ColumnFormat.method(:parse_simple_format)
 
          # - Tabbar
@@ -232,7 +268,6 @@ module Ektoplayer
             begin
                cb = callbacks[command.to_sym]
                cb.call(*args)
-               #fail "Command '#{command}' given args: #{args.size}, wanted #{cb.arity}" if args.size != cb.arity
             rescue
                fail "#{file}:#{$.}: #{command}: #{$!}"
             end

data/lib/ektoplayer/controllers/browser.rb

@@ -16,19 +16,24 @@ module Ektoplayer
                each { |op| register.(op, &view.method(op)) }
 
             register.(:enter) do
-               operations.send(:'browser.enter', view.selected)
+               selection = view.get_selection
+
+               operations.send(:'browser.enter', selection[0])
+
+               if selection.size > 1
+                  selection[1..-1].each do |index|
+                     operations.send(:'browser.add_to_playlist', index)
+                  end
+               end
             end
 
             register.(:add_to_playlist) do
-               #if tracks = browser.tracks(view.selected)
                view.get_selection.each do |index|
                   operations.send(:'browser.add_to_playlist', index)
                end
-               #end
             end
 
-            # TODO: mouse?
-            view.mouse.on(65536) do view.up(5) end
+            view.mouse.on(65536)   do view.up(5)   end
             view.mouse.on(2097152) do view.down(5) end
 
             [ICurses::BUTTON1_DOUBLE_CLICKED, ICurses::BUTTON3_CLICKED].each do |btn|

data/lib/ektoplayer/database.rb

@@ -25,12 +25,7 @@ module Ektoplayer
 
             a.artist          AS album_artist,
             a.title           AS album,
-            a.released_by     AS released_by,
-            a.released_by_url AS released_by_url,
-            a.posted_by       AS posted_by,
-            a.posted_by_url   AS posted_by_url,
             a.cover_url       AS cover_url,
-            a.category        AS category,
             a.description     AS description,
             a.date            AS date,
             a.rating          AS rating,
@@ -75,12 +70,7 @@ module Ektoplayer
             url              TEXT   NOT NULL,
             title            TEXT   NOT NULL,
             artist           TEXT,  
-            released_by      TEXT,  
-            released_by_url  TEXT,  
-            posted_by        TEXT,  
-            posted_by_url    TEXT,  
             cover_url        TEXT,  
-            category         TEXT,  
             description      TEXT,  
             date             DATE,  
             rating           FLOAT  NOT NULL DEFAULT -1,  
@@ -144,10 +134,8 @@ module Ektoplayer
          insert_into(table, hash, mode: :replace)
       end
 
-      def execute(query, params=nil)
-         stm = @db.prepare query
-         stm.bind_params(*params) if params
-         stm.execute.to_a
+      def execute(query, params=[])
+         @db.execute(query, *params)
       rescue
          Application.log(self, $!)
       end
@@ -156,7 +144,7 @@ module Ektoplayer
          columns: ?*,
          filters: [],
          group_by: 'url',
-         order_by: 'album, number',
+         order_by: 'album,number',
          limit: nil
       )
          where_clauses, where_params = [], []
@@ -182,7 +170,7 @@ module Ektoplayer
 
          limit = "LIMIT #{limit}" if limit
 
-         stm = @db.prepare SELECT % {
+         query = SELECT % {
             SELECT_COLUMNS: columns,
             WHERE:          where_clauses.join(' '),
             GROUP_BY:       group_by,
@@ -190,8 +178,7 @@ module Ektoplayer
             LIMIT:          limit
          }
 
-         stm.bind_params(*where_params)
-         stm.execute.to_a
+         @db.execute(query, *where_params)
       rescue
          Application.log(self, $!)
       end
@@ -201,11 +188,11 @@ module Ektoplayer
       end
 
       def track_count
-         @db.execute('SELECT COUNT(*) FROM tracks')[0][0]
+         @db.get_first_value('SELECT COUNT(*) FROM tracks')
       end
 
       def album_count
-         @db.execute('SELECT COUNT(*) FROM albums')[0][0]
+         @db.get_first_value('SELECT COUNT(*) FROM albums')
       end
    end
 end

data/lib/ektoplayer/download/externaldownload.rb

@@ -0,0 +1,65 @@
+require 'open3'
+require 'uri'
+
+require_relative '../events'
+
+class ExternalDownload
+   attr_reader :events, :url, :progress, :filename, :error
+
+   def initialize(url, filename)
+      @events   = Events.new(:completed, :failed)
+      @url      = URI.parse(url)
+      @filename = filename
+      @progress = 0
+      @error    = nil
+      @tries    = 3
+   end
+
+   def self.get_wget_cmd(url, file)
+      %w(wget -nv --show-progress --progress=dot:binary -O) + [file, url]
+   end
+
+   def self.get_curl_cmd(url, file)
+      %w(curl -# -o) + [file, url]
+   end
+
+   def start!
+      Thread.new do
+         args = CMD.(@url.to_s, @filename)
+         dl_in, dl_out, dl_err, @dl_proc = Open3.popen3(*args)
+
+         begin
+            while (line = dl_err.readpartial(1024))
+               @last_line = line
+
+               if (progress = line.scan(/(\d+(\.\d+)?%)/)[0][0].delete(?%).to_f rescue nil)
+                  @progress = progress
+               end
+            end
+         rescue
+            nil
+         end
+
+         begin
+            @dl_proc.join
+            raise if @dl_proc.value.exitstatus > 0
+            @progress = 100.0
+            @events.trigger(:completed)
+         rescue
+            @events.trigger(:failed, (@error = @last_line))
+         end
+      end
+
+      sleep 0.1 while @dl_proc.nil?
+      sleep 0.2
+      self
+   end
+
+   if system('wget --version >/dev/null 2>/dev/null')
+      CMD = method :get_wget_cmd
+   elsif system('curl --version >/dev/null 2>/dev/null')
+      CMD = method :get_curl_cmd
+   else
+      fail LoadError, 'wget/curl not installed'
+   end
+end

data/lib/ektoplayer/download/rubydownload.rb

@@ -0,0 +1,69 @@
+require 'net/https'
+require 'uri'
+
+require_relative '../events'
+
+class RubyDownload
+   attr_reader :events, :url, :filename, :error
+
+   def initialize(url, filename)
+      @events   = Events.new(:completed, :failed)
+      @url      = URI.parse(url)
+      @filename = filename
+      @bytes_read = 0
+      @error, @total = nil, nil
+      @tries    = 3
+   end
+
+   def progress
+      (@bytes_read.to_f / @total * 100) rescue 0).clamp(0, 100).to_f
+   end
+
+   def start!
+      Thread.new do
+         success = false
+
+         @tries.times do |try|
+            begin
+               do_download
+               @events.trigger(:completed)
+               success = true
+               break
+            rescue
+               @_lasterror = $!
+               sleep 3
+            end
+         end
+
+         unless success
+            @events.trigger(:failed, @_lasterror)
+         end
+      end
+
+      sleep 0.1 while @total.nil?
+      sleep 0.2
+      self
+   end
+
+   private def do_download
+      @file = File.open(filename, ?w)
+      @bytes_read, @total, @error = 0, nil, nil
+
+      http = Net::HTTP.new(@url.host, @url.port)
+
+      http.request(Net::HTTP::Get.new(@url.request_uri)) do |res|
+         fail res.body unless res.code == '200'
+
+         @total = res.header['Content-Length'].to_i
+
+         res.read_body do |chunk|
+            @bytes_read += chunk.size
+            @file << chunk
+         end
+      end
+
+      fail 'filesize mismatch' if @bytes_read != @total
+   ensure
+      (@file.close rescue nil) if @file
+   end
+end

data/lib/ektoplayer/icurses/curses.rb

@@ -17,10 +17,25 @@ module Curses
          alias_method :"get#{method}", method.to_sym
       end
 
+      def leaveok(*_);   end # Curses does not 
+      def notimeout(*_); end # provide these functions
+
       alias :timeout :timeout=
-      alias :notimeout :nodelay= #todo
       alias :nodelay :nodelay=
 
+      def bkgd(attr)
+         @bkgd_color = attr
+      end
+      alias :bkgdset :bkgd
+
+      def erase
+         setpos(0, 0)
+         attrset((@bkgd_color or 0))
+         addstr(' ' * (maxx * maxy))
+         attroff((@bkgd_color or 0))
+         setpos(0, 0)
+      end
+
       alias :mvwin :move # 'fix' this Gem
       def move(y, x)
          setpos(y, x)
@@ -28,7 +43,8 @@ module Curses
    end
 
    class Pad < Window
-      alias :pnoutrefresh :refresh
+      alias :pnoutrefresh :noutrefresh
+      alias :prefresh     :refresh
    end
 end
 

data/lib/ektoplayer/icurses/{ffi_ncurses.rb → ffi-ncurses.rb}

@@ -55,6 +55,7 @@ module FFI::NCurses
       end
 
       %w(getcurx getcury getmaxx getmaxy getbegx getbegy
+         clearok idlok idcok immedok leaveok setscrreg scrollok nl nonl
          keypad nodelay notimeout prefresh pnoutrefresh).each do |meth|
 
          define_method(meth) do |*args|

data/lib/ektoplayer/icurses/ncurses.rb

@@ -17,6 +17,7 @@ module Ncurses
       end
 
       %w(getcurx getcury getmaxx getmaxy getbegx getbegy
+         clearok idlok idcok immedok leaveok setscrreg scrollok nl nonl
          keypad nodelay notimeout prefresh pnoutrefresh).each do |meth|
          define_method(meth) do |*args|
             Ncurses.send(meth, @w, *args)
@@ -36,6 +37,15 @@ module Ncurses
             end
          end
       end
+
+      if $USING_CURSES == 'ncurses'
+         ### FIX: 'attrset' in ncurses is broken!
+         def attrset(attributes)
+            Ncurses.send(:wattr_get, @w, old_a=[], old_c=[], nil)
+            Ncurses.send(:wattroff, @w, old_a[0] | old_c[0])
+            Ncurses.send(:wattron, @w, attributes)
+         end
+      end
    end
 end
 

data/lib/ektoplayer/icurses.rb

@@ -9,13 +9,21 @@
 end
 
 fail %{
-No interface for ncurses found. Please install one of the following gems
-   - curses
-   - ffi-ncurses
-   - ncurses-ruby
-   - ncursesw
+No module for ncurses found. Please install one of the following gems:
+   - ffi-ncurses  (preferred)
+   - ncursesw     (good)
+   - ncurses-ruby (good) 
+   - curses       (works...)
 
 Maybe your distribution ships one of these already as a package.
+
+   Arch Linux:
+      yaourt -S ruby-curses    # or
+      yaourt -S ruby-ncursesw
+
+   Debian / Ubuntu:
+      apt-get install ruby-ncurses
+
 } unless $USING_CURSES
 
 require_relative 'icurses/sugar'

data/lib/ektoplayer/models/browser.rb

@@ -6,13 +6,11 @@ module Ektoplayer
          PARENT_DIRECTORY = '..'.freeze
 
          PATHS = {
-            artist:         [:artist     ].freeze,
-            album:          [:album      ].freeze,
-            style:          [:style      ].freeze,
-            year:           [:year       ].freeze,
-            title:          [].freeze,
-            released_by:    [:released_by].freeze,
-            posted_by:      [:posted_by  ].freeze
+            artist:  [:artist].freeze,
+            album:   [:album ].freeze,
+            style:   [:style ].freeze,
+            year:    [:year  ].freeze,
+            title:   [].freeze
          }.freeze
 
          def initialize(client)
@@ -36,16 +34,18 @@ module Ektoplayer
          end
 
          def enter(index)
-            return unless (sub = current.enter(index))
+            return false unless (sub = current.enter(index))
             return back() if sub == :parent
             @stack.push(sub)
             @events.trigger(:changed)
+            true
          end
 
          def back
-            return unless @stack.size > 1
+            return false unless @stack.size > 1
             @stack.pop
             @events.trigger(:changed)
+            true
          end
 
          class BrowsableCollection
@@ -91,7 +91,7 @@ module Ektoplayer
                   return [] if index == 0
                   return [ @contents[index] ]
                else
-                  @database.select(filters: new_filters(index)).map.to_a
+                  @database.select(filters: new_filters(index))
                end
             end
 
@@ -121,7 +121,7 @@ module Ektoplayer
 
             def tracks(index)
                @database.select(
-                  order_by: CONTENTS[index].to_s + ",album,year,number".sub(",#{CONTENTS[index]}", '')
+                  order_by: 'album,' + CONTENTS[index].to_s + ",album,number" 
                )
             end
          end

data/lib/ektoplayer/models/player.rb

@@ -8,11 +8,12 @@ module Ektoplayer
             super()
             @client = client
             @player = MpgWrapperPlayer.new
-            @events.register(:position_change, :track_completed, :pause, :stop, :play)
-            @player.events.on_all(&@events.method(:trigger))
+            @events = @player.events
+            #@events.register(:position_change, :track_completed, :pause, :stop, :play)
+            #@player.events.on_all(&@events.method(:trigger))
 
             %w(pause toggle stop forward backward seek
-            length position position_percent level).each do |m|
+            length position position_percent can_http?).each do |m|
                self.define_singleton_method(m, &@player.method(m))
             end
          end
@@ -21,8 +22,6 @@ module Ektoplayer
             Application.log(self, 'playing', file)
             @player.play(file) rescue Application.log(self, $!)
          end
-
-         def close;  @player.close  end
       end
    end
 end

data/lib/ektoplayer/operations/browser.rb

@@ -7,8 +7,16 @@ module Ektoplayer
          # +add_to_playlist+::   see
          def initialize(operations, browser, playlist)
             register = operations.with_register('browser.')
-            register.(:enter,  &browser.method(:enter))
             register.(:back,   &browser.method(:back))
+
+            register.(:enter) do |index|
+               unless browser.enter(index)
+                  tracks = browser.tracks(index)
+                  playlist.add(*tracks)
+                  operations.send(:'playlist.play', playlist.size - tracks.size)
+               end
+            end
+                  
             register.(:add_to_playlist) do |index|
                tracks = browser.tracks(index)
                playlist.add(*tracks)

data/lib/ektoplayer/operations/playlist.rb

@@ -35,7 +35,7 @@ module Ektoplayer
             return unless track = @playlist[index]
             @playlist.current_playing=(index)
             Thread.new do
-               @player.play(@trackloader.get_track_file(track['url']))
+               @player.play(@trackloader.get_track_file(track['url'], http_okay: @player.can_http?))
             end.join(0.3) # prevent too many hits
          end