mikeplayer 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da3837b6ce739aa20ed88bf085abd0ecad1be6f88be884e581d601a4463cd548
-  data.tar.gz: 89e4ce6a4aa879a82b97d17567cc187c323cba56aaba1f56bf3e8a3c1a272ba8
+  metadata.gz: 4629aa37d245f2c061c144700a0d23aba06a851085baed86b54a8514c7919146
+  data.tar.gz: 1554111b1ae2568d736a248f9310d79ec6198c4f1cb0d672814f287a463d7ddb
 SHA512:
-  metadata.gz: 5ea01390ed6529bc297751b3b89b6bba8913370c8d39afc57195ab71906961e2d2b0d630d064e5e1f79a0af413f61583b73f2f4797259ff9069aed50686a8d34
-  data.tar.gz: bb081e5da791f92addebff815a5d4d63e60e39554387a859eb69849d246f4216f0abfa3c1503eb708d6cbadeb0d082c97048707962664beb85ccf98d1fd8df0c
+  metadata.gz: cbaec3a72786231a7c327259539a1aef222b1a8e548e9254ac09ac5a3c65c2a6b39d992f9590450ee382e8f521c6e61031a8b798617517a867f4eebbf7411356
+  data.tar.gz: 3bd515e08a89b88cf3e52c21f547d2b056a5472b9ef6db95da378ff7c1b612e79cbbd824623e067d18ee7db218627d67a8244c6db60f1f5c34f0bf06752f2303

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,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,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/version.rb

@@ -1,3 +1,3 @@
 module MikePlayer
-  VERSION = '1.0.6'.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.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Mike Crockett
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-07 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: