ektoplayer 0.1.22 → 0.1.24.a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b60f202ee351cc05c1d1ca2fc88fabcc6f8e313206f2f63e9cfd297c52bf05d
-  data.tar.gz: 25448d29ab6de9d71f3f48faee4b57e10f96673b4c6cc0fe996895a2d38bd752
+  metadata.gz: e07a8f4ec7d580ca4b4b901f1004da8f0000b7254e3d50777311052541280a37
+  data.tar.gz: 999a0502f214d570ec5eef7929807f04f35dd6e182591b208c3dbbcd460a4243
 SHA512:
-  metadata.gz: c22e90577ead6e1e5504757dc03042bee36d919b4990adf58b6250c6d4df6381e5439765a7a640d2835f1b282037505754386061969dc7cdd40dba8f3b78366f
-  data.tar.gz: c7d54c8d3987ad1bce0d65fd9eb6d58e588e11c137f8d091b2e4323ef04f9bec01eac17757c91b53dd077faebaab07ab9f97c35776325e4cd3effba03e249d0a
+  metadata.gz: d6cb6faea7ddc50b86d572d10d9b1f6f655d3cb6760f383d924282fe1656d344746e4212c7e8020ca65418535f538c72f4581ce01b8d5fd18cb3e186e88560d3
+  data.tar.gz: 7bcd8e8e43adbf34dac70d516af5d08017494ab00754334a63ad1911f73ad88f63142f98698ba5df3af63befd22d91cc564b2ab52fbc7ff129db2fb23e22a719

data/README.md

@@ -46,13 +46,21 @@ See output of `gem env gempath`.
       yaourt -S ektoplayer
       ```
 
+  * Using makepkg:
+      ```
+      git clone https://github.com/braph/ektoplayer
+      cd ektoplayer
+      makepkg
+      sudo pacman -U ektoplayer-*.pkg.tar.xz
+      ```
+
   * Using gem:
       ```
       pacman -S --needed ruby mpg123 sqlite3 ncurses
       gem install ektoplayer
       ```
 
-### Debian
+### Debian (*)
    * Using gem:
       ```
       apt-get install ruby ruby-dev libz libz-dev ruby-ncurses ruby-nokogiri ruby-sqlite3 \
@@ -60,7 +68,7 @@ See output of `gem env gempath`.
       gem install ektoplayer
       ```
 
-### OpenSuse
+### OpenSuse (*)
    * Using gem:
       ```
       zypper in ruby ruby-devel gcc sqlite3 sqlite3-devel ncurses ncurses-devel zlib zlib-devel \
@@ -68,13 +76,15 @@ See output of `gem env gempath`.
       gem install ektoplayer ffi-curses
       ```
 
-### Ubuntu
+### Ubuntu (*)
    * Using gem:
       ```
       apt-get install ruby ruby-dev sqlite3 ruby-sqlite3 ruby-nokogiri ruby-ncurses mpg123
       gem install ektoplayer
       ```
 
+(*) Not tested yet
+
 ## Configuration
 
 Ektoplayer keeps it's default configuration file under `~/.config/ektoplayer/ektoplayer.rc`.

data/lib/ektoplayer/application.rb

@@ -10,19 +10,16 @@ require 'date'
 
 module Ektoplayer
    class Application
-      VERSION = '0.1.22'.freeze
-      GITHUB_URL = 'https://github.com/braph/ektoplayer'.freeze
-      EKTOPLAZM_URL = 'http://www.ektoplazm.com'.freeze
+      VERSION       = '0.1.24'.freeze
+      GITHUB_URL    = 'https://github.com/braph/ektoplayer'.freeze
+      EKTOPLAZM_URL = 'https://ektoplazm.com'.freeze
 
       EKTOPLAZM_ALBUM_BASE_URL   = "#{EKTOPLAZM_URL}/free-music".freeze
       EKTOPLAZM_COVER_BASE_URL   = "#{EKTOPLAZM_URL}/img".freeze
-      EKTOPLAZM_TRACK_BASE_URL   = "#{EKTOPLAZM_URL}/mp3".freeze
+      EKTOPLAZM_TRACK_BASE_URL   = "#{EKTOPLAZM_URL}/audio".freeze
       EKTOPLAZM_STYLE_BASE_URL   = "#{EKTOPLAZM_URL}/style".freeze
       EKTOPLAZM_ARCHIVE_BASE_URL = "#{EKTOPLAZM_URL}/files".freeze
 
-      CONFIG_DIR  = File.join(Dir.home, '.config', 'ektoplayer').freeze
-      CONFIG_FILE = File.join(CONFIG_DIR, 'ektoplayer.rc').freeze
-
       def self.album_url(album)
          "#{EKTOPLAZM_ALBUM_BASE_URL}/#{album}"
       end
@@ -107,7 +104,7 @@ module Ektoplayer
             client = Client.new
 
             # ... models ...
-            player      = Models::Player.new(client)
+            player      = Models::Player.new(client, Config[:audio_system])
             browser     = Models::Browser.new(client)
             playlist    = Models::Playlist.new
             database    = Models::Database.new(client)

data/lib/ektoplayer/browsepage.rb

@@ -16,14 +16,14 @@ module Ektoplayer
 
       attr_reader :albums, :page_urls, :current_page_index
 
-      def self.parse(src)
-         BrowsePage.new(src)
+      def self.from_url(url)
+         BrowsePage.new(open(url))
       end
 
       def styles;            @@styles or []   end
       def first_page_url;    @page_urls[0]    end
       def last_page_url;     @page_urls[-1]   end
-      def current_page_url;  @page_urls[@current_page_index] end
+      def current_page_url;  @page_urls[@current_page_index - 1] end
 
       def prev_page_url
          @page_urls[@current_page_index - 1] if @current_page_index > 0
@@ -34,14 +34,14 @@ module Ektoplayer
       end
 
       def initialize(src)
-         doc = Nokogiri::HTML(open(src))
+         doc = Nokogiri::HTML(src)
          @albums = []
 
-         @page_urls = []
-         doc.css('.wp-pagenavi option').each_with_index do |option, i|
-            @current_page_index = i if option['selected']
-            @page_urls << option['value']
-         end
+         base_url = doc.css('.wp-pagenavi a')[0]['href'].sub(/\d+$/, '')
+         pages = doc.css('.wp-pagenavi .pages')[0].text # -> "Page 1 of 22"
+         @current_page_index, last = pages.gsub(/[^\d ]/, '').split()
+         @current_page_index, last = @current_page_index.to_i, last.to_i
+         @page_urls = (1..last).map do |i| "#{base_url}#{i}" end
 
          @@styles ||= begin
             doc.xpath('//a[contains(@href, "http") and contains(@href, "/style/")]').map do |a|
@@ -87,14 +87,22 @@ module Ektoplayer
                album[:rating], album[:votes] = 0, 0
             end
 
-            begin
-               base64_tracklist = post.at_css('script').text.scan(/soundFile:"(.*)"/)[0][0]
-               tracklist_urls = Base64.decode64(base64_tracklist).split(?,)
-               tracklist_urls.map! { |url| File.basename(url) }
-            rescue
+            # Extract audio file URLs
+            tracklist_urls = []
+            post.xpath('.//script').each do |script|
+               soundFile = script.text.scan(/soundFile:"(.*)"/)
+               if soundFile.size > 0
+                  soundFile = soundFile[0][0]
+                  tracklist_urls = Base64.decode64(soundFile).split(?,)
+                  tracklist_urls.map! { |url| File.basename(url) }
+                  break
+               end
+            end
+            #
+            unless tracklist_urls.size > 0
                # Sometimes there are no tracks:
                # http://www.ektoplazm.com/free-music/dj-basilisk-the-colours-of-ektoplazm
-               tracklist_urls = []
+               Application.log(self, "Found no tracks for #{album[:title]} on #{current_page_url}")
             end
 
             post.css('.tl').each do |album_track_list|

data/lib/ektoplayer/config.rb

@@ -84,7 +84,7 @@ module Ektoplayer
          # parameter `description` is used by tools/mkconfig.rb, but not here
 
          if method
-            @cast[key.to_sym]    = method if method
+            @cast[key.to_sym]    = method
             @options[key.to_sym] = method.(default).freeze
          else
             @options[key.to_sym] = default.freeze
@@ -104,9 +104,10 @@ module Ektoplayer
             File.join(CONFIG_DIR, 'ektoplayer.log'),
             File.method(:expand_path)
 
-         reg :temp_dir, %{Temporary dir for downloading mp3 files. They will be moved to `cache_dir`
-                          after the download completed and was successful.
-                          Directory will be created if it does not exist, parent directories will not be created.},
+         reg :temp_dir,
+            %{Temporary dir for downloading mp3 files.
+              They will be moved to `cache_dir` after the download completed and was successful.
+              Directory will be created if it does not exist, parent directories will not be created.},
             '/tmp/.ektoplazm',
             File.method(:expand_path)
 
@@ -143,7 +144,7 @@ module Ektoplayer
               be deleted on application exit.}, true
 
          reg :prefetch,
-            'Enable prefetching next track do be played', true
+            'Enable prefetching the next track do be played', true
 
          reg :small_update_pages,
             'How many pages should be fetched after start', 5
@@ -155,6 +156,10 @@ module Ektoplayer
                  '8' => 8, '256' => 256 }[v] or fail 'invalid value'
             }
 
+         reg :audio_system,
+            'Set output audio system. See option `-o` in mpg123(1)',
+            'pulse,alsa,jack,oss'
+
          reg :threads,
             'Number of download threads during database update',
             20, lambda { |v| fail if Integer(v) < 1; Integer(v) }

data/lib/ektoplayer/icurses/ncurses.rb

@@ -63,7 +63,7 @@ module ICurses
    module_function :initscr
 
    def stdscr
-      ICurses::IWindow.new Ncurses.stdscr
+      ICurses::IWindow.new( Ncurses.stdscr )
    end
    module_function :stdscr
 

data/lib/ektoplayer/icurses/sugar.rb

@@ -2,9 +2,10 @@ module ICurses
    class IMouseEvent
       attr_accessor :x, :y, :z, :bstate
 
-      def initialize(mouse_event=nil, bstate: 0, x: 0, y: 0, z: 0)
-         @x, @y, @z, @bstate = x, y, z, bstate
-         from_mouse_event!(mouse_event)
+      def initialize(mouse_event=nil, bstate: nil, x: nil, y: nil, z: nil)
+         @x, @y, @z, @bstate = 0, 0, 0, 0
+         from_mouse_event!(mouse_event) if mouse_event
+         update!(x:x, y:y, z:z, bstate:bstate)
       end
 
       def [](key)          send(key)               end
@@ -13,9 +14,7 @@ module ICurses
       def from_mouse_event!(m)
          @x, @y, @z, @bstate = m.x, m.y, m.z, m.bstate 
       rescue
-         begin @x, @y, @z, @bstate = m[:x], m[:y], m[:z], m[:bstate]
-         rescue
-         end
+         @x, @y, @z, @bstate = m[:x], m[:y], m[:z], m[:bstate]
       end
 
       def update!(x: nil, y: nil, z: nil, bstate: nil)
@@ -28,6 +27,7 @@ module ICurses
 end
 
 module ICurses
+   # Alias methods (`LINES` becomes `lines`, etc ...)
    %w(lines cols colors init_pair color_pair).each do |meth| 
       meth_up = meth.upcase
 
@@ -53,6 +53,7 @@ module ICurses
          alias_method(:<<, :addstr)
       end
 
+      # Provide `curx` as well as `getcurx`
       %w(curx cury maxx maxy begx begy).each do |meth|
          full = 'get' + meth
          if not respond_to? meth

data/lib/ektoplayer/icurses.rb

@@ -18,8 +18,9 @@ No module for ncurses found. Please install one of the following gems:
 Maybe your distribution ships one of these already as a package.
 
    Arch Linux:
-      yaourt -S ruby-curses    # or
-      yaourt -S ruby-ncursesw
+      yaourt -S ruby-ncursesw # preferred
+      or
+      yaourt -S ruby-curses
 
    Debian / Ubuntu:
       apt-get install ruby-ncurses

data/lib/ektoplayer/models/player.rb

@@ -4,10 +4,10 @@ require_relative '../players/mpg_wrapper_player'
 module Ektoplayer
    module Models
       class Player < Model
-         def initialize(client)
+         def initialize(client, audio_system)
             super()
             @client = client
-            @player = MpgWrapperPlayer.new
+            @player = MpgWrapperPlayer.new(audio_system)
             @events = @player.events
             #@events.register(:position_change, :track_completed, :pause, :stop, :play)
             #@player.events.on_all(&@events.method(:trigger))

data/lib/ektoplayer/players/mpg_wrapper_player.rb

@@ -16,7 +16,8 @@ class MpgWrapperPlayer
    CMD_FORMAT = 'FORMAT'.freeze
    CMD_SAMPLE = 'SAMPLE'.freeze
 
-   def initialize
+   def initialize(audio_system)
+      @audio_system = audio_system
       @events = Events.new(:play, :pause, :stop, :position_change)
       @lock = Mutex.new
       @mpg123_in, @mpg123_out, @mpg123_thread = nil, nil, nil
@@ -29,7 +30,11 @@ class MpgWrapperPlayer
       @track_completed = nil
    end
 
-   def can_http?; true; end
+   # NOTE
+   # Since ektoplazm.com switched to Cloudflare (using HTTP/2.0) mpg123
+   # cannot handle those streams anymore. This may change in future versions
+   # of mpg123.
+   def can_http?; false; end
 
    def play(file=nil)
       start_mpg123_thread
@@ -133,7 +138,7 @@ class MpgWrapperPlayer
             Thread.new do
                begin
                   @mpg123_in, @mpg123_out, mpg123_err, @mpg123_thread =
-                     Open3.popen3('mpg123', '--fuzzy', '-R')
+                     Open3.popen3('mpg123', '-o', @audio_system, '--fuzzy', '-R')
 
                   while (line = @mpg123_out.readline)
                      cmd, line = line.split(' ', 2)

data/lib/ektoplayer/updater.rb

@@ -5,7 +5,7 @@ require 'open-uri'
 require_relative 'browsepage'
 
 module Ektoplayer
-   MAIN_URL = 'http://www.ektoplazm.com'.freeze
+   MAIN_URL = 'https://ektoplazm.com'.freeze
    FREE_MUSIC_URL = "#{MAIN_URL}/section/free-music".freeze
 
    class DatabaseUpdater
@@ -21,7 +21,7 @@ module Ektoplayer
       def update(start_url: FREE_MUSIC_URL, pages: 0, parallel: 10)
          queue = parallel > 0 ? SizedQueue.new(parallel) : Queue.new 
          results = Queue.new
-         bp = BrowsePage.new(start_url)
+         bp = BrowsePage.from_url(start_url)
          results << bp
 
          insert_thread = Thread.new do
@@ -43,7 +43,7 @@ module Ektoplayer
 
                3.times do |try|
                   begin
-                     bp = BrowsePage.new(url)
+                     bp = BrowsePage.from_url(url)
                      Application.log(self, url, bp.albums.size, "albums found")
                      results << bp
                      break

data/lib/ektoplayer/views/splash.rb

@@ -6,32 +6,32 @@ require_relative '../common'
 module Ektoplayer
    module Views
       class Splash < UI::Window
-         EKTOPLAZM_LOGO = %q.
-   ____    _   _     _             ____    _       _____   ______   _ ___ ___
+         EKTOPLAZM_LOGO = %q[
+   ____    _   _     _             ____    _       _____   ______   _ ___ ___ 
   /  __)  ; | | ;   | |           |  _ \  | |     /___  \ |____  | | '_  `_  \
  /  /     | | | |  _| |__   ___   | | | | | |         | |      | | | | | | | |
-(  (      | | | | |_   __) / _ \  | | | | | |      ___| |      / , | | | | | |
+(  (      | | | | |_   __) / _ \  | | | | | |      ___| |      / ; | | | | | |
  \  \_    | | | |   | |   | | | | | | | | | |     /  _| |     / /  | | | | | |
   )  _)   | | | |   | |   | | | | | |_| ; | |     | | | |    / /   | | | | | |
  /  /     | |_|/    | |   | |_| | |  __/  | |     | | | |   / /    | | | | | |
 (  (      |  _{     | |    \___/  | |     | |     | | | |  / /     | | |_| | |
- \  \__   | | |\    | |__         | |     | :___  | |_| | , /____  | |     | |
-  \____)  |_| |_|   \___/         |_|     \____/  \_____| |______| |_|     |_|..
+ \  \__   | | |\    | |__         | |     | :___  | |_| | : /____  | |     | |
+  \____)  |_| |_|   \___/         |_|     \____/  \_____| |______| |_|     |_|].
                                                        split(?\n)[1..-1].freeze
-         EKTOPLAZM_SIGNATURE = %q{
-  ___                   _   _    _ _                  _   _
- / __| ___ _  _ _ _  __| | | |  (_) |__  ___ _ _ __ _| |_(_)___ _ _
- \__ \/ _ \ || | ' \/ _` | | |__| | '_ \/ -_) '_/ _` |  _| / _ \ ' \
- |___/\___/\_,_|_||_\__,_| |____|_|_.__/\___|_| \__,_|\__|_\___/_||_|}.
+         EKTOPLAZM_SIGNATURE = %q[
+  ___                   _   _    _ _                  _   _          
+ / __| ___ _  _ _ _  __| | | |  (_) |__  ___ _ _ __ _| |_(_)___ _ _  
+ \__ \/ _ \ || | ' \/ _` | | |__| | '_ \/ -_) '_/ _` |  _| / _ \ ' \ 
+ |___/\___/\_,_|_||_\__,_| |____|_|_.__/\___|_| \__,_|\__|_\___/_||_|].
                                                        split(?\n)[1..-1].freeze
 
          BUBBLES = [[6,3], [6,7], [28,1], [28,9], [46,7], [71,9]].freeze
 
-         def load_colors
+         def load_colorfaders
             if Theme.current == 256
                @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])
+               @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    = UI::ColorFader.new([:red])
                @ekto_logo_fade = UI::ColorFader.new([:blue])
@@ -44,12 +44,12 @@ module Ektoplayer
          def draw
             @win.erase
             return if (EKTOPLAZM_LOGO.size >= @size.height or
-                      EKTOPLAZM_LOGO.max.size >= @size.width)
-            load_colors
+                       EKTOPLAZM_LOGO[0].size >= @size.width)
+            load_colorfaders unless @bubble_fade#,@signature_fade,@ekto_logo_fade
 
             w_center = @size.width / 2
             h_center = @size.height / 2
-            left_pad = w_center - (EKTOPLAZM_LOGO.max.size / 2)
+            left_pad = w_center - (EKTOPLAZM_LOGO[0].size / 2)
 
             if EKTOPLAZM_LOGO.size + EKTOPLAZM_SIGNATURE.size + 3 > @size.height
                top_pad = h_center - (EKTOPLAZM_LOGO.size / 2)
@@ -75,7 +75,7 @@ module Ektoplayer
             return unless draw_signature
 
             top_pad += EKTOPLAZM_LOGO.size + 2
-            left_pad = w_center - (EKTOPLAZM_SIGNATURE.max.size / 2)
+            left_pad = w_center - (EKTOPLAZM_SIGNATURE[0].size / 2)
 
             EKTOPLAZM_SIGNATURE.each_with_index do |line, i|
                @win.move(top_pad + i, left_pad)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ektoplayer
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.24.a
 platform: ruby
 authors:
 - Benjamin Abendroth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-17 00:00:00.000000000 Z
+date: 2020-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: scanf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 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
@@ -122,15 +136,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - '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.7.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: play or download music from ektoplazm.com