ektoplayer 0.1.12 → 0.1.16

data/lib/ektoplayer/views/progressbar.rb

@@ -4,14 +4,12 @@ require_relative '../theme'
 
 module Ektoplayer
    module Views
-      class ProgressBar < UI::Window
+      class ProgressBar < UI::Pad
          def layout
             super
-            load_colors
-         end
-
-         def load_colors(force=false)
-            return if @fade and not force
+            self.pad_size=(UI::Size.new(
+               height: 1, width:  @size.width * 2
+            ))
 
             if Theme.current == 256
                fader = UI::ColorFader.new([25,26,27,32,39,38,44,44,45,51,87,159,195])
@@ -21,49 +19,44 @@ module Ektoplayer
                fader = UI::ColorFader.new([-1])
             end
 
-            @fade = fader.fade(@size.width)
-            @progress_width = @size.width
-            @progress_char = Config[:'progressbar.progress_char']
-            @rest_char  = Config[:'progressbar.rest_char']
-         end
+            progress_char = Config[:'progressbar.progress_char']
+
+            @win.move(0,0)
 
+            fader.fade(@size.width).each do |c|
+               @win.attron(c)
+               @win.addstr(progress_char)
+            end
+
+            @win.attron(Theme[:'progressbar.rest'])
+            @win << Config[:'progressbar.rest_char'] * @size.width
+         end
 
          def attach(player)
             player.events.on(:position_change) do
-               self.percent_playing = player.position_percent
+               old = @progress_width
+               @progress_width = @size.width - (player.position_percent * @size.width).to_i rescue 0
+
+               if (old != @progress_width) and visible?
+                  @pad_mincol = (@progress_width)
+                  refresh
+               end
             end
 
             view=self # TODO
             [ICurses::BUTTON1_CLICKED, ICurses::BUTTON2_CLICKED, ICurses::BUTTON3_CLICKED].
                each do |button|
                view.mouse.on(button) do |mevent|
-                  pos = Float(mevent.x) / (self.size.width - 1) * player.length rescue player.position
+                  x = mevent.x - @pad_mincol
+                  pos = Float(x) / (self.size.width - 1) * player.length rescue player.position
                   player.seek(pos.to_i)
+                  @progress_width = x
+                  self.pad_mincol=(@size.width - @progress_width)
                end
             end
          end
 
-         def percent_playing=(percent_playing)
-            char_width = (percent_playing * @size.width).to_i
-            return if char_width == @progress_width
-
-            with_lock do
-               @progress_width = char_width
-               want_redraw
-            end
-         end
-
          def draw
-            load_colors
-            @win.move(0,0)
-
-            @progress_width.times do |i|
-               @win.attron(@fade[i])
-               @win << @progress_char
-            end
-
-            @win.attron(Theme[:'progressbar.rest'])
-            @win << @rest_char * (@size.width - @win.curx)
          end
       end
    end

data/lib/ektoplayer/views/splash.rb

@@ -25,28 +25,20 @@ module Ektoplayer
  |___/\___/\_,_|_||_\__,_| |____|_|_.__/\___|_| \__,_|\__|_\___/_||_|}.
                                                        split(?\n)[1..-1].freeze
 
-         BUBBLES = [
-            UI::Point.new(x: 6,  y: 3).freeze, UI::Point.new(x: 6,  y: 7).freeze,
-            UI::Point.new(x: 28, y: 1).freeze, UI::Point.new(x: 28, y: 9).freeze,
-            UI::Point.new(x: 46, y: 7).freeze, UI::Point.new(x: 71, y: 9).freeze
-         ].freeze
+         BUBBLES = [[6,3], [6,7], [28,1], [28,9], [46,7], [71,9]].freeze
 
          def load_colors
-            signature_fade = ekto_logo_fade = bubble_fade = [-1].freeze
-
             if Theme.current == 256
-               bubble_fade    = [168,167,161,161,161].freeze
-               signature_fade = [99, 105, 111, 117].freeze
-               ekto_logo_fade = [23, 23, 29, 36, 42, 48, 42, 36, 29, 23].freeze
+               @bubble_fade    = UI::ColorFader.new([168,167,161,161,161])
+               @signature_fade = UI::ColorFader.new([99, 105, 111, 117])
+               @ekto_logo_fade = UI::ColorFader.new([23, 23, 29, 36, 42, 48, 42, 36, 29, 23])
             elsif Theme.current == 8
-               bubble_fade    = [:red].freeze
-               ekto_logo_fade = [:blue].freeze
-               signature_fade = [:magenta].freeze
+               @bubble_fade    = UI::ColorFader.new([:red])
+               @ekto_logo_fade = UI::ColorFader.new([:blue])
+               @signature_fade = UI::ColorFader.new([:magenta])
+            else
+               @bubble_fade = @signature_fade = @ekto_logo_fade = UI::ColorFader.new([-1])
             end
-
-            @bubble_fade    = UI::ColorFader.new(bubble_fade)
-            @signature_fade = UI::ColorFader.new(signature_fade)
-            @ekto_logo_fade = UI::ColorFader.new(ekto_logo_fade)
          end
 
          def draw
@@ -73,11 +65,11 @@ module Ektoplayer
             end
 
             f = @bubble_fade.fade(EKTOPLAZM_LOGO.size)
-            BUBBLES.each do |p|
-               @win.attrset(f[p.y - 1])
-               @win.mvaddstr(top_pad + p.y - 1, left_pad + p.x + 1, ?_)
-               @win.attrset(f[p.y])
-               @win.mvaddstr(top_pad + p.y, left_pad + p.x, '(_)')
+            BUBBLES.each do |x,y|
+               @win.attrset(f[y - 1])
+               @win.mvaddstr(top_pad + y - 1, left_pad + x + 1, ?_)
+               @win.attrset(f[y])
+               @win.mvaddstr(top_pad + y, left_pad + x, '(_)')
             end
 
             return unless draw_signature

data/lib/ektoplayer/views/trackrenderer.rb

@@ -98,7 +98,7 @@ module Ektoplayer
             additional_attributes |= ICurses::A_BOLD     if marked
             additional_attributes |= ICurses::A_STANDOUT if selected
 
-            if item.is_a? String or item.is_a? Symbol
+            if item.is_a? String or item.is_a? Symbol or item.is_a? Integer
                if selection
                   color = Theme[:'list.item_selection']
                elsif index % 2 == 0
@@ -112,9 +112,10 @@ module Ektoplayer
                return
             end
 
-            @column_format.each_with_index do |c,i|
-               scr.addch(32) if i > 0
+            left_pad = 0
+            y = scr.cury
 
+            @column_format.each_with_index do |c,i|
                if selection
                   scr.attrset(Theme[:'list.item_selection'] | additional_attributes)
                else
@@ -122,22 +123,25 @@ module Ektoplayer
                end
 
                if value = item[c[:tag]]
-                  if value.is_a?(Integer)
-                     value = "%.2d" % value
+                  if value.is_a? Integer
+                     value = '%.2d' % value
                   else
                      value = value.to_s[0..(c[:render_size] - 1)]
                   end
 
+                  scr.mvaddstr(y, left_pad, ' ' * c[:render_size])
+                  scr.addch(32) if i < @column_format.size - 1
+
                   if c[:justify] == :right
-                     scr.addstr(value.rjust(c[:render_size]))
+                     scr.mvaddstr(y, left_pad, value.rjust(c[:render_size]))
                   else
-                     scr.addstr(value.ljust(c[:render_size]))
+                     scr.mvaddstr(y, left_pad, value)
                   end
-               else
-                  scr.addstr(' ' * c[:render_size])
                end
+
+               left_pad += c[:render_size] + 1
             end
          end
-      end
+      end 
    end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ektoplayer
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.16
 platform: ruby
 authors:
 - Benjamin Abendroth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-25 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -64,10 +64,12 @@ files:
 - lib/ektoplayer/controllers/mainwindow.rb
 - lib/ektoplayer/controllers/playlist.rb
 - lib/ektoplayer/database.rb
+- lib/ektoplayer/download/externaldownload.rb
+- lib/ektoplayer/download/rubydownload.rb
 - lib/ektoplayer/events.rb
 - lib/ektoplayer/icurses.rb
 - lib/ektoplayer/icurses/curses.rb
-- lib/ektoplayer/icurses/ffi_ncurses.rb
+- lib/ektoplayer/icurses/ffi-ncurses.rb
 - lib/ektoplayer/icurses/ncurses.rb
 - lib/ektoplayer/icurses/ncursesw.rb
 - lib/ektoplayer/icurses/sugar.rb
@@ -123,8 +125,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- 'For playback: /bin/mpg123 or the "audite-lib" gem'
-- 'For archive extracting: /bin/unzip, /bin/7z or the "rubyzip" gem'
+- 'Playback: /bin/mpg123 or the "audite-lib" gem'
+- 'Archive unpacking: /bin/unzip, /bin/7z or the "rubyzip" gem'
 - 'One of these curses-gems: ffi-ncurses, ncurses, ncursesw, curses'
 rubyforge_project: 
 rubygems_version: 2.6.8