ektoplayer 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44752ed0ce943af8aeba6ed7af645b94e40b9a8a
-  data.tar.gz: b5796fa336978ab5c8c72fb3a6c732084aee5575
+  metadata.gz: 55540b5adfb0dec28702908ee968d434b802221a
+  data.tar.gz: 5f11aef936c061803e546ea22a431193fa106685
 SHA512:
-  metadata.gz: 268d0f386b0db1fb392c47ed61c3e1d7e16599776dd7d03e001b769ccd9e6b5cdd982d3fcb0d68796907e489708034765876c21d76c8df77a1f7496ebd201911
-  data.tar.gz: 9f30c21d456766c06d9e9c9d23f9a0f6a3cf4d773430b0f45ba521784fdf577eee89d85bb543f5d9bc4ee4f17bf0402387f3887ae98d40b4f0ec9a96d9e7781e
+  metadata.gz: '098d4f6de14917ac00d6321729827ca49469628b26d9a1b16ba3054660886893f6f5e7ef1837cdc3ebacae2703b8b56e835d6ecec5243ec5ee45bccc5ab8dff8'
+  data.tar.gz: 1bf895998e866f025d9b6d13775c0d32a9352c21a0aaa7fa6d4743885775444f43a741f86fc1a8288d8251d3ab35e7883aac23eb92471ab87df3e945c0d9ba63

data/README.md

@@ -1,9 +1,25 @@
 # Ektoplayer
 
-Ektoplayer is a console audio player for [ektoplazm.com](http://www.ektoplazm.com).
+Ektoplayer is a commandline client for [ektoplazm.com](http://www.ektoplazm.com), a website where you can listen and download freely licensed psytrance, techno and downtempo music. 
 
-![Screenshot 2017-03-16](http://pixelbanane.de/yafu/118231024/ekto1.png)
-![Screenshot 2017-03-16](http://pixelbanane.de/yafu/324630271/ekto2.png)
+It allows you to
+  * Search for tracks by tags (artist, album, style, ...)
+  * Play tracks located at ektoplazm.com
+  * Display information about albums
+  * Download a whole albums as mp3
+
+## Features
+
+  * Mouse support
+  * Vi-like keybindings (`hjkl`, `^d`, `^u`, `/`, `?`, `n`, `N`, ...)
+  * Up to 256 colors are supported
+  * Local sound file cache
+
+## Screenshots
+
+![Screenshot 2017-03-18](http://pixelbanane.de/yafu/1384751165/ekto1.gif)
+![Screenshot 2017-03-18](http://pixelbanane.de/yafu/3868182865/ekto2.gif)
+![Screenshot 2017-03-18](http://pixelbanane.de/yafu/2446075869/ekto3.gif)
 
 ## Requirements
 
@@ -28,17 +44,6 @@ library to compile the native extensions.
     apt-get install ruby ruby-dev portaudio19-dev libmpg123-dev sqlite3 libsqlite3-dev libncurses-dev libz1g-dev build-essential
     gem install ektoplayer
 
-## Features
-
-  * Listen to ektoplazm tracks
-  * Download whole albums
-  * Browse database by tags
-  * Vi keybindings (`hjkl`, `^d`, `^u`, `/`, `?`, `n`, `N`, ...)
-  * Mouse is supported
-  * Supports 256/16/mono colors
-  * Local sound file cache and download archive
-  * Highly configurable
-
 ## Authors
 
   * [Benjamin Abendroth](https://github.com/braph)
@@ -47,4 +52,3 @@ library to compile the native extensions.
 
   * Ektoplayer was inspired by [Soundcloud2000](https://github.com/grobie/soundcloud2000) and [ncmpcpp](https://github.com/arybczak/ncmpcpp)
   * It uses [Audite](https://github.com/georgi/audite) as playback engine and [Nokogiri](http://www.nokogiri.org/) for parsing HTML
-

data/lib/ektoplayer/application.rb

@@ -10,7 +10,7 @@ require 'date'
 
 module Ektoplayer
    class Application
-      VERSION = '0.1.2'.freeze
+      VERSION = '0.1.4'.freeze
       GITHUB_URL = 'https://github.com/braph/ektoplayer'.freeze
       EKTOPLAZM_URL = 'http://www.ektoplazm.com'.freeze
 
@@ -35,6 +35,7 @@ module Ektoplayer
 
       def run
          #Thread.abort_on_exception=(true)
+         Thread.report_on_exception=(true) rescue nil
 
          # make each configuration object globally accessible as a singleton
          [Config, Bindings, Theme].each { |c| Common::mksingleton(c) }
@@ -99,13 +100,15 @@ module Ektoplayer
             # next operations may take some time, espacially the ones
             # using the database (browser), so we put this inside a thread
             Thread.new do
+               begin
+
                # ... controllers ...
                view_ops = Operations::Operations.new
                Controllers::MainWindow.new(main_w, view_ops)
                Controllers::Browser.new(main_w.browser, browser, view_ops, operations)
                Controllers::Playlist.new(main_w.playlist, playlist, view_ops, operations)
                Controllers::Help.new(main_w.help, view_ops)
-               Controllers::Info.new(main_w.info, playlist, trackloader, database, view_ops)
+               Controllers::Info.new(main_w.info, player, playlist, trackloader, database, view_ops)
                main_w.progressbar.attach(player)
                main_w.volumemeter.attach(player)
                main_w.playinginfo.attach(playlist, player)
@@ -115,6 +118,20 @@ module Ektoplayer
                player.events.on(:stop) do |reason|
                   operations.send(:'playlist.play_next') if reason == :track_completed
                end
+               
+               if Config[:prefetch]
+                  trackloader_mutex = Mutex.new
+                  player.events.on(:position_change) do
+                     Thread.new do
+                        if player.length > 30 and player.position_percent > 0.8
+                           trackloader_mutex.synchronize do
+                              trackloader.get_track_file(playlist[playlist.get_next_pos]['url'])
+                              sleep 5
+                           end
+                        end
+                     end
+                  end
+               end
 
                # ... bindings ...
                Bindings.bind_view(:global, main_w, view_ops, operations)
@@ -135,6 +152,10 @@ module Ektoplayer
                   r = client.database.select(order_by: 'date', limit: n)
                   playlist.add(*r)
                end
+
+               rescue
+                  Application.log(self, $!)
+               end
             end
 
             UI::Canvas.update_screen

data/lib/ektoplayer/bindings.rb

@@ -41,6 +41,7 @@ module Ektoplayer
          reg 'playinginfo.toggle',        'Toggle playinginfo visibility'
          reg 'progressbar.toggle',        'Toggle progressbar visibility'
          reg 'volumemeter.toggle',        'Toggle volumemeter visibility'
+         reg 'tabbar.toggle',             'Toggle tabbar visibility'
 
          reg 'playlist.goto_current',     'Go to current playing track'
          reg 'playlist.clear',            'Delete all items in playlist'
@@ -78,7 +79,8 @@ module Ektoplayer
 
                :'playinginfo.toggle'      => [         Curses::KEY_F2        ],
                :'progressbar.toggle'      => [         Curses::KEY_F3        ],
-               :'volumemeter.toggle'      => [         Curses::KEY_F4        ],
+               :'tabbar.toggle'           => [         Curses::KEY_F4        ],
+               :'volumemeter.toggle'      => [         Curses::KEY_F5        ],
 
                :'player.forward'          => [?f,      Curses::KEY_RIGHT     ],
                :'player.backward'         => [?b,      Curses::KEY_LEFT      ],

data/lib/ektoplayer/config.rb

@@ -122,6 +122,9 @@ module Ektoplayer
          reg :use_cache,
             'Enable/disable local mp3 cache', true
 
+         reg :prefetch,
+            'Enable prefetching next track do be played', true
+
          reg :small_update_pages,
             'How many pages should be fetched after start', 5
 
@@ -177,8 +180,8 @@ module Ektoplayer
              'Format of second line in playinginfo', DEFAULT_PLAYINGINFO_FORMAT2,
              ColumnFormat.method(:parse_simple_format)
 
-         # - Tabs
-         reg 'tabs.show_tabbar',
+         # - Tabbar
+         reg 'tabbar.display',       
             'Enable/disable tabbar', true
 
          reg 'tabs.widgets', 'Specify widget order of tabbar (left to right)',
@@ -186,7 +189,7 @@ module Ektoplayer
             lambda { |v| v.split(/\s*,\s*/).map(&:to_sym) }
 
          reg 'main.widgets', 'Specify widgets to show (up to down)',
-            'playinginfo,progressbar,tabs,volumemeter',
+            'playinginfo,progressbar,tabbar,windows,volumemeter',
             lambda { |v| v.split(/\s*,\s*/).map(&:to_sym) }
       end
 

data/lib/ektoplayer/controllers/info.rb

@@ -5,9 +5,9 @@ require_relative 'controller'
 module Ektoplayer
    module Controllers
       class Info < Controller
-         def initialize(view, playlist, trackloader, database, view_operations)
+         def initialize(view, player, playlist, trackloader, database, view_operations)
             super(view)
-            view.attach(playlist, trackloader, database)
+            view.attach(player, playlist, trackloader, database)
             register = view_operations.with_register('info.')
             %w(up down page_up page_down top bottom).
                each { |op| register.(op, &view.method(op)) }

data/lib/ektoplayer/controllers/mainwindow.rb

@@ -6,13 +6,20 @@ module Ektoplayer
          def initialize(view, view_operations)
             super(view)
             ops = view_operations
-            ops.reg('splash.show')   { view.tabs.selected=(view.splash)   }
-            ops.reg('playlist.show') { view.tabs.selected=(view.playlist) }
-            ops.reg('browser.show')  { view.tabs.selected=(view.browser)  }
-            ops.reg('info.show')     { view.tabs.selected=(view.info)     }
-            ops.reg('help.show')     { view.tabs.selected=(view.help)     }
-            ops.reg('tabs.next')     { view.tabs.next                     }
-            ops.reg('tabs.prev')     { view.tabs.prev                     }
+            ops.reg('splash.show')   { view.windows.selected=(view.splash)   }
+            ops.reg('playlist.show') { view.windows.selected=(view.playlist) }
+            ops.reg('browser.show')  { view.windows.selected=(view.browser)  }
+            ops.reg('info.show')     { view.windows.selected=(view.info)     }
+            ops.reg('help.show')     { view.windows.selected=(view.help)     }
+            ops.reg('tabs.next')     { view.windows.select_next              }
+            ops.reg('tabs.prev')     { view.windows.select_prev              }
+
+            ops.reg('tabbar.toggle') do
+               view.with_lock do
+                  view.tabbar.visible=(!view.tabbar.visible?)
+                  view.want_layout
+               end
+            end
 
             ops.reg('playinginfo.toggle') do
                view.with_lock do
@@ -34,6 +41,14 @@ module Ektoplayer
                   view.want_layout
                end
             end
+
+            view.tabbar.events.on(:tab_clicked) do |index|
+               view.windows.selected_index=(index)
+            end
+
+            view.windows.events.on(:changed) do |index|
+               view.tabbar.selected=(index)
+            end
          end
       end
    end

data/lib/ektoplayer/database.rb

@@ -117,6 +117,14 @@ module Ektoplayer
             each { |t| @db.execute("DROP TABLE IF EXISTS #{t}") }
       end
 
+      def transaction
+         @db.transaction rescue Application.log(self, $!)
+      end
+
+      def commit
+         @db.commit rescue Application.log(self, $!)
+      end
+
       def insert_into(table, hash, mode: :insert)
          cols   = ?( + (hash.keys * ?,) + ?)
          values = ?( + (([??] * hash.size) * ?,) + ?)

data/lib/ektoplayer/events.rb

@@ -16,11 +16,13 @@ class Events
    # Disables auto creation of non existent events
    def no_auto_create 
       @map.default_proc = proc { |h,k| fail KeyError, "Unknown event: #{k}" }
+      self
    end
 
    # Enables auto creation of non existent events
    def auto_create
       @map.default_proc = proc { |h,k| h[k] = [] }
+      self
    end
 
    # Registers a new event
@@ -52,5 +54,7 @@ class Events
       if @map.key?(event)
          @map[event].each { |callback| callback.call(*args) }
       end
+   rescue
+      Ektoplayer::Application.log(self, 'event hook failed', $!)
    end
 end

data/lib/ektoplayer/theme.rb

@@ -8,7 +8,8 @@ module Ektoplayer
          @current = 0
          @theme = {
             0 =>   { default: [-1, -1].freeze,
-               :'url'                     => [-1, -1, :underline      ].freeze},
+               :'url'                     => [-1, -1, :underline      ].freeze,
+               :'tabbar.selected'         => [-1, -1, :bold           ].freeze},
             8 =>   { default: [-1, -1].freeze,
                :'url'                     => [:magenta, -1, :underline].freeze,
 
@@ -26,8 +27,8 @@ module Ektoplayer
                :'volumemeter.level'       => [:magenta                ].freeze,
                :'volumemeter.rest'        => [:black                  ].freeze,
 
-               :'tabs'                    => [:none                   ].freeze,
-               :'tab_selected'            => [:blue                   ].freeze,
+               :'tabbar.selected'         => [:blue                   ].freeze,
+               :'tabbar.unselected'       => [:none                   ].freeze,
 
                :'list.item_even'          => [:blue                   ].freeze,
                :'list.item_odd'           => [:blue                   ].freeze,
@@ -56,8 +57,8 @@ module Ektoplayer
                :'volumemeter.level'       => [:magenta                ].freeze,
                :'volumemeter.rest'        => [236                     ].freeze,
 
-               :'tabs'                    => [250                     ].freeze,
-               :'tab_selected'            => [75                      ].freeze,
+               :'tabbar.selected'         => [75                      ].freeze,
+               :'tabbar.unselected'       => [250                     ].freeze,
 
                :'list.item_even'          => [:blue                   ].freeze,
                :'list.item_odd'           => [25                      ].freeze,
@@ -77,10 +78,10 @@ module Ektoplayer
       def color_256(*args)   color(*args, theme: 256)   end
 
       def get(theme_def)     UI::Colors.get(theme_def)  end
-      alias :[] :get
+      def [](theme_def)      UI::Colors.get(theme_def)  end
 
       def use_colors(colors)
-         fail ArgumentError unless @theme[colors]
+         fail ArgumentError, 'unknown theme' unless @theme[colors]
          @current = colors
 
          UI::Colors.reset

data/lib/ektoplayer/trackloader.rb

@@ -55,6 +55,8 @@ module Ektoplayer
          end
 
          @downloads << dl.start!
+      rescue
+         Application.log(self, $!)
       end
 
       def get_track_file(url, reload: false)
@@ -97,6 +99,8 @@ module Ektoplayer
          @downloads << dl.start!
 
          return temp_file
+      rescue
+         Application.log(self, $!)
       end
    end
 
@@ -113,6 +117,8 @@ module Ektoplayer
       end
 
       def start!
+         Application.log(self, 'starting download: ', @url)
+
          Thread.new do
             begin
                http = Net::HTTP.new(@url.host, @url.port)
@@ -139,7 +145,7 @@ module Ektoplayer
          end
 
          sleep 0.1 while @total.nil?
-         sleep 0.1
+         sleep 0.2
          self
       end
    end

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

@@ -6,6 +6,7 @@ module UI
 
       def initialize(widgets: [], **opts)
          super(**opts)
+         events.register(:changed)
          @selected, @selected_index, @widgets = nil, nil, widgets
       end
 
@@ -24,6 +25,7 @@ module UI
             end
 
             @selected_index = index
+            trigger(@events, :changed, @selected_index)
             want_layout
          end
       end
@@ -39,6 +41,7 @@ module UI
             end
 
             @selected = widget
+            trigger(@events, :changed, @selected_index)
             want_layout
          end
       end
@@ -70,19 +73,19 @@ module UI
 
       def draw;     visible_widgets.each(&:draw)     end
       def refresh;  visible_widgets.each(&:refresh)  end
-      def layout;   visible_widgets.each(&:layout)   end
+      def layout;   @widgets.each(&:layout)   end
 
       def on_key_press(key)
          @selected.key_press(key) if @selected
          super(key)
       end
 
-      def next
+      def select_next
          return unless @selected
          self.selected_index=((@selected_index + 1) % @widgets.size)
       end
 
-      def prev
+      def select_prev
          return unless @selected
          return self.selected_index=(@widgets.size - 1) if @selected_index == 0
          self.selected_index=(@selected_index - 1)
@@ -122,4 +125,35 @@ module UI
          super
       end
    end
+
+   class SwitchContainer < GenericContainer
+      def layout
+         @widgets.each do |widget|
+            widget.with_lock do
+               widget.size=(@size)
+               widget.pos=(@pos)
+            end
+         end
+
+         super
+      end
+
+      def selected=(widget)
+         with_lock do
+            (@selected.invisible!) if @selected
+            super(widget)
+            (@selected.visible!) if @selected
+            want_layout
+         end
+      end
+
+      def selected_index=(index)
+         with_lock do
+            (@selected.invisible!) if @selected
+            super(index)
+            (@selected.visible!) if @selected
+            want_layout
+         end
+      end
+   end
 end

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

@@ -38,6 +38,8 @@ module UI
             height: @pad[:top] + @pad[:bottom] + 1 + @text.count(?\n),
             width:  @pad[:left] + @pad[:right] + @text.split(?\n).max.size
          ))
+
+         self
       end
    end
 end

data/lib/ektoplayer/ui/widgets.rb

@@ -3,8 +3,8 @@ module UI
       WANT_REFRESH, WANT_REDRAW, WANT_LAYOUT = 1, 2, 4
 
       attr_reader  :pos, :size
+      def events;          @events ||= Events.new.no_auto_create       end
       def keys;            @keys   ||= Events.new                      end
-      def events;          @events ||= Events.new                      end
       def mouse;           @mouse  ||= MouseEvents.new                 end
       def mouse_section;   @mouse_section ||= MouseSectionEvents.new   end
 
@@ -184,6 +184,32 @@ module UI
          self.pad_minrow=(new_minrow)
       end
 
+      def with_mouse_section_event
+         start_cursor = @win.cursor; yield
+
+         start_pos = UI::Point.new(
+            y: [start_cursor.y, @win.cursor.y].min,
+            x: [start_cursor.x, @win.cursor.x].min,
+         )
+         stop_pos = UI::Point.new(
+            y: [start_cursor.y, @win.cursor.y].max,
+            x: [start_cursor.x, @win.cursor.x].max
+         )
+
+         ev = UI::MouseSectionEvent.new(start_pos, stop_pos)
+         mouse_section.add(ev)
+         ev
+      end
+
+      def mouse_click(mevent)
+         if ev = mouse_event_transform(mevent)
+            ev.x += @pad_mincol
+            ev.y += @pad_minrow
+            trigger(@mouse, ev)
+            trigger(@mouse_section, ev)
+         end
+      end
+
       def refresh
          @win.noutrefresh(
             @pad_minrow, @pad_mincol,

data/lib/ektoplayer/ui.rb

@@ -30,7 +30,7 @@ module UI
             each {|_|Curses.send(_)}
          Curses.mousemask(Curses::ALL_MOUSE_EVENTS)
          Curses.stdscr.keypad(true)
-         [UI::Colors, UI::Input].each(&:start)
+         UI::Colors.start
 
          self.enable_resize_detection
       end
@@ -66,6 +66,8 @@ module UI
          Curses.clear
          Curses.addstr('terminal too small!')
          Curses.refresh
+      rescue
+         nil
       end
 
       def self.sub(cls, **opts)
@@ -92,6 +94,8 @@ module UI
             rescue UI::WidgetSizeError
                Curses.clear
                Curses.addstr('terminal too small!')
+            rescue
+               Application.log(self, $!)
             end
 
             Curses.doupdate
@@ -115,26 +119,19 @@ module UI
       KEYMAP_WORKAROUND.default_proc = proc { |h,k| k }
       KEYMAP_WORKAROUND.freeze
 
-      def self.start
-         @@mode = :curses
-         Readline.input, @@readline_in_write = IO.pipe
-         Readline.output = File.open(File::NULL, ?w)
-      end
-
       #def self.getch(timeout=-1)
       #   KEYMAP_WORKAROUND[@@widget.getch(timeout)]
       #end
 
       def self.start_loop
-         @@readline_mutex ||= Mutex.new
-         @@readline_cond  ||= ConditionVariable.new
+         @@readline_obj ||= ReadlineWindow.new
 
          loop do
-            if @@mode == :curses
+            unless @@readline_obj.active?
                Curses.curs_set(0)
                Curses.nonl
 
-               while @@mode == :curses
+               begin
                   UI::Canvas.widget.win.keypad=(true)
                   c = KEYMAP_WORKAROUND[UI::Canvas.widget.win.getch1]
 
@@ -145,65 +142,79 @@ module UI
                   elsif c # (not nil)
                      UI::Canvas.widget.key_press(c.is_a?(Integer) ? c : c.to_sym)
                   end
-               end
+               end while !@@readline_obj.active?
             else
                Curses.curs_set(1)
                Curses.nl
 
-               while @@mode == :readline
+               begin
                   win = UI::Canvas.widget.win
                   win.keypad=(false)
-                  c = win.getch1
+                  next unless (c = win.getch1)
 
                   if c == 10 or c == 4
-                     @@readline_thread.kill rescue nil
-                     @@mode = :curses
+                     @@readline_obj.feed(?\n)
                   else
-                     @@readline_in_write.write(c.chr)
+                     @@readline_obj.feed(c.chr)
 
                      if c == 27 # pass 3-character escape sequence
                         if c = win.getch1(1)
-                           @@readline_in_write.write(c.chr)
+                           @@readline_obj.feed(c.chr)
                            if c = win.getch1(1)
-                              @@readline_in_write.write(c.chr)
+                              @@readline_obj.feed(c.chr)
                            end
                         end
                      end
                   end
-
-                  @@readline_cond.signal
-               end
+               end while @@readline_obj.active?
             end
          end
       end
 
-      def self.readline(pos, size, prompt: '', add_hist: false)
-         @@mode = :readline
+      def self.readline(*args, **opts, &block)
+         (@@readline_obj ||= ReadlineWindow.new).readline(*args, **opts, &block)
+      end
+   end
 
-         Readline.set_screen_size(size.height, size.width)
-         @@readline_thread ||= Thread.new do
-            begin
-               window = Curses::Window.new(size.height, size.width, pos.y, pos.x)
-               rl_thread = Thread.new { Readline.delete_text; Readline.readline }
-
-               while rl_thread.alive?
-                  buffer = "#{prompt}#{Readline.line_buffer}"
-                  window.erase
-                  window << buffer[(buffer.size - size.width).clamp(0, buffer.size)..-1]
-                  window.cursor=(Point.new(x: Readline.point + prompt.size, y: 0))
-                  window.refresh
-                  @@readline_mutex.synchronize { @@readline_cond.wait(@@readline_mutex, 0.3) }
-               end
-            ensure
-               rl_thread.kill
-               window.clear
-               yield Readline.line_buffer
-               @@mode = :curses
-               @@readline_thread = nil
-               Canvas.update_screen(true)
+   class ReadlineWindow
+      def initialize
+         @mutex, @cond = Mutex.new, ConditionVariable.new
+         Readline.input, @readline_in_write = IO.pipe
+         Readline.output = File.open(File::NULL, ?w)
+         @thread = nil
+      end
+
+      def active?; @thread; end
+
+      def readline(pos, size, prompt: '', add_hist: false, &block)
+         @thread ||= Thread.new do
+            window = Curses::Window.new(size.height, size.width, pos.y, pos.x)
+
+            Readline.set_screen_size(size.height, size.width)
+            Readline.delete_text
+            rlt = Thread.new { Readline.readline(prompt, add_hist) }
+
+            while rlt.alive?
+               window.erase
+               buffer = "#{prompt}#{Readline.line_buffer}"
+               window << buffer[(buffer.size - size.width).clamp(0, buffer.size)..-1]
+               window.cursor=(Point.new(x: Readline.point + prompt.size, y: 0))
+               window.refresh
+               @mutex.synchronize { @cond.wait(@mutex, 0.2) }
             end
+
+            window.clear
+            block.(Readline.line_buffer)
+            UI::Canvas.update_screen(true)
+            @thread = nil
          end
       end
+
+      def feed(c)
+         @readline_in_write.write(c)
+         @cond.signal
+         @thread = nil if c == ?\n
+      end
    end
 
    class Output

data/lib/ektoplayer/updater.rb

@@ -22,6 +22,7 @@ module Ektoplayer
       def update(start_url: FREE_MUSIC_URL, pages: 0, parallel: 10)
          queue = parallel > 0 ? SizedQueue.new(parallel) : Queue.new 
          insert_browserpage(bp = BrowsePage.new(start_url))
+         results = Queue.new
 
          if pages > 0
             bp.page_urls[(bp.current_page_index + 1)..(bp.current_page_index + pages + 1)]
@@ -30,13 +31,26 @@ module Ektoplayer
          end.
          each do |url|
             queue << Thread.new do
-               insert_browserpage(BrowsePage.new(url))
+               results << BrowsePage.new(url)
                queue.pop # unregister our thread
+            end.priority=(-10)
+
+            if results.size > 40
+               @db.transaction
+               40.times { insert_browserpage(results.pop(true)) }
+               @db.commit
             end
          end
 
          sleep 1 while not queue.empty?
-      rescue Application.log(self, $!)
+
+         @db.transaction
+         while (result = queue.pop(true) rescue nil)
+            insert_browserpage(result)
+         end
+         @db.commit
+      rescue
+         Application.log(self, $!)
       end
 
       private def insert_browserpage(browserpage)
@@ -45,7 +59,8 @@ module Ektoplayer
          end
 
          browserpage.albums.each { |album| insert_album album }
-      rescue Application.log(self, $!)
+      rescue
+         Application.log(self, $!)
       end
 
       private def insert_album(album)
@@ -72,6 +87,8 @@ module Ektoplayer
             track_r[:album_url] = album[:url]
             @db.replace_into(:tracks, track_r)
          end
+      rescue
+         Application.log(self, $!)
       end
    end
 end

data/lib/ektoplayer/views/info.rb

@@ -1,5 +1,4 @@
 require_relative '../ui/widgets'
-require_relative '../bindings'
 require_relative '../theme'
 require_relative '../common'
 
@@ -16,12 +15,13 @@ module Ektoplayer
 
    module Views
       class Info < UI::Pad
-         def attach(playlist, trackloader, database)
-            @playlist, @trackloader, @database = playlist, trackloader, database
+         def attach(player, playlist, trackloader, database)
+            @player, @playlist, @trackloader, @database =
+               player, playlist, trackloader, database
 
             Thread.new do
                loop { sleep 1; with_lock { want_redraw } }
-            end
+            end.priority=(-10)
          end
 
          def draw_heading(heading)
@@ -77,33 +77,9 @@ module Ektoplayer
             end
          end
 
-         def with_mouse_section_event
-            start_cursor = @win.cursor; yield
-
-            start_pos = UI::Point.new(
-               y: [start_cursor.y, @win.cursor.y].min,
-               x: [start_cursor.x, @win.cursor.x].min,
-            )
-            stop_pos = UI::Point.new(
-               y: [start_cursor.y, @win.cursor.y].max,
-               x: [start_cursor.x, @win.cursor.x].max
-            )
-
-            ev = UI::MouseSectionEvent.new(start_pos, stop_pos)
-            mouse_section.add(ev)
-            ev
-         end
-
-         def mouse_click(mevent)
-            if ev = mouse_event_transform(mevent)
-               ev.x += @pad_mincol
-               ev.y += @pad_minrow
-               trigger(@mouse, ev)
-               trigger(@mouse_section, ev)
-            end
-         end
-
          def draw
+            return unless @player
+
             self.pad_size=(UI::Size.new(
                height: 200,
                width:  [@size.width, MIN_WIDTH].max
@@ -121,7 +97,7 @@ module Ektoplayer
                draw_tag('Artist', @track['artist'])
                draw_tag('Album',  @track['album'])
                draw_tag('BPM',    @track['bpm'])
-               draw_tag('Length', Common::to_time(@length))
+               draw_tag('Length', Common::to_time(@player.length))
                @win.next_line
 
                draw_heading('Current album')
@@ -137,7 +113,7 @@ module Ektoplayer
                   draw_tag('Posted by');   draw_url(url, @track['posted_by'])
                end
 
-               draw_tag('Styles',       @track['styles'].sub(?,, ', '))
+               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(@track['cover_url'], 'Cover')

data/lib/ektoplayer/views/mainwindow.rb

@@ -1,61 +1,52 @@
-%w( ../ui/widgets/tabbedcontainer playinginfo progressbar
-volumemeter splash playlist browser info help ).
+%w( ../ui/widgets/container playinginfo progressbar
+volumemeter splash playlist browser info help tabbar ).
    each {|_|require_relative(_)}
 
 module Ektoplayer
    module Views
       class MainWindow < UI::VerticalContainer
-         attr_reader :progressbar, :volumemeter, :playinginfo
-         attr_reader :tabs, :splash, :playlist, :browser, :info, :help
+         attr_reader :progressbar, :volumemeter, :playinginfo, :tabbar
+         attr_reader :windows, :splash, :playlist, :browser, :info, :help
 
          def initialize(**opts)
             super(**opts)
 
-            s1 = UI::Size.new(height: 1, width: 1) # TODO.....!!
-
             @playinginfo  = sub(PlayingInfo)
             @progressbar  = sub(ProgressBar)
             @volumemeter  = sub(VolumeMeter)
-            @tabs         = sub(UI::TabbedContainer)
-            @help         = @tabs.sub(Help, size: s1, visible: false)
-            @info         = @tabs.sub(Info, size: s1, visible: false)
-            @splash       = @tabs.sub(Splash, size: s1, visible: false)
-            @browser      = @tabs.sub(Browser, size: s1, visible: false)
-            @playlist     = @tabs.sub(Playlist, size: s1, visible: false)
-
-            @tabs.attributes=(
-               %w(tab_selected tabs).map do |attr|
-                  [attr.to_sym, Theme[attr.to_sym]]
-               end.to_h
-            )
+            @tabbar       = sub(TabBar)
+            @windows      = sub(UI::SwitchContainer)
+            @help         = @windows.sub(Help, visible: false)
+            @info         = @windows.sub(Info, visible: false)
+            @splash       = @windows.sub(Splash, visible: false)
+            @browser      = @windows.sub(Browser, visible: false)
+            @playlist     = @windows.sub(Playlist, visible: false)
 
             Config[:'tabs.widgets'].each do |widget|
-               @tabs.add(send(widget), widget)
+               @windows.add(send(widget))
+               @tabbar.add(widget)
             end
 
             Config[:'main.widgets'].each { |w| add(send(w)) }
-            self.selected=(@tabs)
+
+            @windows.selected=(@splash)
+            self.selected=(@windows)
          end
 
          def layout
             height = @size.height
 
-            if @playinginfo.visible?
-               @playinginfo.size=(@size.update(height: 2))
-               height -= 2
-            end
+            @playinginfo.size=(@size.update(height: 2))
+            @volumemeter.size=(@size.update(height: 1))
+            @progressbar.size=(@size.update(height: 1))
+            @tabbar.size=(@size.update(height: 1))
 
-            if @volumemeter.visible?
-               @volumemeter.size=(@size.update(height: 1))
-               height -= 1
-            end
-
-            if @progressbar.visible?
-               @progressbar.size=(@size.update(height: 1))
-               height -= 1
-            end
+            height -= 2 if @playinginfo.visible?
+            height -= 1 if @volumemeter.visible?
+            height -= 1 if @progressbar.visible?
+            height -= 1 if @tabbar.visible?
 
-            @tabs.size=(@size.update(height: height))
+            @windows.size=(@size.update(height: height))
 
             super
          end

data/lib/ektoplayer/views/tabbar.rb

@@ -0,0 +1,53 @@
+require_relative '../ui/widgets'
+require_relative '../theme'
+
+module Ektoplayer
+   module Views
+      class TabBar < UI::Pad
+         def initialize(**opts)
+            super(**opts)
+            events.register(:tab_clicked)
+            @selected, @tabs = 0, []
+         end
+
+         def add(title)
+            with_lock do
+               @tabs << title
+               want_redraw
+            end
+         end
+
+         def selected=(index)
+            index = index.clamp(0, @tabs.size - 1)
+            return if index == @selected
+
+            with_lock do
+               @selected = index
+               want_redraw
+            end
+         end
+
+         def draw
+            self.pad_size=(@size.update(height: 1))
+            mouse_section.clear
+            @win.erase
+            @win.setpos(0,0)
+
+            @tabs.each_with_index do |title, i|
+               mevent = with_mouse_section_event do
+                  if i == @selected
+                     @win.with_attr(Theme[:'tabbar.selected']) { @win << title.to_s }
+                  else
+                     @win.with_attr(Theme[:'tabbar.unselected']) { @win << title.to_s }
+                  end
+
+                  @win.addch(' ')
+               end
+               mevent.on(Curses::BUTTON1_CLICKED) do
+                  trigger(@events, :tab_clicked, i)
+               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.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Benjamin Abendroth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-19 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audite
@@ -80,7 +80,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-description: Console audio player for ektoplazm.com
+description: Ektoplayer is a commandline client for http://ektoplazm.com, a website
+  providing free electronic music such as techno, goa and psy-trance
 email: braph93@gmx.de
 executables:
 - ektoplayer
@@ -126,7 +127,6 @@ files:
 - lib/ektoplayer/ui/widgets/container.rb
 - lib/ektoplayer/ui/widgets/labelwidget.rb
 - lib/ektoplayer/ui/widgets/listwidget.rb
-- lib/ektoplayer/ui/widgets/tabbedcontainer.rb
 - lib/ektoplayer/updater.rb
 - lib/ektoplayer/views/browser.rb
 - lib/ektoplayer/views/help.rb
@@ -136,9 +136,10 @@ files:
 - lib/ektoplayer/views/playlist.rb
 - lib/ektoplayer/views/progressbar.rb
 - lib/ektoplayer/views/splash.rb
+- lib/ektoplayer/views/tabbar.rb
 - lib/ektoplayer/views/trackrenderer.rb
 - lib/ektoplayer/views/volumemeter.rb
-homepage: http://www.github.com/braph/ektoplayer
+homepage: http://github.com/braph/ektoplayer
 licenses:
 - GPL-3.0
 metadata: {}
@@ -161,5 +162,5 @@ rubyforge_project:
 rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: play music from ektoplazm.com
+summary: play or download music from ektoplazm.com
 test_files: []

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

@@ -1,110 +0,0 @@
-require_relative 'container'
-require_relative 'labelwidget'
-
-module UI
-   class TabbedContainer < GenericContainer
-      attr_reader :show_tabbar, :attributes
-
-      def initialize(**opts)
-         super(**opts)
-         @show_tabbar = true
-         @tabbar = sub(HorizontalContainer)
-         @attributes = Hash.new { 0 }
-      end
-
-      def show_tabbar=(new)
-         return if @show_tabbar == new
-         with_lock { @show_tabbar = new; want_refresh }
-      end
-
-      def layout
-         if @show_tabbar
-            @tabbar.with_lock do
-               @tabbar.visible!
-               @tabbar.pos=(@pos)
-               @tabbar.size=(@size.update(height: 1))
-            end
-
-            if @selected
-               @selected.with_lock do
-                  @selected.size=(@size.calc(height: -1))
-                  @selected.pos=(@pos.calc(y: 1))
-               end
-            end
-         else
-            if @selected
-               @selected.with_lock do
-                  @selected.size=(@size)
-                  @selected.pos=(@pos)
-               end
-            end
-         end
-
-         super
-      end
-
-      def attributes=(new)
-         return if @attributes == new
-         with_lock { @attributes.update(new); update_tabbar }
-      end
-
-      def visible_widgets
-         return [@tabbar, @selected] if @show_tabbar and @selected
-         return [@selected]          if @selected
-         return [@tabbar]            if @show_tabbar
-         return []
-      end
-
-      def add(widget, title)
-         with_lock do
-            super(widget)
-            tab = @tabbar.sub(LabelWidget, text: title, pad: {left: 1})
-            tab.fit
-            tab.mouse.on_all { self.selected=(widget) }
-            @tabbar.add(tab)
-            update_tabbar
-         end
-      end
-
-      def remove(widget)
-         with_lock do
-            index = @widgets.index(widget) or fail KeyError
-            @tabbar.remove(@tabbar.widgets[index])
-            super(widget)
-            update_tabbar
-         end
-      end
-
-      def selected=(widget)
-         with_lock do
-            (@selected.invisible!) if @selected
-            super(widget)
-            (@selected.visible!) if @selected
-            update_tabbar
-            want_layout
-         end
-      end
-
-      def selected_index=(index)
-         with_lock do
-            (@selected.invisible!) if @selected
-            super(index)
-            update_tabbar
-            (@selected.visible!) if @selected
-            want_layout
-         end
-      end
-
-      private def update_tabbar
-         with_lock do
-            @tabbar.widgets.each_with_index do |tab, i|
-               if @widgets[i].equal?(@selected)
-                  tab.attributes=(@attributes[:'tab_selected'])
-               else
-                  tab.attributes=(@attributes[:'tabs'])
-               end
-            end
-         end
-      end
-   end
-end