mikeplayer 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44526118ece6d69a3b2711ec7595ebf65da59a0729e49439b663b8c28d0db6ac
-  data.tar.gz: fd2a73b35a0d17a834f098a92a8f34485bb67e4d68a7889d05389626f0ea9560
+  metadata.gz: b38d5b7fef4b5141b1f884d386ca6d8cbc17b4890aacaac2a649b06aefd84674
+  data.tar.gz: 1f38509a5e275b35d9adbb83c4cf09b23c739f999afe71c7d8ffc16ffbd865d6
 SHA512:
-  metadata.gz: 1642c31f25824a61692fb4c7a8a0d8b1d61c06369ae7ccb85f231a82fbe3c6f62d7c30e7dbbaf77751fb72f0abc67cfa6b2cabacc795f0eb08bf592db0af8b53
-  data.tar.gz: 37491c892b710fd8984da1bf95995043a1c7569d04c34856d4b136b00242644f3dc6692088cd75e003749296a838b160f6886ef1907e257abd0d32a490e343ea
+  metadata.gz: 0216f0b2f19389ce060bd48fb1ce7bbfbd13a8e9ff3ae461c16830b745c5eaa463e9f4f1c6706e2085338cc44848d11b855e32e0454a98e5f8cdd96ec916939c
+  data.tar.gz: a72f9a0446bcc94e87229812029b7de95bfb1d881450d665fce45e8161c0aa9ee83c762bf42d392e08491e68f10c03244819efa8e94499725d767c7be6f02338

data/bin/MikePlayer.rb

@@ -14,14 +14,15 @@ OptionParser.new do |opt|
 
   EOF
   opt.on('-s', '--shuffle', 'Shuffle playlist.') { |o| options[:shuffle] = true }
-  opt.on('-r', '--random n', 'Create playlist with randomly picked n songs.') { |o| options[:random] = o.to_i }
+  opt.on('-r', '--random n', Integer, 'Create playlist with randomly picked n songs.') { |o| options[:random] = o }
   opt.on('-o', '--overwrite', 'Overwrite playlist.') { |o| options[:overwrite] = true }
-  opt.on('-v', '--volume n', 'Changes default volume.') { |o| options[:volume] = o }
+  opt.on('-v', '--volume n', Float, 'Changes default volume.') { |o| options[:volume] = o }
   opt.on('-p', '--playlist name', 'Play playlist name.') { |o| options[:playlist] = o }
   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('-t', '--time minutes', Integer, 'Limit time to number of minutes.') { |o| options[:minutes] = o }
   opt.on('-x', '--debug', 'Turn on debug.') { |o| options[:debug] = true }
+  opt.on('-f', '--fullscreen', 'Use an alternate full-screen buffer while playing.') { |o| options[:fullscreen] = true }
 end.parse!
 
 MikePlayer::Player.new(options, ARGV).play

data/lib/mikeplayer/display.rb

@@ -3,24 +3,57 @@ module MikePlayer
     PAUSE_INDICATOR = '||'.freeze
     INDICATOR_SIZE  = 4
 
+    RESET           = "\e[0m".freeze
+    TITLE_COLOR     = "\e[1;36m".freeze # bold cyan
+    DIM_COLOR       = "\e[2m".freeze    # dim gray
+    BANNER_COLOR    = "\e[1;37m".freeze # bold white
+    ELAPSED_COLOR   = "\e[37m".freeze   # white
+    COUNTDOWN_COLOR = "\e[33m".freeze   # yellow
+    PLAY_COLOR      = "\e[32m".freeze   # green
+    PAUSE_COLOR     = "\e[1;31m".freeze # bold red
+
+    ENTER_ALT_SCREEN = "\e[?1049h\e[2J\e[H".freeze
+    EXIT_ALT_SCREEN  = "\e[?1049l".freeze
+
+    def self.colorize(text, color)
+      return text unless $stdout.tty?
+
+      "#{color}#{text}#{RESET}"
+    end
+
+    def self.enter_fullscreen
+      print(ENTER_ALT_SCREEN)
+      $stdout.flush
+    end
+
+    def self.exit_fullscreen
+      print(EXIT_ALT_SCREEN)
+      $stdout.flush
+    end
+
     def initialize
       @width     = 0
       @indicator = ''
+      @paused    = false
       @changed   = false
+      @color     = $stdout.tty?
     end
 
     def song_info=(v)
-      @info_prefix = "\r#{v}".freeze
+      @position = v[:position].freeze
+      @title    = v[:title].freeze
     end
 
     def elapsed=(v)
       @indicator = "#{'>' * (v % INDICATOR_SIZE)}".ljust(INDICATOR_SIZE)
+      @paused    = false
       @changed   = true
     end
 
     def paused
-      if (false == @indicator.include?(PAUSE_INDICATOR))
+      if (false == @paused)
         @indicator = PAUSE_INDICATOR.ljust(INDICATOR_SIZE)
+        @paused    = true
         @changed   = true
       end
     end
@@ -30,13 +63,20 @@ module MikePlayer
 
       mindicator = "(#{countdown}↓) " if countdown
 
-      print("\r" << ' '.ljust(@width))
+      position  = colorize(@position, DIM_COLOR)
+      title     = colorize(@title, TITLE_COLOR)
+      elapsed   = colorize(elapsed_info, ELAPSED_COLOR)
+      indicator = colorize(@indicator, @paused ? PAUSE_COLOR : PLAY_COLOR)
+      count     = countdown ? colorize(mindicator, COUNTDOWN_COLOR) : ''
 
-      info  = "#{@info_prefix} #{elapsed_info} #{mindicator}#{@indicator}"
+      plain_info = "Playing #{@position}: #{@title} #{elapsed_info} #{mindicator}#{@indicator}"
+      info       = "\rPlaying #{position}: #{title} #{elapsed} #{count}#{indicator}"
+
+      print("\r" << ' '.ljust(@width))
 
       print(info)
 
-      @width   = info.size
+      @width   = plain_info.size
       @changed = false
 
       $stdout.flush
@@ -45,5 +85,13 @@ module MikePlayer
     def changed?
       true == @changed
     end
+
+    private
+
+    def colorize(text, color)
+      return text unless @color
+
+      "#{color}#{text}#{RESET}"
+    end
   end
 end

data/lib/mikeplayer/play_thread.rb

@@ -3,11 +3,12 @@ module MikePlayer
     def initialize(volume: 1.0)
       check_system
 
-      @pid     = nil
-      @volume  = volume
-      @start_t = 0
-      @elapsed = 0
-      @paused  = false
+      @pid         = nil
+      @wait_thread = nil
+      @volume      = volume
+      @start_t     = 0
+      @elapsed     = 0
+      @paused      = false
     end
 
     def play(file)
@@ -38,25 +39,19 @@ module MikePlayer
       @elapsed += Time.now.to_i - @start_t
       @start_t  = 0
 
-      10.times do
-        break unless alive?
-
-        sleep 0.1
-      end
+      @wait_thread&.join(1)
 
       kill('KILL')
 
-      10.times do
-        break unless alive?
-
-        sleep 0.1
-      end
+      @wait_thread&.join
 
       @paused = true
     end
 
     def kill(signal)
       Process.kill(signal, @pid) if alive?
+    rescue Errno::ESRCH
+      nil
     end
 
     def alive?
@@ -117,7 +112,8 @@ module MikePlayer
 
       stdin, stdother, thread_info = Open3.popen2e(*args)
 
-      @pid = thread_info.pid
+      @pid         = thread_info.pid
+      @wait_thread = thread_info
 
       10.times do
         break if alive?

data/lib/mikeplayer/playlist.rb

@@ -70,7 +70,7 @@ module MikePlayer
     def song_info(i)
       song_i_str = "#{i + 1}".rjust(self.size.to_s.size)
 
-      return "Playing (#{song_i_str}/#{self.size}): #{get(i).info}".freeze
+      return { position: "(#{song_i_str}/#{self.size})", title: get(i).info }
     end
 
     def size

data/lib/mikeplayer/settings.rb

@@ -16,8 +16,9 @@ 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
+      @debug      = options[:debug]
+      @random     = options[:random].to_i
+      @fullscreen = options[:fullscreen]
 
       if (false == Dir.exist?(@settings_dir))
         Dir.mkdir(@settings_dir)
@@ -48,6 +49,10 @@ module MikePlayer
       return true == @list
     end
 
+    def fullscreen?
+      return true == @fullscreen
+    end
+
     private
 
     def find_playlist(user_option)

data/lib/mikeplayer/song.rb

@@ -4,12 +4,17 @@ module MikePlayer
 
     def initialize(filename)
       @filename = filename
-      @mp3info  = Mp3Info.new(filename)
+
+      Mp3Info.open(filename) do |mp3info|
+        @artist = mp3info.tag.artist.to_s
+        @title  = mp3info.tag.title.to_s
+        @length = mp3info.length || 0
+      end
     end
 
     def info
-      artist = "#{@mp3info.tag.artist}"
-      title  = "#{@mp3info.tag.title}"
+      artist = @artist
+      title  = @title
 
       if (true == artist.empty?) && (true == title.empty?)
         return File.basename(@filename, '.mp3')
@@ -23,7 +28,7 @@ module MikePlayer
     end
 
     def length
-      return @mp3info.length || 0
+      return @length
     end
 
     def length_str(elapsed_time)

data/lib/mikeplayer/version.rb

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

data/lib/mikeplayer.rb

@@ -27,6 +27,7 @@ module MikePlayer
       @timer_start = Time.now if (@minutes > 0)
       @state     = STOPPED
       @player    = PlayThread.new(volume: @settings.volume)
+      @song_mutex = Mutex.new
 
       if (true == @settings.list?)
         @songs.map { |song| File.basename(song) }.sort.each {|song| puts "#{File.basename(song)}"}
@@ -48,8 +49,13 @@ module MikePlayer
     def play
       @playlist.shuffle! if @settings.shuffle?
 
-      puts "Mike Player v#{MikePlayer::VERSION}"
-      puts "Playlist #{@playlist.info}\n"
+      if @settings.fullscreen?
+        Display.enter_fullscreen
+        at_exit { Display.exit_fullscreen }
+      end
+
+      puts Display.colorize("Mike Player v#{MikePlayer::VERSION}", Display::BANNER_COLOR)
+      puts "#{Display.colorize("Playlist #{@playlist.info}", Display::DIM_COLOR)}\n"
 
       if (0 == @playlist.size)
         puts "No songs in playlist."
@@ -81,6 +87,8 @@ module MikePlayer
           if playing? && @player.stopped?
             next_song
           elsif paused?
+            @display.display!(song.length_str(@player.elapsed), minutes_remaining)
+
             while paused?
               sleep(sleep_time)
             end
@@ -158,27 +166,35 @@ module MikePlayer
     end
 
     def next_song
-      debug('n')
+      @song_mutex.synchronize do
+        return if changing?
 
-      @state = SONG_CHANGE
+        debug('n')
 
-      @player.stop
+        @state = SONG_CHANGE
+
+        @player.stop
 
-      @song_i += 1
+        @song_i += 1
+      end
     end
 
     def previous_song
-      debug('p')
+      @song_mutex.synchronize do
+        return if changing?
 
-      @state = SONG_CHANGE
+        debug('p')
 
-      if (@player.elapsed < 10)
-        @song_i -= 1 if @song_i.positive?
-      else
-        debug('x')
-      end
+        @state = SONG_CHANGE
 
-      @player.stop
+        if (@player.elapsed < 10)
+          @song_i -= 1 if @song_i.positive?
+        else
+          debug('x')
+        end
+
+        @player.stop
+      end
     end
 
     def pause_if_over_time_limit

data/mikeplayer.gemspec

@@ -34,6 +34,5 @@ Gem::Specification.new do |spec|
   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'
+  spec.add_development_dependency 'rake', '~> 13'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mikeplayer
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Mike Crockett
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -58,28 +57,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11'
+        version: '13'
 description: |
   Wraps Sox's `play` command, allowing playslists, find, random and time limit.
   Once a song is playing you can:
@@ -113,7 +98,6 @@ homepage: https://github.com/mmcrockett/mikeplayer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -128,8 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Wraps Sox's `play` command, allowing playslists, find, random and time limit.
 test_files: []