ektoplayer 0.1.12 → 0.1.16

data/lib/ektoplayer/players/mpg_wrapper_player.rb

@@ -1,15 +1,20 @@
 require 'thread'
 require 'open3'
 require 'scanf'
+require 'time'
 
 require_relative '../events'
 
-fail 'MpgWrapperPlayer: mpg123 not found' unless system('which mpg123 >/dev/null')
+unless system('mpg123 --version >/dev/null 2>/dev/null')
+   fail LoadError, 'MpgWrapperPlayer: /bin/mpg123 not found'
+end
 
 class MpgWrapperPlayer 
    attr_reader :events, :file
 
    STATE_STOPPED, STATE_PAUSED, STATE_PLAYING = 0, 1, 2
+   CMD_FORMAT = 'FORMAT'.freeze
+   CMD_SAMPLE = 'SAMPLE'.freeze
 
    def initialize
       @events = Events.new(:play, :pause, :stop, :position_change)
@@ -18,21 +23,34 @@ class MpgWrapperPlayer
       @state = 0
       @file = ''
 
-      @frames_played = @frames_remaining =
-         @seconds_played = @seconds_remaining = 0
+      @polling_interval = 0.9
+
+      @seconds_played = @seconds_total = 0
+      @track_completed = nil
    end
 
+   def can_http?; true; end
+
    def play(file=nil)
       start_mpg123_thread
+      @track_completed = :track_completed
       @file = file if file
       write("L #{@file}")
+      Thread.new { sleep 3; write(CMD_FORMAT) }
    end
 
    def pause;  write(?P) if @state == STATE_PLAYING end
-   def stop;   write(?S) if @state != STATE_STOPPED end
-   def toggle; write(?P) end
+   def toggle; write(?P)                            end
+
+   def stop
+      stop_polling_thread
+      @track_completed = nil
+      @seconds_played = @seconds_total = 0
+      @events.trigger(:position_change)
+      @events.trigger(:stop)
+      write(?Q) if @state != STATE_STOPPED
+   end
 
-   def level;    30                      end
    def paused?;  @state == STATE_PAUSED  end
    def stopped?; @state == STATE_STOPPED end
    def playing?; @state == STATE_PLAYING end
@@ -43,21 +61,70 @@ class MpgWrapperPlayer
       return :stopped if stopped?
    end
 
-   def position; @seconds_played                      end
-   def length;   @seconds_played + @seconds_remaining end
-   def position_percent; Float(@seconds_played) / length end
+   def position; @seconds_played  end
+   def length;   @seconds_total   end
 
-   def seek(seconds)        write("J #{seconds}s")  end
+   def position_percent
+      @seconds_played.to_f / length rescue 0.0
+   end
+
+   def seek(seconds)        write("J  #{seconds}s") end
    def rewind(seconds = 2)  write("J -#{seconds}s") end
-   def forward(seconds = 2) write("J +#{seconds}s")  end
+   def forward(seconds = 2) write("J +#{seconds}s") end
    alias :backward :rewind
 
    private def write(string)
-      @lock.synchronize do
-         @mpg123_in.write(string + ?\n)
-      end
+      @lock.synchronize { @mpg123_in.write(string + ?\n) }
    rescue
-      Ektoplayer::Application.log(self, $!)
+      nil
+   end
+
+   def use_polling(interval)
+      @polling_interval = interval
+      start_polling_thread
+   end
+
+   private def start_polling_thread
+      write('SILENCE')
+      @polling_thread ||= Thread.new do
+         loop do
+            sleep @polling_interval
+            write(CMD_SAMPLE)
+         end
+      end
+   end
+
+   private def stop_polling_thread
+      @polling_thread.kill if @polling_thread
+      @polling_thread = nil
+   end
+
+   define_method '@FORMAT' do |line|
+      @sample_rate, channels = line.scanf('%d %d')
+   end
+
+   define_method '@SAMPLE' do |line|
+      @sample_rate ||= 44100
+      samples_played, samples_total = line.scanf('%f %f')
+      @seconds_played = samples_played / @sample_rate rescue 0.0
+      @seconds_total = samples_total / @sample_rate rescue 0.0
+      @events.trigger(:position_change)
+   end
+
+   define_method '@F' do |line|
+      _, _, @seconds_played, seconds_remaining = line.scanf('%d %d %f %f')
+      @seconds_total = @seconds_played + seconds_remaining
+      @events.trigger(:position_change)
+   end
+
+   define_method '@P' do |line|
+      if (@state = line.to_i) == STATE_STOPPED
+         @events.trigger(:stop, @track_completed)
+      elsif @state == STATE_PAUSED
+         @events.trigger(:pause)
+      elsif @state == STATE_PLAYING
+         @events.trigger(:play)
+      end
    end
 
    private def start_mpg123_thread
@@ -65,43 +132,34 @@ class MpgWrapperPlayer
          unless @mpg123_thread
             Thread.new do
                begin
-                  @mpg123_in, @mpg123_out, _, @mpg123_thread =
-                     Open3.popen3('mpg123', '-o', 'jack,pulse,alsa,oss', '--fuzzy', '-R')
+                  @mpg123_in, @mpg123_out, mpg123_err, @mpg123_thread =
+                     Open3.popen3('mpg123', '-o', 'jack,pulse,alsa,oss', '--fuzzy', '-b', '1024', '-R')
 
                   while (line = @mpg123_out.readline)
-                     if line[1] == ?F 
-                        @frames_played, @frames_remaining,
-                           @seconds_played, @seconds_remaining =
-                           line.scanf('@F %d %d %f %f')
-                        @events.trigger(:position_change)
-                     elsif line[1] == ?P
-                        if (@state = line[3].to_i) == STATE_STOPPED
-                           if @seconds_remaining < 3
-                              @events.trigger(:stop, :track_completed)
-                           else
-                              @events.trigger(:stop)
-                           end
-                        elsif @state == STATE_PAUSED
-                           @events.trigger(:pause)
-                        elsif @state == STATE_PLAYING
-                           @events.trigger(:play)
-                        end
-                     end
+                     cmd, line = line.split(' ', 2)
+                     send(cmd, line) rescue nil
                   end
                rescue
                   Ektoplayer::Application.log(self, $!)
                ensure
-                  # shouldn't reach here
-                  Ektoplayer::Application.log(self, 'player closed')
-                  @mpg123_thread.kill
+                  begin msg = mpg123_err.read
+                  rescue
+                     msg = ''
+                  end
+
+                  Ektoplayer::Application.log(self, 'player closed:', msg)
+                  @mpg123_thread.kill if @mpg123_thread
+                  (@mpg123_in.close rescue nil)  if @mpg123_in
+                  (@mpg123_out.close rescue nil) if @mpg123_out
                   @mpg123_thread = nil
-                  @mpg123_in.close
-                  @mpg123_out.close
+                  stop_polling_thread
                end
             end
 
             sleep 0.1 while not @mpg123_thread
          end
       end
+
+      start_polling_thread if @polling_interval > 0
    end
 end

data/lib/ektoplayer/theme.rb

@@ -5,64 +5,74 @@ module Ektoplayer
       attr_reader :current, :theme
 
       def initialize
-         @current = 0
-         @theme = {
-            0 =>   { default: [-1, -1].freeze,
-               :'url'                     => [-1, -1, :underline      ].freeze,
-               :'tabbar.selected'         => [-1, -1, :bold           ].freeze},
-            8 =>   { default: [-1, -1].freeze,
-               :'url'                     => [:magenta, -1, :underline].freeze,
-
-               :'info.head'               => [:blue, -1, :bold        ].freeze,
-               :'info.tag'                => [:blue                   ].freeze,
-               :'info.value'              => [:magenta                ].freeze,
-               :'info.description'        => [:blue                   ].freeze,
-               :'info.download.file'      => [:blue                   ].freeze,
-               :'info.download.percent'   => [:magenta, -1            ].freeze,
-               :'info.download.error'     => [:red                    ].freeze,
-
-               :'progressbar.progress'    => [:blue                   ].freeze,
-               :'progressbar.rest'        => [:black                  ].freeze,
-
-               :'tabbar.selected'         => [:blue                   ].freeze,
-               :'tabbar.unselected'       => [:none                   ].freeze,
-
-               :'list.item_even'          => [:blue                   ].freeze,
-               :'list.item_odd'           => [:blue                   ].freeze,
-               :'list.item_selection'     => [:magenta                ].freeze,
-
-               :'playinginfo.position'    => [:magenta                ].freeze,
-               :'playinginfo.state'       => [:cyan                   ].freeze,
-
-               :'help.widget_name'        => [:blue, -1, :bold        ].freeze,
-               :'help.key_name'           => [:blue                   ].freeze,
-               :'help.command_name'       => [:magenta                ].freeze,
-               :'help.command_desc'       => [:yellow                 ].freeze},
-            256 => { default: [-1, -1].freeze,
-               :'url'                     => [97,  -1, :underline     ].freeze,
-
-               :'info.head'               => [32, -1, :bold           ].freeze,
-               :'info.tag'                => [74                      ].freeze,
-               :'info.value'              => [67                      ].freeze,
-               :'info.description'        => [67                      ].freeze,
-               :'info.download.file'      => [75                      ].freeze,
-               :'info.download.percent'   => [68                      ].freeze,
-               :'info.download.error'     => [:red                    ].freeze,
-
-               :'progressbar.progress'    => [23                      ].freeze,
-               :'progressbar.rest'        => [236                     ].freeze,
-
-               :'tabbar.selected'         => [75                      ].freeze,
-               :'tabbar.unselected'       => [250                     ].freeze,
-
-               :'list.item_even'          => [:blue                   ].freeze,
-               :'list.item_odd'           => [25                      ].freeze,
-
-               :'help.widget_name'        => [33                      ].freeze,
-               :'help.key_name'           => [75                      ].freeze,
-               :'help.command_name'       => [68                      ].freeze,
-               :'help.command_desc'       => [29                      ].freeze}
-         }.freeze
+         @theme, @current = {}, 0
+
+         @theme[0] = {
+            :default                   => [-1, -1                        ].freeze,
+            :'url'                     => [:default, :default, :underline].freeze,
+            :'tabbar.selected'         => [:default, :default, :bold     ].freeze
+         }
+         @theme[8] = {
+            :default                   => [-1, -1                        ].freeze,
+            :'url'                     => [:magenta, :default, :underline].freeze,
+
+            :'info.head'               => [:blue, :default, :bold        ].freeze,
+            :'info.tag'                => [:blue                         ].freeze,
+            :'info.value'              => [:magenta                      ].freeze,
+            :'info.description'        => [:blue                         ].freeze,
+            :'info.download.file'      => [:blue                         ].freeze,
+            :'info.download.percent'   => [:magenta                      ].freeze,
+            :'info.download.error'     => [:red                          ].freeze,
+
+            :'progressbar.progress'    => [:blue                         ].freeze,
+            :'progressbar.rest'        => [:black                        ].freeze,
+
+            :'tabbar.selected'         => [:blue                         ].freeze,
+            :'tabbar.unselected'       => [:white                        ].freeze,
+
+            :'list.item_even'          => [:blue                         ].freeze,
+            :'list.item_odd'           => [:blue                         ].freeze,
+            :'list.item_selection'     => [:magenta                      ].freeze,
+
+            :'playinginfo.position'    => [:magenta                      ].freeze,
+            :'playinginfo.state'       => [:cyan                         ].freeze,
+
+            :'help.widget_name'        => [:blue, :default, :bold        ].freeze,
+            :'help.key_name'           => [:blue                         ].freeze,
+            :'help.command_name'       => [:magenta                      ].freeze,
+            :'help.command_desc'       => [:yellow                       ].freeze
+         }
+         @theme[256] = {
+            :'default'                 => [:white, 233                   ].freeze,
+            :'url'                     => [97, :default, :underline      ].freeze,
+
+            :'info.head'               => [32, :default, :bold           ].freeze,
+            :'info.tag'                => [74                            ].freeze,
+            :'info.value'              => [67                            ].freeze,
+            :'info.description'        => [67                            ].freeze,
+            :'info.download.file'      => [75                            ].freeze,
+            :'info.download.percent'   => [68                            ].freeze,
+            :'info.download.error'     => [:red                          ].freeze,
+
+            :'progressbar.progress'    => [23                            ].freeze,
+            :'progressbar.rest'        => [:black                        ].freeze,
+
+            :'tabbar.selected'         => [75                            ].freeze,
+            :'tabbar.unselected'       => [250                           ].freeze,
+
+            :'list.item_even'          => [26                            ].freeze,
+            :'list.item_odd'           => [25                            ].freeze,
+            :'list.item_selection'     => [97                            ].freeze,
+
+            :'playinginfo.position'    => [97                            ].freeze,
+            :'playinginfo.state'       => [37                            ].freeze,
+
+            :'help.widget_name'        => [33                            ].freeze,
+            :'help.key_name'           => [75                            ].freeze,
+            :'help.command_name'       => [68                            ].freeze,
+            :'help.command_desc'       => [29                            ].freeze
+         }
+         @theme.freeze
       end
 
       def color(name, *defs, theme: 8)
@@ -81,16 +91,21 @@ module Ektoplayer
          @current = colors
 
          UI::Colors.reset
+         UI::Colors.default_fg(@theme[@current][:default][0])
+         UI::Colors.default_bg(@theme[@current][:default][1])
+
          @theme.values.map(&:keys).flatten.each do |name|
+            next if name == :default
+
             defs ||= @theme[256][name] if @current == 256
             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
+            #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

data/lib/ektoplayer/trackloader.rb

@@ -1,10 +1,16 @@
 require 'fileutils'
-require 'net/https'
 require 'uri'
 
-require_relative 'events'
 require_relative 'common'
 
+begin
+   require_relative 'download/externaldownload'
+   DownloadThread = ExternalDownload
+rescue LoadError
+   require_relative 'download/rubydownload'
+   DownloadThread = RubyDownload
+end
+
 module Ektoplayer
    class Trackloader
       attr_reader :downloads
@@ -21,7 +27,7 @@ module Ektoplayer
             @database.get_archives(url).select {|_|_['archive_type'] == 'MP3'}[0]
          )
 
-         r['archive_filename'] = URI.unescape(File.basename(URI.parse(r['archive_url']).path))
+         r['archive_filename'] = URI.unescape(r['archive_url'])
          r['archive_basename'] = File.basename(r['archive_filename'], '.zip')
          r['album_path'] = File.join(Config[:archive_dir], r['archive_basename'])
          r
@@ -34,7 +40,9 @@ module Ektoplayer
          archive_file = File.join(Config[:download_dir], track_info['archive_filename'])
          return if File.exists? archive_file
 
-         dl = DownloadThread.new(track_info['archive_url'], archive_file)
+         archive_url = Application.archive_url(track_info['archive_url'])
+         Application.log(self, 'starting download:', archive_url)
+         dl = DownloadThread.new(archive_url, archive_file)
 
          if Config[:auto_extract_to_archive_dir]
             dl.events.on(:completed) do 
@@ -50,8 +58,8 @@ module Ektoplayer
          end
 
          dl.events.on(:failed) do |reason|
-            Application.log(self, dl.file, dl.url, reason)
-            FileUtils::rm(dl.file) rescue nil
+            Application.log(self, dl.filename, dl.url, reason)
+            FileUtils::rm(dl.filename) rescue nil
          end
 
          @downloads << dl.start!
@@ -59,7 +67,7 @@ module Ektoplayer
          Application.log(self, $!)
       end
 
-      def get_track_file(url, reload: false)
+      def get_track_file(url, reload: false, http_okay: false)
          begin
             track_info = get_track_infos(url)
             album_files = Dir.glob(File.join(track_info['album_path'], '*.mp3'))
@@ -69,31 +77,33 @@ module Ektoplayer
             Application.log(self, 'could not load track from archive_dir:', $!)
          end
 
-         url_obj    = URI.parse(url)
+         real_url   = Application.track_url(url)
+         url_obj    = URI.parse(real_url)
          basename   = File.basename(url_obj.path)
          cache_file = File.join(Config[:cache_dir], basename)
-         temp_file  = File.join(Config[:temp_dir], basename)
+         temp_file  = File.join(Config[:temp_dir], '~ekto-' + basename)
 
          (File.delete(cache_file) rescue nil) if reload
          (File.delete(temp_file)  rescue nil) if reload
 
          return cache_file if File.file?(cache_file)
          return temp_file  if File.file?(temp_file)
+         return real_url   if http_okay
 
-         dl = DownloadThread.new(url, temp_file)
+         Application.log(self, 'starting download:', real_url)
+         dl = DownloadThread.new(real_url, temp_file)
 
          if Config[:use_cache]
             dl.events.on(:completed) do 
-               begin FileUtils::mv(temp_file, cache_file)
-               rescue
+               FileUtils::mv(temp_file, cache_file) rescue (
                   Application.log(self, 'mv failed', temp_file, cache_file, $!)
-               end
+               )
             end
          end
 
          dl.events.on(:failed) do |reason|
-            Application.log(self, dl.file, dl.url, reason)
-            FileUtils::rm(dl.file) rescue nil
+            Application.log(self, dl.filename, dl.url, reason)
+            FileUtils::rm(dl.filename) rescue nil
          end
 
          @downloads << dl.start!
@@ -103,63 +113,4 @@ module Ektoplayer
          Application.log(self, $!)
       end
    end
-
-   class DownloadThread
-      attr_reader :events, :url, :progress, :total, :file, :filename, :error
-
-      def initialize(url, filename)
-         @events   = Events.new(:completed, :failed, :progress)
-         @url      = URI.parse(url)
-         @filename = filename
-         @file     = File.open(filename, ?w)
-         @progress = 0
-         @error    = nil
-         @tries    = 3
-      end
-
-      def start!
-         Application.log(self, 'starting download:', @url)
-
-         Thread.new do
-            begin
-               loop do
-                  begin
-                     http = Net::HTTP.new(@url.host, @url.port)
-                     @file.rewind
-                     @progress, @total = 0, nil
-
-                     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|
-                           @progress += chunk.size
-                           @events.trigger(:progress, @progress)
-                           @file << chunk
-                        end
-                     end
-
-                     fail 'filesize mismatch' if @progress != @total
-                     @file.flush
-                     @events.trigger(:completed)
-                     break
-                  rescue
-                     if (@tries -= 1) < 1
-                        @events.trigger(:failed, (@error = $!))
-                        break
-                     end
-                     Application.log(self, 'retrying failed DL', $!)
-                  end
-               end
-            ensure
-               @file.close
-            end
-         end
-
-         sleep 0.1 while @total.nil?
-         sleep 0.2
-         self
-      end
-   end
 end

data/lib/ektoplayer/ui/colors.rb

@@ -11,6 +11,7 @@ module UI
 
       def ColorFader._fade(colors, size)
          return [] if size < 1
+         return [colors[0]] * size if colors.size == 1
 
          part_len = (size / colors.size)
          diff = size - part_len * colors.size
@@ -22,13 +23,13 @@ module UI
 
       def ColorFader._fade2(colors, size)
          half = size / 2
-         ColorFader._fade(colors, half) + ColorFader._fade(colors, size - half).reverse
+         ColorFader._fade(colors, half) + ColorFader._fade(colors.reverse, size - half)
       end
    end
 
    class Colors
       COLORS = {
-         none: -1, default: -1, nil => -1,
+         none:     -1, 
          white:    ICurses::COLOR_WHITE,
          black:    ICurses::COLOR_BLACK,
          red:      ICurses::COLOR_RED,
@@ -48,7 +49,10 @@ module UI
          bold:  ICurses::A_BOLD,  standout:  ICurses::A_STANDOUT,
          blink: ICurses::A_BLINK, underline: ICurses::A_UNDERLINE
       }
-      ATTRIBUTES.default_proc = proc { |h,k| k }
+      ATTRIBUTES.default_proc = proc do |h,key|
+         fail "Unknown attribute #{key}" unless key.is_a?Integer
+         key
+      end
       ATTRIBUTES.freeze
 
       def self.start
@@ -57,11 +61,35 @@ module UI
          @@volatile     ||= {}
          @@volatile_ids ||= {}
          @@cached       ||= Hash.new { |h,k| h[k] = {} }
+         @@default_fg = @@default_bg = -1
       end
       def self.reset; self.start end
 
+      def self.default_fg(color)
+         @@default_fg = COLORS[color]
+      end
+
+      def self.default_bg(color)
+         @@default_bg = COLORS[color]
+      end
+
+      def self.default_colors(fg = -1, bg = -1)
+         self.default_fg(fg)
+         self.default_bg(bg)
+      end
+
       def self.init_pair_cached(fg, bg)
-         fg, bg = COLORS[fg], COLORS[bg]
+         if !fg or fg == :default
+            fg = @@default_fg
+         else
+            fg = COLORS[fg]
+         end
+
+         if !bg or bg == :default
+            bg = @@default_bg
+         else
+            bg = COLORS[bg]
+         end
 
          unless id = @@cached[fg][bg]
             id = @@cached[fg][bg] = @@id
@@ -81,7 +109,7 @@ module UI
       def self.[](name)   @@aliases[name] || 0  end
       def self.get(name)  @@aliases[name] || 0  end
       
-      def self.set(name, fg, bg = -1, *attrs)
+      def self.set(name, fg, bg = nil, *attrs)
          @@aliases[name] = self.init_pair_cached(fg, bg)
          attrs.each { |attr| @@aliases[name] |= ATTRIBUTES[attr] }
          @@aliases[name]

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

@@ -73,7 +73,7 @@ module UI
 
       def draw;     visible_widgets.each(&:draw)     end
       def refresh;  visible_widgets.each(&:refresh)  end
-      def layout;   @widgets.each(&:layout)   end
+      def layout;   @widgets.each(&:layout)          end
 
       def on_key_press(key)
          @selected.key_press(key) if @selected