ektoplayer 0.1.6 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f582176b442c800e228430df528410b4da17417
-  data.tar.gz: 79c3b9f12acb319956f5d47aa98ca00795ed73ca
+  metadata.gz: 54b54fea7b6eb4691e5c49ddddd3b9d46df9a591
+  data.tar.gz: 82b7a0d329781ac90e61671a7e89c5b3cf7002c3
 SHA512:
-  metadata.gz: 1772fa75068b45cb11c0ae4dad2e060459eab414f05a93adf774ccb2451b1918c11a915c0d367369006dd66d9a2cf054ff9ac5e83463994ab7c0c9675e3816dd
-  data.tar.gz: 06e9ac4671e584d4a647e3b88939c4154fa90719e05a6e0535728c535e760430430c44463aa0c4c93ffe2d778b2834ac3b455a388a2c03ee6af9b202282c4448
+  metadata.gz: 2015220c85d70a99d0c1c1fddc255781e19c1eba905a185371e1c465d08d4c31f1c300de772bd9cbf2ffc61683443a4cad3eda426ed6de91acc83ffc0b930806
+  data.tar.gz: a35820777f4373bd8587bd61fa56d66ed2b02483c49ee3ab2f671b4448cadb700ab7a8da4683d1f4874f101d18da58e1bc4dc9ec78d7dcd5ffb8e7a8282ebcd3

data/README.md

@@ -6,7 +6,7 @@ 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
+  * Download whole albums as mp3
 
 ## Features
 
@@ -26,29 +26,44 @@ It allows you to
 ## Requirements
 
   * Ruby (1.9)
-  * Portaudio (19)
   * Mpg123 (1.14)
-  * LibZip
   * Sqlite3 
+  * One of the following ncurses gems: curses, ffi-ncurses, ncurses, ncuresw
 
-## Installation
+## Optional Requirements
+
+  * For extracting album archives either `unzip`, `7z` or the Gem `RubyZip` is needed
 
-Assuming you have Ruby/Rubygems installed, you need portaudio and mpg123 as
-library to compile the native extensions.
+## Installation
 
 ### Arch Linux
 
-    pacman -S ruby portaudio mpg123 sqlite3 ncurses zlib base-devel --needed
-    gem install ektoplayer
+  * Using yaourt:
+   `yaourt -S ektoplayer`
+
+  * Using pacman:
+   `pacman -S ruby mpg123 sqlite3 ncurses --needed`
+   `gem install ektoplayer`
 
 ### Debian / Ubuntu (not yet tested)
 
-    apt-get install ruby ruby-dev portaudio19-dev libmpg123-dev sqlite3 libsqlite3-dev libncurses-dev libz1g-dev build-essential
-    gem install ektoplayer
+    `apt-get install ruby ruby-ncurses ruby-nokogiri ruby-sqlite3 mpg123 sqlite3 libncurses5`
+    `gem install ektoplayer`
 
 ## Configuration
 
-Have a look at the default [ektoplayer.rc](https://github.com/braph/ektoplayer/blob/master/doc/ektoplayer.rc).
+Ektplayer keeps it's default configuration file under `~/.config/ektoplayer/ektoplayer.rc`.
+
+Available configuration commands:
+   * `set <option> <value>`
+   * `bind <window> <key> <command>`
+   * `undbind <window> <key>`
+   * `unbind_all`
+   * `color <name> <fg> [<bg> [<attribute> ...]]`
+   * `color_mono <name> <fg> [<bg> [<attribute> ...]]`
+   * `color_256 <name> <fg> [<bg> [<attribute> ...]]`
+
+See [ektoplayer.rc](https://github.com/braph/ektoplayer/blob/master/doc/ektoplayer.rc) for a configuration file with the default values.
 
 ## Authors
 
@@ -57,4 +72,3 @@ Have a look at the default [ektoplayer.rc](https://github.com/braph/ektoplayer/b
 ## See also
 
   * 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.6'.freeze
+      VERSION = '0.1.11'.freeze
       GITHUB_URL = 'https://github.com/braph/ektoplayer'.freeze
       EKTOPLAZM_URL = 'http://www.ektoplazm.com'.freeze
 
@@ -35,7 +35,7 @@ module Ektoplayer
 
       def run
          #Thread.abort_on_exception=(true)
-         Thread.report_on_exception=(true) if Thread.public_method_defined? :report_on_exception
+         Thread.report_on_exception=(true) if Thread.respond_to? :report_on_exception
 
          # make each configuration object globally accessible as a singleton
          [Config, Bindings, Theme].each { |c| Common::mksingleton(c) }
@@ -69,8 +69,10 @@ module Ektoplayer
          end
 
          UI::Canvas.run do
+            Application.log(self, 'running with ncurses interface:', $USING_CURSES)
+
             if Config[:use_colors] == :auto
-               Theme.use_colors(ENV['TERM'] =~ /256/ ? 256 : 8)
+               Theme.use_colors(ICurses.colors >= 256 ? 256 : 8)
             else
                Theme.use_colors(Config[:use_colors])
             end
@@ -89,7 +91,7 @@ module Ektoplayer
             operations.register(:quit,    &method(:exit))
             operations.register(:reload,  &browser.method(:reload))
             operations.register(:update,  &database.method(:update))
-            operations.register(:refresh) { UI::Canvas.on_winch; UI::Canvas.update_screen(true) }
+            operations.register(:refresh) { UI::Canvas.update_screen(true, true) }
             Operations::Player.new(operations, player)
             Operations::Browser.new(operations, browser, playlist)
             Operations::Playlist.new(operations, playlist, player, trackloader)
@@ -110,7 +112,6 @@ module Ektoplayer
                Controllers::Help.new(main_w.help, 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)
 
                # ... events ...

data/lib/ektoplayer/bindings.rb

@@ -1,5 +1,5 @@
 require 'set'
-require 'curses'
+require_relative 'icurses'
 
 module Ektoplayer
    # Keybinding storage.
@@ -21,10 +21,10 @@ module Ektoplayer
       def initialize
          @commands = {}
 
-         reg 'quit',    'Quit the program'
-         reg 'refresh', 'Refresh the screen'
-         reg 'reload',  'Apply database changes to browser'
-         reg 'update',  'Start a database update'
+         reg 'quit',                      'Quit the program'
+         reg 'refresh',                   'Refresh the screen'
+         reg 'reload',                    'Apply database changes to browser'
+         reg 'update',                    'Start a database update'
 
          reg 'player.stop',               'Stop playing'
          reg 'player.toggle',             'Toggle play/pause'
@@ -40,7 +40,6 @@ 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'
@@ -64,7 +63,8 @@ module Ektoplayer
          end
 
          { search_up: 'Start search upwards',     search_next: 'Goto next search result',
-           search_down: 'Start search downwards', search_prev: 'Goto previous search result'
+           search_down: 'Start search downwards', search_prev: 'Goto previous search result',
+           toggle_selection:  'Toggle multi line selection',
          }.each do |cmd, desc|
             %w(browser playlist).each { |w| reg("#{w}.#{cmd}", desc) }
          end
@@ -75,22 +75,21 @@ module Ektoplayer
                :'playlist.show'           => [?1                             ],
                :'browser.show'            => [?2                             ],
                :'info.show'               => [?3                             ],
-               :'help.show'               => [?4,      Curses::KEY_F1        ],
+               :'help.show'               => [?4,      ICurses::KEY_F1       ],
 
-               :'playinginfo.toggle'      => [?!,      Curses::KEY_F2        ],
-               :'progressbar.toggle'      => [?%,      Curses::KEY_F3        ],
-               :'tabbar.toggle'           => [?=,      Curses::KEY_F4        ],
-               :'volumemeter.toggle'      => [?~,      Curses::KEY_F5        ],
+               :'playinginfo.toggle'      => [?!,      ICurses::KEY_F2       ],
+               :'progressbar.toggle'      => [?%,      ICurses::KEY_F3       ],
+               :'tabbar.toggle'           => [?=,      ICurses::KEY_F4       ],
 
-               :'player.forward'          => [?f,      Curses::KEY_RIGHT     ],
-               :'player.backward'         => [?b,      Curses::KEY_LEFT      ],
+               :'player.forward'          => [?f,      ICurses::KEY_RIGHT    ],
+               :'player.backward'         => [?b,      ICurses::KEY_LEFT     ],
                :'player.stop'             => [?s                             ],
                :'player.toggle'           => [?p                             ],
 
                :'playlist.play_next'      => [?>                             ],
                :'playlist.play_prev'      => [?<                             ],
 
-               :'tabs.next'               => [?l, ?}, 9                      ],
+               :'tabs.next'               => [?l, ?}, '^i'                   ],
                :'tabs.prev'               => [?h, ?{, 353                    ],
 
                :quit                      => [?q                             ],
@@ -99,19 +98,21 @@ module Ektoplayer
                :update                    => [?U                             ]},
             playlist: {
                # movement
-               :'playlist.top'            => [?g,      Curses::KEY_HOME      ],
-               :'playlist.bottom'         => [?G,      Curses::KEY_END       ],
-               :'playlist.up'             => [?k,      Curses::KEY_UP        ],
-               :'playlist.down'           => [?j,      Curses::KEY_DOWN      ],
-               :'playlist.page_down'      => ['^d',    Curses::KEY_NPAGE     ],
-               :'playlist.page_up'        => ['^u',    Curses::KEY_PPAGE     ],
+               :'playlist.top'            => [?g,      ICurses::KEY_HOME     ],
+               :'playlist.bottom'         => [?G,      ICurses::KEY_END      ],
+               :'playlist.up'             => [?k,      ICurses::KEY_UP       ],
+               :'playlist.down'           => [?j,      ICurses::KEY_DOWN     ],
+               :'playlist.page_down'      => ['^d',    ICurses::KEY_NPAGE    ],
+               :'playlist.page_up'        => ['^u',    ICurses::KEY_PPAGE    ],
+               # selection
+               :'playlist.toggle_selection' => ['^v'                         ],
                # search
                :'playlist.search_next'    => [?n                             ],
                :'playlist.search_prev'    => [?N                             ],
                :'playlist.search_up'      => [??                             ],
                :'playlist.search_down'    => [?/                             ],
                # playlist
-               :'playlist.play'           => [         Curses::KEY_ENTER     ],
+               :'playlist.play'           => [         ICurses::KEY_ENTER    ],
                :'playlist.download_album' => [?$                             ],
                :'playlist.reload'         => [?r                             ],
                :'playlist.goto_current'   => [?o                             ],
@@ -121,12 +122,14 @@ module Ektoplayer
                :'player.toggle'           => [' '                            ]},
             browser: {
                # movement
-               :'browser.top'             => [?g,      Curses::KEY_HOME      ],
-               :'browser.bottom'          => [?G,      Curses::KEY_END       ],
-               :'browser.up'              => [?k,      Curses::KEY_UP        ],
-               :'browser.down'            => [?j,      Curses::KEY_DOWN      ],
-               :'browser.page_up'         => ['^u',    Curses::KEY_PPAGE     ],
-               :'browser.page_down'       => ['^d',    Curses::KEY_NPAGE     ],
+               :'browser.top'             => [?g,      ICurses::KEY_HOME     ],
+               :'browser.bottom'          => [?G,      ICurses::KEY_END      ],
+               :'browser.up'              => [?k,      ICurses::KEY_UP       ],
+               :'browser.down'            => [?j,      ICurses::KEY_DOWN     ],
+               :'browser.page_up'         => ['^u',    ICurses::KEY_PPAGE    ],
+               :'browser.page_down'       => ['^d',    ICurses::KEY_NPAGE    ],
+               # selection
+               :'browser.toggle_selection' => ['^v'                          ],
                # search
                :'browser.search_next'     => [?n                             ],
                :'browser.search_prev'     => [?N                             ],
@@ -134,22 +137,22 @@ module Ektoplayer
                :'browser.search_down'     => [?/                             ],
                # browser
                :'browser.add_to_playlist' => [' ', ?a                        ],
-               :'browser.enter'           => [         Curses::KEY_ENTER     ],
-               :'browser.back'            => [?B,      Curses::KEY_BACKSPACE ]},
+               :'browser.enter'           => [         ICurses::KEY_ENTER    ],
+               :'browser.back'            => [?B,      ICurses::KEY_BACKSPACE ]},
             help: {
-               :'help.top'                => [?g,      Curses::KEY_HOME      ],
-               :'help.bottom'             => [?G,      Curses::KEY_END       ],
-               :'help.up'                 => [?k,      Curses::KEY_UP        ],
-               :'help.down'               => [?j,      Curses::KEY_DOWN      ],
-               :'help.page_up'            => ['^u',    Curses::KEY_PPAGE     ],
-               :'help.page_down'          => ['^d',    Curses::KEY_NPAGE     ]},
+               :'help.top'                => [?g,      ICurses::KEY_HOME     ],
+               :'help.bottom'             => [?G,      ICurses::KEY_END      ],
+               :'help.up'                 => [?k,      ICurses::KEY_UP       ],
+               :'help.down'               => [?j,      ICurses::KEY_DOWN     ],
+               :'help.page_up'            => ['^u',    ICurses::KEY_PPAGE    ],
+               :'help.page_down'          => ['^d',    ICurses::KEY_NPAGE    ]},
             info: {
-               :'info.top'                => [?g,      Curses::KEY_HOME      ],
-               :'info.bottom'             => [?G,      Curses::KEY_END       ],
-               :'info.up'                 => [?k,      Curses::KEY_UP        ],
-               :'info.down'               => [?j,      Curses::KEY_DOWN      ],
-               :'info.page_up'            => ['^u',    Curses::KEY_PPAGE     ],
-               :'info.page_down'          => ['^d',    Curses::KEY_NPAGE     ]},
+               :'info.top'                => [?g,      ICurses::KEY_HOME     ],
+               :'info.bottom'             => [?G,      ICurses::KEY_END      ],
+               :'info.up'                 => [?k,      ICurses::KEY_UP       ],
+               :'info.down'               => [?j,      ICurses::KEY_DOWN     ],
+               :'info.page_up'            => ['^u',    ICurses::KEY_PPAGE    ],
+               :'info.page_down'          => ['^d',    ICurses::KEY_NPAGE    ]},
             splash: {}
          }
 
@@ -163,30 +166,33 @@ module Ektoplayer
       end
 
       def keyname(key)
-         return 'SPACE'  if key.to_s == ' '
-         return key.to_s if key.is_a? Symbol
+         return 'SPACE'  if (key == ' ' or key == 32)
 
-         name = Curses.keyname(key)
+         name = ICurses.keyname(key)
          if name.start_with? 'KEY_'
-            name.sub('KEY_', '').sub(/\((\d+)\)/, '\1')
+            name.sub('KEY_', '').delete('()')
          else
             name
          end
       end
 
       def parse_key(key)
-         if key.is_a? Integer
-            key
-         elsif key.size == 1
-            key.to_sym
-         elsif key.size == 2 and key.start_with?(?^)
-            Curses.const_get("KEY_CTRL_#{key[1].upcase}")
+         return key if key.is_a? Integer
+         
+         if key.size == 1
+            return key.ord
+         elsif key.size == 2 and key[0] == ?^
+            return key[1].upcase.ord - 64
          elsif key =~ /^(key_)?space$/i
-            :' '
-         else
+            return ' '.ord
+         end
+
+         begin
+            return Integer(key) 
+         rescue
             key = key.upcase.tr(?-, ?_)
             key = "KEY_#{key}" unless key.start_with?('KEY_')
-            Curses.const_get(key)
+            return ICurses.const_get(key)
          end
       rescue NameError
          fail "Unknown key: #{key}"

data/lib/ektoplayer/common.rb

@@ -1,5 +1,5 @@
-require 'zip'
 require 'thread'
+require 'open3'
 
 class ConditionSignals
    def initialize
@@ -39,10 +39,6 @@ class ConditionSignals
    end
 end
 
-class Object
-   alias :frz :freeze
-end
-
 class Dir
    def Dir.size(path)
       Dir.glob(File.join(path, '**', ?*)).map { |f| File.size(f) }.sum
@@ -83,13 +79,30 @@ module Common
          )
       end
    end
-
+   
    def self.extract_zip(zip_file, dest)
+      # try RubyZip gem
+      require 'zip'
+
       Zip::File.open(zip_file) do |zip_obj|
          zip_obj.each do |f|
             f.extract(File.join(dest, f.name))
          end
       end
+   rescue LoadError
+      # try 'unzip'
+      out, err, status = Open3.capture3('unzip', ?x, zip_file, chdir: dest)
+      fail err unless status.exitcode == 0
+   rescue Error::ENOENT
+      # try '7zip'
+      out, err, status = Open3.capture3('7z', ?x, zip_file, chdir: dest)
+      fail err unless status.exitcode == 0
+   rescue Error::ENOENT
+      fail 'neither RubzZip gem nor /bin/unzip or /bin/7z found'
+   rescue
+      # something failed ...
+      Ektoplayer::Application.log(self, "error extracting zip", zip, dest, $!)
+      fail $!
    end
 
    def self.with_hash_zip(keys, values)

data/lib/ektoplayer/compat.rb

@@ -1,4 +1,4 @@
-unless Array.public_method_defined? :sum
+unless Array.respond_to? :sum
    class Array
       def sum
          result = 0
@@ -8,9 +8,9 @@ unless Array.public_method_defined? :sum
    end
 end
 
-unless Integer.public_method_defined? :clamp
+unless Integer.respond_to? :clamp
    class Integer
-         def clamp(min, max)
+      def clamp(min, max)
          if self < min
             min
          elsif self > max

data/lib/ektoplayer/config.rb

@@ -159,16 +159,6 @@ module Ektoplayer
          reg 'progressbar.rest_char',
             'Character used for the rest of the line', ?~
 
-         # - Volumemeter
-         reg 'volumemeter.display',
-            'Enable/disable volumemeter', true
-
-         reg 'volumemeter.level_char',
-            'Character used for displaying volume level', ?~
-
-         reg 'volumemeter.rest_char',
-            'Character used for the rest of the line', ?~
-
          # - Playinginfo
          reg 'playinginfo.display',
             'Enable/display playinginfo', true
@@ -190,7 +180,7 @@ module Ektoplayer
             lambda { |v| v.split(/\s*,\s*/).map(&:to_sym) }
 
          reg 'main.widgets', 'Specify widgets to show (up to down)',
-            'playinginfo,progressbar,tabbar,windows,volumemeter',
+            'playinginfo,tabbar,windows,progressbar',
             lambda { |v| v.split(/\s*,\s*/).map(&:to_sym) }
       end
 

data/lib/ektoplayer/controllers/browser.rb

@@ -1,4 +1,4 @@
-require 'curses'
+require_relative '../icurses'
 
 require_relative 'controller'
 
@@ -12,7 +12,7 @@ module Ektoplayer
             register = view_operations.with_register('browser.')
 
             %w(up down page_up page_down top bottom
-               search_up search_down search_next search_prev).
+               search_up search_down search_next search_prev toggle_selection).
                each { |op| register.(op, &view.method(op)) }
 
             register.(:enter) do
@@ -21,7 +21,9 @@ module Ektoplayer
 
             register.(:add_to_playlist) do
                #if tracks = browser.tracks(view.selected)
-               operations.send(:'browser.add_to_playlist', view.selected)
+               view.get_selection.each do |index|
+                  operations.send(:'browser.add_to_playlist', index)
+               end
                #end
             end
 
@@ -29,14 +31,14 @@ module Ektoplayer
             view.mouse.on(65536) do view.up(5) end
             view.mouse.on(2097152) do view.down(5) end
 
-            [Curses::BUTTON1_DOUBLE_CLICKED, Curses::BUTTON3_CLICKED].each do |btn|
+            [ICurses::BUTTON1_DOUBLE_CLICKED, ICurses::BUTTON3_CLICKED].each do |btn|
                view.mouse.on(btn) do |mevent|
                   view.select_from_cursorpos(mevent.y)
                   view_operations.send(:'browser.enter')
                end
             end
 
-            [Curses::BUTTON1_CLICKED, Curses::BUTTON2_CLICKED].
+            [ICurses::BUTTON1_CLICKED, ICurses::BUTTON2_CLICKED].
                each do |button|
                view.mouse.on(button) do |mevent|
                   view.select_from_cursorpos(mevent.y)