mikeplayer 1.0.2 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44e5e59f36ed8b6c41f8d2c36e65bb1b997b920a2dd3ad59eba2fff0c2dc5141
-  data.tar.gz: 59efb825846abc56475a6b5a562a3a897ea68f4b985ae4bb880c968492160bec
+  metadata.gz: 4629aa37d245f2c061c144700a0d23aba06a851085baed86b54a8514c7919146
+  data.tar.gz: 1554111b1ae2568d736a248f9310d79ec6198c4f1cb0d672814f287a463d7ddb
 SHA512:
-  metadata.gz: ddf8ec65bf9ba7486cf48cc4e27c4507d55fbc233aa2c3c9bb4afc74a6d0778a77a6817bc66070ab7adaa90248bed5ced766b4bf203e9afd905789800fc546a8
-  data.tar.gz: e3655f5176eb292128264151db69987dcd3b3fd3fcc6379c6c80028198e1b0da9833591ddd798cfb53d9395ee30a04bd77d9c6911eabd19608a13784c3614687
+  metadata.gz: cbaec3a72786231a7c327259539a1aef222b1a8e548e9254ac09ac5a3c65c2a6b39d992f9590450ee382e8f521c6e61031a8b798617517a867f4eebbf7411356
+  data.tar.gz: 3bd515e08a89b88cf3e52c21f547d2b056a5472b9ef6db95da378ff7c1b612e79cbbd824623e067d18ee7db218627d67a8244c6db60f1f5c34f0bf06752f2303

data/bin/MikePlayer.rb

@@ -21,6 +21,7 @@ OptionParser.new do |opt|
   opt.on('-l', '--list', 'List songs in playlist.') { |o| options[:list] = true; }
   opt.on('-d', '--directory name', 'Directory to find mp3s.') { |o| options[:directory] = o }
   opt.on('-t', '--time minutes', 'Limit time to number of minutes.') { |o| options[:minutes] = o }
+  opt.on('-x', '--debug', 'Turn on debug.') { |o| options[:debug] = true }
 end.parse!
 
 MikePlayer::Player.new(options, ARGV).play

data/bin/console

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'json'
+require 'mikeplayer'
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require 'irb'
+IRB.start

data/lib/mikeplayer.rb

@@ -4,28 +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
-    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)}"}
@@ -50,101 +51,54 @@ module MikePlayer
       puts "Mike Player v#{MikePlayer::VERSION}"
       puts "Playlist #{@playlist.info}\n"
 
-      if @playlist.finished?
+      if (0 == @playlist.size)
         puts "No songs in playlist."
         
         exit 1
       end
 
       @thread = Thread.new do
-        display_width   = 0
+        @display = Display.new
+        @song_i  = 0
 
-        while (false == @playlist.finished?)
-          song        = @playlist.current
-          @song_start = Time.now
-          info_prefix = "\r#{@playlist.current_song_info}".freeze
+        while (@song_i < @playlist.size)
+          @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 % 4)}"
-              info_changed = true
-            elsif (true == paused?) && (PAUSE_INDICATOR != indicator)
-              indicator = PAUSE_INDICATOR
-              info_changed = true
-            end
-
-            if (true == info_changed)
-              mindicator = ""
-
-              if (0 < minutes_remaining)
-                mindicator = "(#{minutes_remaining}↓) "
-              end
-
-              info  = "#{info_prefix} #{song.length_str(playing_time)} #{mindicator}#{indicator}".ljust(display_width)
+            @display.elapsed = @player.elapsed if playing?
 
-              display_width = info.size
+            @display.display!(song.length_str(@player.elapsed), minutes_remaining)
 
-              print(info)
-
-              info_changed = false
-              $stdout.flush
-            end
-
-            sleep SLEEP_SETTING
+            sleep(sleep_time)
           end
 
-          stdin.close
-          stdother.close
-
-          @pid = nil
-
-          if (true == playing?)
+          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
 
       wait_on_user
 
-      puts ""
-    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
+      print("\r\n")
     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
@@ -155,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)
@@ -179,66 +132,58 @@ module MikePlayer
       return (PAUSED == @state)
     end
 
+    def changing?
+      return (SONG_CHANGE == @state)
+    end
+
+    def press_stop
+      @player.stop
+      @state = STOPPED
+    end
+
     def press_pause
-      if (true == playing?)
-        kill("STOP")
-        @pause_time = Time.now
+      debug('|')
+
+      if playing?
+        debug('>')
         @state = PAUSED
-      elsif (true == paused?)
-        kill("CONT")
-        @song_start += (Time.now - @pause_time)
-        @pause_time = nil
+        @display.paused
+        @player.pause
+      elsif paused?
+        debug('|')
         @state = PLAYING
       else
         print("Confused state #{@state}.")
       end
     end
 
-    def stop_song
-      if (true == paused?)
-        kill("CONT")
-      end
-
-      kill("INT")
-
-      sleep 0.2
-
-      if (true == pid_alive?)
-        kill("KILL")
-      end
-
-      @state = STOPPED
-    end
-
-    def pid_alive?(pid = @pid)
-      if (false == pid.nil?)
-        return system("ps -p #{pid} > /dev/null")
-      end
+    def next_song
+      debug('n')
 
-      return false
-    end
+      @state = SONG_CHANGE
 
-    def next_song
-      stop_song
+      @player.stop
 
-      @playlist.next
+      @song_i += 1
     end
 
     def previous_song
-      stop_song
+      debug('p')
 
-      @playlist.previous
-    end
+      @state = SONG_CHANGE
 
-    def kill(signal)
-      if (false == @pid.nil?)
-        Process.kill(signal, @pid)
+      if (@player.elapsed < 10)
+        @song_i -= 1 if @song_i.positive?
+      else
+        debug('x')
       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
@@ -246,24 +191,24 @@ 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)
+      print(str) if @settings.debug?
     end
   end
 end

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,121 @@
 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
+
+      sleep 0.2
+
+      kill('KILL')
+
+      @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 (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 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
+
+      sleep 0.2
+
+      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

@@ -5,12 +5,11 @@ module MikePlayer
     def initialize(filename)
       @filename = filename
       @songs    = []
-      @song_i   = 0
       @length   = 0
     
       load_songs
 
-      @loaded_song_count = @songs.size
+      @loaded_song_count = self.size
     end
 
     def <<(song)
@@ -44,20 +43,8 @@ module MikePlayer
       return self
     end
 
-    def current
-      return @songs[@song_i]
-    end
-
-    def next
-      @song_i += 1
-
-      return self.current
-    end
-
-    def previous
-      @song_i -= 1 unless @song_i <= 0
-
-      return self.current
+    def get(i)
+      return @songs[i]
     end
 
     def shuffle!
@@ -77,17 +64,17 @@ module MikePlayer
     end
 
     def info
-      return "#{self.name} loaded #{@loaded_song_count} songs with length #{Song.as_duration_str(@length)}, added #{@songs.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 current_song_info
-      song_i_str = "#{@song_i + 1}".rjust(@songs.size.to_s.size)
+    def song_info(i)
+      song_i_str = "#{i + 1}".rjust(self.size.to_s.size)
 
-      return "Playing (#{song_i_str}/#{@songs.size}): #{current.info}".freeze
+      return "Playing (#{song_i_str}/#{self.size}): #{get(i).info}".freeze
     end
 
-    def finished?
-      return @song_i == @songs.size
+    def size
+      return @songs.size
     end
 
     private

data/lib/mikeplayer/settings.rb

@@ -16,6 +16,7 @@ module MikePlayer
       @music_dir = options[:directory] || File.join(@home, DEFAULT_DIRECTORY)
       @settings_dir = options[:settings] || File.join(@home, SETTINGS_DIRECTORY)
       @minutes   = options[:minutes].to_i
+      @debug     = options[:debug]
       @random    = options[:random].to_i
 
       if (false == Dir.exist?(@settings_dir))
@@ -35,6 +36,10 @@ module MikePlayer
       return 0 < @random
     end
 
+    def debug?
+      return (true == @debug)
+    end
+
     def overwrite?
       return true == @overwrite
     end

data/lib/mikeplayer/song.rb

@@ -23,7 +23,7 @@ module MikePlayer
     end
 
     def length
-      return @mp3info.length
+      return @mp3info.length || 0
     end
 
     def length_str(elapsed_time)

data/lib/mikeplayer/version.rb

@@ -1,3 +1,3 @@
 module MikePlayer
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.0.7'.freeze
 end

data/mikeplayer.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.licenses      = ['MIT']
 
-  gem.add_dependency 'json', '~> 1.8'
+  gem.add_dependency 'json', '~> 2.5'
   gem.add_dependency 'ruby-mp3info', '~> 0.8'
   gem.add_dependency 'minitest', '~> 5'
   gem.add_development_dependency 'rake', '~> 12'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mikeplayer
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.7
 platform: ruby
 authors:
 - Mike Crockett
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-28 00:00:00.000000000 Z
+date: 2021-02-02 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
@@ -92,6 +92,7 @@ email:
 - rubygems@mmcrockett.com
 executables:
 - MikePlayer.rb
+- console
 extensions: []
 extra_rdoc_files: []
 files:
@@ -101,7 +102,9 @@ files:
 - README.md
 - Rakefile
 - bin/MikePlayer.rb
+- bin/console
 - lib/mikeplayer.rb
+- lib/mikeplayer/display.rb
 - lib/mikeplayer/executable.rb
 - lib/mikeplayer/play_thread.rb
 - lib/mikeplayer/playlist.rb
@@ -116,7 +119,7 @@ homepage: https://github.com/mmcrockett/mikeplayer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -131,9 +134,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Wraps Sox's `play` command, allowing playslists, find, random and time limit.
 test_files: