ektoplayer 0.1.12 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb06ab1d760e586affdc548cf3c622323736700c
-  data.tar.gz: 147c4ab4a4a71f4acae9bcc963da610daba75f2c
+  metadata.gz: 1567475105c5b1d0e3a099a4324ca19cdd67efe8
+  data.tar.gz: e48caa107e5f934866a720023a5cb86fbb9153a9
 SHA512:
-  metadata.gz: ab09617d8346b932adb34879a6400c79af7c8e14e348908161d0bd9f1bfc1b9a35547504c1dbdda0d281dda13435a2b3fdf03b6a0ed45d3710cc761d4ff1d0dc
-  data.tar.gz: ec888b4104511631aa3d3366896e2591252d398cfeece159bd7027de2860470b6b7144b03998af879461f75af5fbd17fcdf1ccad7ae910a1df1b8853550f44e9
+  metadata.gz: f5b706485a36e6398a981314c93f244ad4c85e35afbe55cce4e2d211752059abd3cfe743316d5edc85011f01002ecf35b5895e0aab54551bff565e407b1e7db0
+  data.tar.gz: 12636fee134acc3f234ddbb6f7637e6a2ca0186998d76929820eb1f5a36c347ed5ec6c86aab8f128be13cf7240b9d01ad8e68c68b3dd15ac8347c783cb765ead

data/lib/ektoplayer/application.rb

@@ -10,15 +10,39 @@ require 'date'
 
 module Ektoplayer
    class Application
-      VERSION = '0.1.12'.freeze
+      VERSION = '0.1.16'.freeze
       GITHUB_URL = 'https://github.com/braph/ektoplayer'.freeze
       EKTOPLAZM_URL = 'http://www.ektoplazm.com'.freeze
-      EKTOPLAZM_ALBUM_BASE_URL = EKTOPLAZM_URL + '/free-music'.freeze
-      EKTOPLAZM_COVER_BASE_URL = EKTOPLAZM_URL + '/img'.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_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
+
+      def self.cover_url(cover)
+         "#{EKTOPLAZM_COVER_BASE_URL}/#{cover}"
+      end
+
+      def self.track_url(track)
+         "#{EKTOPLAZM_TRACK_BASE_URL}/#{track}"
+      end
+
+      def self.style_url(style)
+         "#{EKTOPLAZM_STYLE_BASE_URL}/#{style}"
+      end
+
+      def self.archive_url(archive)
+         "#{EKTOPLAZM_ARCHIVE_BASE_URL}/#{archive}"
+      end
+
       def self.log(from, *msgs)
          func = caller[0][/`.*'/][1..-2]
          from = from.class unless from.is_a?String
@@ -36,7 +60,7 @@ module Ektoplayer
       end
 
       def run
-         #Thread.abort_on_exception=(true)
+         puts "\033]0;ektoplayer\007"
          Thread.report_on_exception=(true) if Thread.respond_to? :report_on_exception
 
          # make each configuration object globally accessible as a singleton
@@ -71,7 +95,7 @@ module Ektoplayer
          end
 
          UI::Canvas.run do
-            Application.log(self, 'running with ncurses interface:', $USING_CURSES)
+            Application.log(self, "using '#{$USING_CURSES}' with #{ICurses.colors} colors available")
 
             if Config[:use_colors] == :auto
                Theme.use_colors(ICurses.colors >= 256 ? 256 : 8)
@@ -90,7 +114,12 @@ module Ektoplayer
 
             # ... operations ...
             operations = Operations::Operations.new
-            operations.register(:quit,    &method(:exit))
+            operations.register(:quit) do
+               Thread.list.each { |t| t.kill if t != Thread.current }
+               FileUtils.rm(Dir.glob(File.join(Config[:temp_dir], '~ekto-*'))) rescue nil
+               raise SystemExit
+            end
+
             operations.register(:reload,  &browser.method(:reload))
             operations.register(:update,  &database.method(:update))
             operations.register(:refresh) { UI::Canvas.update_screen(true, true) }
@@ -117,25 +146,26 @@ module Ektoplayer
                main_w.playinginfo.attach(playlist, player)
 
                # ... events ...
-               database.events.on(:update_finished, &browser.method(:reload ))
+               database.events.on(:update_finished, &browser.method(:reload))
                player.events.on(:stop) do |reason|
                   operations.send(:'playlist.play_next') if reason == :track_completed
                end
                
                if Config[:prefetch]
-                  trackloader_mutex = Mutex.new
-                  @prefetch_thread = nil
-                  player.events.on(:position_change) do
-                     @prefetch_thread ||= Thread.new do
-                        if player.length > 30 and player.position_percent > 0.7
-                           trackloader_mutex.synchronize do
-                              trackloader.get_track_file(playlist[playlist.get_next_pos]['url'])
-                              sleep 30
-                           end
-                        end
+                  Thread.new do
+                     current_download_track = nil
+
+                     loop do
+                        sleep 5
 
-                        sleep 10
-                        @prefetch_thread = nil
+                        next_track = playlist.get_next_pos
+                        next if current_download_track == next_track
+
+                        if player.length > 30 and player.position_percent > 0.5
+                           trackloader.get_track_file(playlist[next_track]['url'])
+                           current_download_track = next_track
+                           sleep 5
+                        end
                      end
                   end
                end

data/lib/ektoplayer/bindings.rb

@@ -69,104 +69,108 @@ module Ektoplayer
             %w(browser playlist).each { |w| reg("#{w}.#{cmd}", desc) }
          end
 
-         @bindings = {
-            global: {
-               :'splash.show'             => [?`, ?^                         ],
-               :'playlist.show'           => [?1                             ],
-               :'browser.show'            => [?2                             ],
-               :'info.show'               => [?3                             ],
-               :'help.show'               => [?4,      ICurses::KEY_F1       ],
-
-               :'playinginfo.toggle'      => [?!,      ICurses::KEY_F2       ],
-               :'progressbar.toggle'      => [?%,      ICurses::KEY_F3       ],
-               :'tabbar.toggle'           => [?=,      ICurses::KEY_F4       ],
-
-               :'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, ?}, '^i'                   ],
-               :'tabs.prev'               => [?h, ?{, 353                    ],
-
-               :quit                      => [?q                             ],
-               :refresh                   => ['^l'                           ],
-               :reload                    => ['^r'                           ],
-               :update                    => [?U                             ]},
-            playlist: {
-               # movement
-               :'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'           => [         ICurses::KEY_ENTER    ],
-               :'playlist.download_album' => [?$                             ],
-               :'playlist.reload'         => [?r                             ],
-               :'playlist.goto_current'   => [?o                             ],
-               :'playlist.clear'          => [?c                             ],
-               :'playlist.delete'         => [?d                             ],
-               # other
-               :'player.toggle'           => [' '                            ]},
-            browser: {
-               # movement
-               :'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                             ],
-               :'browser.search_up'       => [??                             ],
-               :'browser.search_down'     => [?/                             ],
-               # browser
-               :'browser.add_to_playlist' => [' ', ?a                        ],
-               :'browser.enter'           => [         ICurses::KEY_ENTER    ],
-               :'browser.back'            => [?B,      ICurses::KEY_BACKSPACE ]},
-            help: {
-               :'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,      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: {}
+         @bindings = { }
+         @bindings[:global] = {
+            :'splash.show'             => [?`, ?^                          ],
+            :'playlist.show'           => [?1                              ],
+            :'browser.show'            => [?2                              ],
+            :'info.show'               => [?3                              ],
+            :'help.show'               => [?4,      ICurses::KEY_F1        ],
+
+            :'playinginfo.toggle'      => [?!, ?\\, ICurses::KEY_F2        ],
+            :'progressbar.toggle'      => [?%, ?~,  ICurses::KEY_F3        ],
+            :'tabbar.toggle'           => [?=,      ICurses::KEY_F4        ],
+
+            :'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, ?}, '^i'                    ],
+            :'tabs.prev'               => [?h, ?{, 353                     ],
+
+            :quit                      => [?q                              ],
+            :refresh                   => ['^l'                            ],
+            :reload                    => ['^r'                            ],
+            :update                    => [?U                              ]
+         }
+         @bindings[:playlist] = {
+            # movement
+            :'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'           => [         ICurses::KEY_ENTER     ],
+            :'playlist.download_album' => [?$                              ],
+            :'playlist.reload'         => [?r                              ],
+            :'playlist.goto_current'   => [?o                              ],
+            :'playlist.clear'          => [?c                              ],
+            :'playlist.delete'         => [?d                              ],
+            # other
+            :'player.toggle'           => [' '                             ]
+         }
+         @bindings[:browser] = {
+            # movement
+            :'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                              ],
+            :'browser.search_up'       => [??                              ],
+            :'browser.search_down'     => [?/                              ],
+            # browser
+            :'browser.add_to_playlist' => [' ', ?a                         ],
+            :'browser.enter'           => [         ICurses::KEY_ENTER     ],
+            :'browser.back'            => [?B,      ICurses::KEY_BACKSPACE ]
+         }
+         @bindings[:help] = {
+            :'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     ]
+         }
+         @bindings[:info] = {
+            :'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     ]
          }
+         @bindings[:splash] = {}
 
          @bindings.default_proc = proc { |h,k| fail "Unknown widget #{k}" }
          @bindings.each do |widget, hash|
             hash.default_proc = proc { |h,k| h[k] = [] }
             hash.values.each do |keys|
-               keys.map! { |key| parse_key(key) }
+               keys.map!(&method(:parse_key))
             end
          end
       end
 
       def keyname(key)
-         return 'SPACE'  if (key == ' ' or key == 32)
+         return 'SPACE' if (key == ' ' or key == 32)
 
          name = ICurses.keyname(key)
          if name.start_with? 'KEY_'

data/lib/ektoplayer/browsepage.rb

@@ -9,8 +9,7 @@ require 'open-uri'
 
 module Ektoplayer
    class BrowsePage
-      ALBUM_KEYS = %w(url title artist date category styles cover_url description
-                      download_count released_by released_by_url posted_by posted_by_url
+      ALBUM_KEYS = %w(url title artist date styles cover_url description download_count
                       archive_urls rating votes tracks).map(&:to_sym).freeze
 
       TRACK_KEYS = %w(url album_url number title remix artist bpm).map(&:to_sym).freeze
@@ -21,7 +20,7 @@ module Ektoplayer
          BrowsePage.new(src)
       end
 
-      def styles;             @@styles or []    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
@@ -40,24 +39,23 @@ module Ektoplayer
 
          @page_urls = []
          doc.css('.wp-pagenavi option').each_with_index do |option, i|
-            @current_page_index = i if option[:selected]
-            @page_urls << option[:value]
+            @current_page_index = i if option['selected']
+            @page_urls << option['value']
          end
 
          @@styles ||= begin
             doc.xpath('//a[contains(@href, "http") and contains(@href, "/style/")]').map do |a|
-               [ a.text, a[:href] ]
+               [ a.text, File.basename(a['href']) ]
             end.to_h
          end
 
          doc.xpath('//div[starts-with(@id, "post-")]').each do |post|
             album = { tracks: [] }
             album[:date] = Date.parse(post.at_css('.d').text).iso8601 rescue nil
-            album[:category] = post.at_css('.c a').text  rescue nil
 
             album[:styles] = []
             post.css('.style a').map do |a|
-               @@styles[a.text] = a[:href]
+               @@styles[a.text] = File.basename(a['href'])
                album[:styles] << a.text
             end
 
@@ -65,7 +63,7 @@ module Ektoplayer
                to_html.sub(/^<p>/, '').sub(/<\/p>$/, '') rescue ''
 
             begin album[:cover_url] = File.basename(
-               URI.parse(post.at_css('.cover')[:src]).path
+               URI.parse(post.at_css('.cover')['src']).path
             )
             rescue
             end
@@ -74,23 +72,11 @@ module Ektoplayer
 
             post.css('h1 a').each do |a|
                album[:title] = a.text
-               album[:url] = File.basename(URI.parse(a[:href]).path)
+               album[:url] = File.basename(URI.parse(a['href']).path)
             end 
 
-            post.xpath('.//a[@rel="tag"]').each do |a|
-               album[:released_by] = a.text
-               album[:released_by_url] = File.basename(URI.parse(a[:href]).path)
-               # todo
-            end
-
-            post.xpath('.//a[@rel="author external"]').each do |a|
-               album[:posted_by] = a.text
-               album[:posted_by_url] = File.basename(URI.parse(a[:href]).path)
-               # todo
-            end
-
             album[:archive_urls] = post.css('.dll a').map do |a|
-               [ a.text.split[0] , a[:href] ]
+               [ a.text.split[0] , File.basename(a['href']) ]
             end.to_h
 
             begin
@@ -102,8 +88,9 @@ module Ektoplayer
             end
 
             begin
-               base64_tracklist = post.at_css(:script).text.scan(/soundFile:"(.*)"/)[0][0]
+               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
                # Sometimes there are no tracks:
                # http://www.ektoplazm.com/free-music/dj-basilisk-the-colours-of-ektoplazm
@@ -112,8 +99,8 @@ module Ektoplayer
 
             post.css('.tl').each do |album_track_list|
                track = nil
-               album_track_list.css(:span).each do |ti|
-                  case ti[:class]
+               album_track_list.css('span').each do |ti|
+                  case ti['class']
                   when ?n 
                      album[:tracks] << track if track and track[:url]
                      track = { url: tracklist_urls.shift }
@@ -141,7 +128,7 @@ module Ektoplayer
             @albums << album
          end
 
-         Application.log(self, "completed; #{src} #{@albums.size} albums found")
+         Application.log(self, "#{src} #{@albums.size} albums found")
       rescue
          Application.log(self, src, $!)
       end

data/lib/ektoplayer/common.rb

@@ -1,63 +1,9 @@
 require 'thread'
 require 'open3'
 
-class ConditionSignals
-   def initialize
-      @mutex, @cond = Mutex.new, ConditionVariable.new
-      @curr_signal = nil
-      @signal_hooks = {}
-
-      Thread.new do
-         @mutex.synchronize do
-            loop do
-               @cond.wait(@mutex)
-
-               if @signal_hooks.key? @curr_signal
-                  @signal_hooks[@curr_signal].()
-               end
-            end
-         end
-      end
-   end
-
-   def wait(name, timeout=nil)
-      @mutex.synchronize do
-         loop do
-            @cond.wait(@mutex, timeout)
-            return if @curr_signal == name
-         end
-      end
-   end
-
-   def signal(name)
-      @curr_signal = name
-      @cond.broadcast
-   end
-
-   def on(name, &block)
-      @signal_hooks[name] = block
-   end
-end
-
 class Dir
    def Dir.size(path)
-      Dir.glob(File.join(path, '**', ?*)).map { |f| File.size(f) }.sum
-   end
-end
-
-class String
-   def chunks(n)
-      return [self] if n < 1
-
-      if (chunk_size = self.size / n) < 1
-         return [self]
-      end
-
-      (n - 1).times.map do |i|
-         self.slice((chunk_size * i)..(chunk_size * (i + 1) - 1))
-      end + [
-         self.slice((chunk_size * (n-1))..-1)
-      ]
+      Dir.glob(File.join(path, '**', ?*)).map(&File.method(:size)).sum
    end
 end
 
@@ -81,28 +27,27 @@ module Common
    end
    
    def self.extract_zip(zip_file, dest)
+      absolute_path = File.absolute_path(zip_file)
+      # try 'unzip'
+      out, err, status = Open3.capture3('unzip', absolute_path, chdir: dest)
+      fail err unless status.exitstatus == 0
+   rescue Errno::ENOENT
+      # try '7zip'
+      out, err, status = Open3.capture3('7z', ?x, absolute_path, chdir: dest)
+      fail err unless status.exitstatus == 0
+   rescue Errno::ENOENT
       # try RubyZip gem
       require 'zip'
 
-      Zip::File.open(zip_file) do |zip_obj|
+      Zip::File.open(absolute_path) 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 $!
+      Ektoplayer::Application.log(self, "error extracting zip", zip_file, dest, $!)
    end
 
    def self.with_hash_zip(keys, values)

data/lib/ektoplayer/compat.rb

@@ -1,9 +1,7 @@
 unless Array.respond_to? :sum
    class Array
-      def sum
-         result = 0
-         self.each { |i| result += i }
-         result
+      def sum 
+         reduce(:+)
       end
    end
 end
@@ -11,13 +9,9 @@ end
 unless Integer.respond_to? :clamp
    class Integer
       def clamp(min, max)
-         if self < min
-            min
-         elsif self > max
-            max
-         else
-            self
-         end
+         return min if self < min
+         return max if self > max
+         self
       end
    end
 end