mikeplayer 1.0.5 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9879977df429314cabecaa45ecfbb6ccbbacec7fc37373ff662f9bad7e45e9b
-  data.tar.gz: cf6ae72fbce490df8c9cd4c38c79ba5981b6d0f3e4bf9ffa49c75177da53daac
+  metadata.gz: 44526118ece6d69a3b2711ec7595ebf65da59a0729e49439b663b8c28d0db6ac
+  data.tar.gz: fd2a73b35a0d17a834f098a92a8f34485bb67e4d68a7889d05389626f0ea9560
 SHA512:
-  metadata.gz: 9c033b5878334afee9c6dbe67f7a1695e8d128450d543bc441fab2bc94d0ab88ea2723701446f56284c734a4b9d1caa63e60a7a9250bf570b5f2fe20a3f984ea
-  data.tar.gz: df8957048df10a07ed5a0a3169a93a479fdeea622dac3c4af8bfb344be89ab0ee71ab83a8e079ecc1adfb69440d4f5330237455b8c8c8da4ec983c0898931de9
+  metadata.gz: 1642c31f25824a61692fb4c7a8a0d8b1d61c06369ae7ccb85f231a82fbe3c6f62d7c30e7dbbaf77751fb72f0abc67cfa6b2cabacc795f0eb08bf592db0af8b53
+  data.tar.gz: 37491c892b710fd8984da1bf95995043a1c7569d04c34856d4b136b00242644f3dc6692088cd75e003749296a838b160f6886ef1907e257abd0d32a490e343ea

data/lib/mikeplayer.rb

@@ -4,29 +4,29 @@ require 'open3'
 require 'io/console'
 require 'mp3info'
 require 'mikeplayer/version'
-require 'mikeplayer/settings'
+require 'mikeplayer/display'
 require 'mikeplayer/playlist'
+require 'mikeplayer/play_thread'
+require 'mikeplayer/settings'
 require 'mikeplayer/song'
 
 module MikePlayer
   class Player
-    PAUSE_INDICATOR    = "||".freeze
-    INDICATOR_SIZE     = 4
-    SLEEP_SETTING      = 0.5
+    PLAY_SLEEP         = 0.5
+    PAUSE_SLEEP        = 1.0
     STOPPED            = :stopped
     PLAYING            = :playing
     PAUSED             = :paused
+    SONG_CHANGE        = :song_change
 
     def initialize(options, *args)
       @settings  = Settings.new(options)
       @playlist  = Playlist.new(@settings.playlist)
       @minutes   = @settings.minutes
       @command   = ''
-      @pid       = nil
-      @timer_start = nil
+      @timer_start = Time.now if (@minutes > 0)
       @state     = STOPPED
-
-      check_system
+      @player    = PlayThread.new(volume: @settings.volume)
 
       if (true == @settings.list?)
         @songs.map { |song| File.basename(song) }.sort.each {|song| puts "#{File.basename(song)}"}
@@ -58,66 +58,36 @@ module MikePlayer
       end
 
       @thread = Thread.new do
-        @song_i         = 0
-        display_width   = 0
+        @display = Display.new
+        @song_i  = 0
 
         while (@song_i < @playlist.size)
-          song        = @playlist.get(@song_i)
-          @song_start = Time.now
-          @pause_time = nil
-          info_prefix = "\r#{@playlist.song_info(@song_i)}".freeze
+          @display.song_info = @playlist.song_info(@song_i)
 
-          stdin, stdother, thread_info = Open3.popen2e('play', '--no-show-progress', '--volume', @settings.volume, song.filename)
+          @player.play(song.filename)
 
           @state   = PLAYING
-          @pid     = thread_info.pid
-          indicator = ''
-          info_changed = false
 
-          while (true == pid_alive?)
+          while @player.playing?
             pause_if_over_time_limit
 
-            if (true == playing?)
-              indicator = "#{'>' * (playing_time % INDICATOR_SIZE)}".ljust(INDICATOR_SIZE)
-              info_changed = true
-            elsif (true == paused?) && (false == indicator.include?(PAUSE_INDICATOR))
-              indicator = PAUSE_INDICATOR.ljust(INDICATOR_SIZE)
-              info_changed = true
-            end
-
-            if (true == info_changed)
-              mindicator = ""
-
-              if (0 < minutes_remaining)
-                mindicator = "(#{minutes_remaining}↓) "
-              end
-
-              print("\r" << ' '.ljust(display_width))
+            @display.elapsed = @player.elapsed if playing?
 
-              info  = "#{info_prefix} #{song.length_str(playing_time)} #{mindicator}#{indicator}"
+            @display.display!(song.length_str(@player.elapsed), minutes_remaining)
 
-              print(info)
-
-              display_width = info.size
-
-              info_changed = false
-              $stdout.flush
-            end
-
-            sleep SLEEP_SETTING
+            sleep(sleep_time)
           end
 
-          stdin.close
-          stdother.close
-
-          @pid = nil
-
-          if (true == playing?) && (playing_time >= (song.length - 1))
+          if playing? && @player.stopped?
             next_song
+          elsif paused?
+            while paused?
+              sleep(sleep_time)
+            end
           end
         end
 
-        @pid   = nil
+        @player.stop
         print("\r\n")
         exit
       end
@@ -127,30 +97,8 @@ module MikePlayer
       print("\r\n")
     end
 
-    def cmd_exist?(cmd)
-      if (true != system('command'))
-        raise "Missing 'command' command, which is used to test compatibility."
-      end
-
-      if (true != system("command -v #{cmd} >/dev/null 2>&1"))
-        return false
-      end
-
-      return true
-    end
-
     private
 
-    def check_system
-      %w(play).each do |cmd|
-        if (false == cmd_exist?(cmd))
-          raise "#{cmd} failed, do you have sox installed?"
-        end
-      end
-
-      return nil
-    end
-
     def wait_on_user
       while ('q' != @command)
         @command = STDIN.getch
@@ -161,9 +109,8 @@ module MikePlayer
           next_song
         elsif ('z' == @command)
           previous_song
-        elsif ('q' == @command) && (false == @pid.nil?)
-          stop_song
-          @thread.kill
+        elsif ('q' == @command)
+          press_stop
         elsif ('t' == @command)
           @timer_start = Time.now
         elsif (false == @timer_start.nil?) && ("#{@command.to_i}" == @command)
@@ -185,68 +132,58 @@ module MikePlayer
       return (PAUSED == @state)
     end
 
-    def press_pause
-      if (true == playing?)
-        kill("STOP")
-        @pause_time = Time.now
-        @state = PAUSED
-      elsif (true == paused?)
-        kill("CONT")
-        @song_start += (Time.now - @pause_time)
-        @pause_time = nil
-        @state = PLAYING
-      else
-        print("Confused state #{@state}.")
-      end
+    def changing?
+      return (SONG_CHANGE == @state)
     end
 
-    def stop_song
-      kill("INT")
-
-      sleep 0.2
-
-      if (true == pid_alive?)
-        kill("KILL")
-      end
-
+    def press_stop
+      @player.stop
       @state = STOPPED
     end
 
-    def pid_alive?(pid = @pid)
-      if (false == pid.nil?)
-        return system("ps -p #{pid} > /dev/null")
-      end
+    def press_pause
+      debug('|')
 
-      return false
+      if playing?
+        debug('>')
+        @state = PAUSED
+        @display.paused
+        @player.pause
+      elsif paused?
+        debug('|')
+        @state = PLAYING
+      else
+        print("Confused state #{@state}.")
+      end
     end
 
     def next_song
       debug('n')
-      stop_song
+
+      @state = SONG_CHANGE
+
+      @player.stop
 
       @song_i += 1
     end
 
     def previous_song
       debug('p')
-      stop_song
 
-      if (playing_time < 10)
-        @song_i -= 1 unless @song_i <= 0
+      @state = SONG_CHANGE
+
+      if (@player.elapsed < 10)
+        @song_i -= 1 if @song_i.positive?
       else
         debug('x')
       end
-    end
 
-    def kill(signal)
-      if (false == @pid.nil?)
-        Process.kill(signal, @pid)
-      end
+      @player.stop
     end
 
     def pause_if_over_time_limit
       if (false == @timer_start.nil?) && (0 < @minutes) && (true == playing?)
-        if (0 > minutes_remaining)
+        if (minutes_remaining && 0 >= minutes_remaining)
           press_pause
           @timer_start = nil
           @minutes    = 0
@@ -254,24 +191,20 @@ module MikePlayer
       end
     end
 
-    def playing_time
-      return (Time.now - @song_start).to_i - pause_time
+    def minutes_remaining
+      return if ((0 == @minutes) || (@timer_start.nil?))
+
+      (@minutes - ((Time.now - @timer_start).to_i / 60).to_i)
     end
 
-    def pause_time
-      if (@pause_time.nil?)
-        return 0
-      else
-        return (Time.now - @pause_time).to_i
-      end
+    def sleep_time
+      return PLAY_SLEEP if playing?
+
+      PAUSE_SLEEP
     end
 
-    def minutes_remaining
-      if ((0 == @minutes) || (@timer_start.nil?))
-        return -1
-      else
-        return (@minutes - ((Time.now - @timer_start).to_i / 60).to_i)
-      end
+    def song
+      @playlist.get(@song_i)
     end
 
     def debug(str)

data/lib/mikeplayer/display.rb

@@ -0,0 +1,49 @@
+module MikePlayer
+  class Display
+    PAUSE_INDICATOR = '||'.freeze
+    INDICATOR_SIZE  = 4
+
+    def initialize
+      @width     = 0
+      @indicator = ''
+      @changed   = false
+    end
+
+    def song_info=(v)
+      @info_prefix = "\r#{v}".freeze
+    end
+
+    def elapsed=(v)
+      @indicator = "#{'>' * (v % INDICATOR_SIZE)}".ljust(INDICATOR_SIZE)
+      @changed   = true
+    end
+
+    def paused
+      if (false == @indicator.include?(PAUSE_INDICATOR))
+        @indicator = PAUSE_INDICATOR.ljust(INDICATOR_SIZE)
+        @changed   = true
+      end
+    end
+
+    def display!(elapsed_info, countdown = nil)
+      return unless changed?
+
+      mindicator = "(#{countdown}↓) " if countdown
+
+      print("\r" << ' '.ljust(@width))
+
+      info  = "#{@info_prefix} #{elapsed_info} #{mindicator}#{@indicator}"
+
+      print(info)
+
+      @width   = info.size
+      @changed = false
+
+      $stdout.flush
+    end
+
+    def changed?
+      true == @changed
+    end
+  end
+end

data/lib/mikeplayer/play_thread.rb

@@ -1,13 +1,141 @@
 module MikePlayer
   class PlayThread
-    def self.run(file, volume)
+    def initialize(volume: 1.0)
+      check_system
+
+      @pid     = nil
+      @volume  = volume
+      @start_t = 0
+      @elapsed = 0
+      @paused  = false
+    end
+
+    def play(file)
+      start_position = 0
+
+      if paused?
+        start_position = @elapsed
+      else
+        @elapsed = 0
+      end
+
+      start_thread(file: file, start_position: start_position)
+
+      @start_t = Time.now.to_i
+    end
+
+    def stop
+      pause
+
+      @elapsed = 0
+      @start_t = 0
+      @paused  = false
+    end
+
+    def pause
+      kill('INT')
+
+      @elapsed += Time.now.to_i - @start_t
+      @start_t  = 0
+
+      10.times do
+        break unless alive?
+
+        sleep 0.1
+      end
+
+      kill('KILL')
+
+      10.times do
+        break unless alive?
+
+        sleep 0.1
+      end
+
+      @paused = true
+    end
+
+    def kill(signal)
+      Process.kill(signal, @pid) if alive?
+    end
+
+    def alive?
+      MikePlayer::PlayThread.alive?(@pid)
+    end
+
+    def stopped?
+      false == alive?
+    end
+
+    def paused?
+      @paused && stopped?
+    end
+
+    def playing?
+      alive?
+    end
+
+    def elapsed
+      return (@elapsed + (Time.now.to_i - @start_t)) if @start_t.positive?
+
+      @elapsed
+    end
+
+    def self.alive?(pid)
+      return system("ps -p #{pid} > /dev/null") unless pid.nil?
+
+      false
+    end
+
+    def self.cmd_exist?(cmd)
+      if @test_cmd.nil?
+        if system('command')
+          @test_cmd = 'command -v'
+        elsif system('bash -c "command"')
+          @test_cmd = 'bash -c "command -v"'
+        else
+          raise "Missing 'command' command, which is used to test compatibility."
+        end
+      end
+
+      if (true != system("#{@test_cmd} #{cmd} >/dev/null 2>&1"))
+        return false
+      end
+
+      return true
+    end
+
+    private
+    def start_thread(file:, start_position: )
       args = [
-        :play,
+        'play',
         '--no-show-progress',
-        '--volume', volume,
-        song
+        '--volume', @volume.to_s,
+        file,
+        'trim', start_position.to_s,
       ]
-      Open3.popen2e(*args) do |stdin, out, wait_thr|
+
+      stdin, stdother, thread_info = Open3.popen2e(*args)
+
+      @pid = thread_info.pid
+
+      10.times do
+        break if alive?
+
+        sleep 0.2
+      end
+
+      raise "Failed to play #{stdother.read}" unless alive?
+
+      stdin.close
+      stdother.close
+
+      self
+    end
+
+    def check_system
+      %w[play].each do |cmd|
+        raise "#{cmd} failed, do you have sox installed?" unless MikePlayer::PlayThread.cmd_exist?(cmd)
       end
     end
   end

data/lib/mikeplayer/playlist.rb

@@ -64,7 +64,7 @@ module MikePlayer
     end
 
     def info
-      return "#{self.name} loaded #{@loaded_song_count} songs with length #{Song.as_duration_str(@length)}, added #{self.size - @loaded_song_count}"
+      return "#{self.name} loaded #{@loaded_song_count} and added #{self.size - @loaded_song_count} songs with length #{Song.as_duration_str(@length)}"
     end
 
     def song_info(i)

data/lib/mikeplayer/version.rb

@@ -1,3 +1,3 @@
 module MikePlayer
-  VERSION = '1.0.5'.freeze
+  VERSION = '1.1.1'.freeze
 end

data/mikeplayer.gemspec

@@ -3,15 +3,15 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mikeplayer/version'
 
-Gem::Specification.new do |gem|
-  gem.name          = 'mikeplayer'
-  gem.version       = MikePlayer::VERSION
-  gem.authors       = ['Mike Crockett']
-  gem.email         = ['rubygems@mmcrockett.com']
-  gem.summary       = 'Wraps Sox\'s `play` command, allowing playslists, find, random and time limit.'
-  gem.executables   << 'MikePlayer.rb'
-  gem.description   = <<-EOF.gsub(/^\s+/, '')
-    #{gem.summary}
+Gem::Specification.new do |spec|
+  spec.name          = 'mikeplayer'
+  spec.version       = MikePlayer::VERSION
+  spec.authors       = ['Mike Crockett']
+  spec.email         = ['rubygems@mmcrockett.com']
+  spec.summary       = 'Wraps Sox\'s `play` command, allowing playslists, find, random and time limit.'
+  spec.executables   << 'MikePlayer.rb'
+  spec.description   = <<-EOF.gsub(/^\s+/, '')
+    #{spec.summary}
 
     Once a song is playing you can:
       'x' to previous
@@ -20,17 +20,20 @@ Gem::Specification.new do |gem|
       'q' to quit
       't' n to set a timer that will pause the music after n minutes
   EOF
-  gem.homepage      = 'https://github.com/mmcrockett/mikeplayer'
+  spec.homepage      = 'https://github.com/mmcrockett/mikeplayer'
 
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ['lib']
-  gem.licenses      = ['MIT']
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
+    f.match?(%r{^(test|spec|features|helpers|)/}) || f.match?(%r{^(\.[[:alnum:]]+)}) || f.match?(/console/)
+  end
 
-  gem.add_dependency 'json', '~> 1.8'
-  gem.add_dependency 'ruby-mp3info', '~> 0.8'
-  gem.add_dependency 'minitest', '~> 5'
-  gem.add_development_dependency 'rake', '~> 12'
-  gem.add_development_dependency 'byebug', '~> 11'
+  spec.executables   = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ['lib']
+  spec.licenses      = ['MIT']
+
+  spec.add_dependency 'json', '~> 2.5'
+  spec.add_dependency 'ruby-mp3info', '~> 0.8'
+  spec.add_dependency 'minitest', '~> 5'
+  spec.add_development_dependency 'rake', '~> 12'
+  spec.add_development_dependency 'byebug', '~> 11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mikeplayer
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.1
 platform: ruby
 authors:
 - Mike Crockett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-30 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: ruby-mp3info
   requirement: !ruby/object:Gem::Requirement
@@ -95,13 +95,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/MikePlayer.rb
 - lib/mikeplayer.rb
+- lib/mikeplayer/display.rb
 - lib/mikeplayer/executable.rb
 - lib/mikeplayer/play_thread.rb
 - lib/mikeplayer/playlist.rb
@@ -109,9 +109,6 @@ files:
 - lib/mikeplayer/song.rb
 - lib/mikeplayer/version.rb
 - mikeplayer.gemspec
-- test/mikeplayer/settings_test.rb
-- test/mikeplayer_test.rb
-- test/test_helper.rb
 homepage: https://github.com/mmcrockett/mikeplayer
 licenses:
 - MIT
@@ -131,12 +128,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Wraps Sox's `play` command, allowing playslists, find, random and time limit.
-test_files:
-- test/mikeplayer/settings_test.rb
-- test/mikeplayer_test.rb
-- test/test_helper.rb
+test_files: []

data/.gitignore

@@ -1,51 +0,0 @@
-*.gem
-Gemfile.lock
-*.rbc
-/.config
-/coverage/
-/InstalledFiles
-/pkg/
-/spec/reports/
-/spec/examples.txt
-/test/tmp/
-/test/version_tmp/
-/tmp/
-
-# Used by dotenv library to load environment variables.
-# .env
-
-## Specific to RubyMotion:
-.dat*
-.repl_history
-build/
-*.bridgesupport
-build-iPhoneOS/
-build-iPhoneSimulator/
-
-## Specific to RubyMotion (use of CocoaPods):
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# vendor/Pods/
-
-## Documentation cache and generated files:
-/.yardoc/
-/_yardoc/
-/doc/
-/rdoc/
-
-## Environment normalization:
-/.bundle/
-/vendor/bundle
-/lib/bundler/man/
-
-# for a library or gem, you might want to ignore these files since the code is
-# intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
-
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc

data/test/mikeplayer/settings_test.rb

@@ -1,17 +0,0 @@
-require 'test_helper'
-
-class SettingsTest < Minitest::Test
-  describe 'settings' do
-    let(:home) { File.join('', 'tmp') }
-    let(:sdir) { File.join(home, MikePlayer::Settings::SETTINGS_DIRECTORY) }
-
-    before do
-      Dir.delete(sdir) if Dir.exist?(sdir)
-    end
-
-    it 'creates a settings directory' do
-      MikePlayer::Settings.new(home: home)
-      assert(Dir.exist?(sdir))
-    end
-  end
-end

data/test/mikeplayer_test.rb

@@ -1,9 +0,0 @@
-require 'test_helper'
-
-class MikePlayerTest < Minitest::Test
-  describe 'mikeplayer' do
-    it 'has a version' do
-      assert(MikePlayer::VERSION)
-    end
-  end
-end

data/test/test_helper.rb

@@ -1,5 +0,0 @@
-$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
-require 'mikeplayer'
-
-require 'minitest/autorun'
-require 'byebug'