mikeplayer 1.1.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75710f4741268d6bbc3c8708b626733ac02bf3dbbcaf3c8224761ddaea270ca4
-  data.tar.gz: 75fff78aa2ebfa4b4a2815a743fca6a923a4f85ee9bddf25f528167b08cdfaf0
+  metadata.gz: dc4762ff6cf9ce9e9cbbd87c1d46a92629faab94444a79423a9797ce257fc284
+  data.tar.gz: d629eb95a5a352242dc03b41a1565bf71089ef2bc8986519131f020db73a69fc
 SHA512:
-  metadata.gz: 8d20411df67b44cd5f25b4aaea1b1ab22e632eaa8505a47c3fbee652e88e75e314e42785e525cfbb97bf71876fdf4300165248d90deb0bfeaf9be1eeba459e06
-  data.tar.gz: a2877632fb5b48cb60d1eec6502f8b3d5015384c952852a47d6aace6531690b6adee4d66851e07ec29bf040d3b69139bdd5ca5d95bb4cc20c2d28ae66fbb65c2
+  metadata.gz: b73c5011fea15ef7c33866d7abd727132a7f23b737c8985bbbf223e724517dcc8de6d17b592a83e9eb2f11035d585504fe499f2ca755fd0c457e9be83b4b0ecc
+  data.tar.gz: 80cad1d3712f04b2886a1dca59fa850aa9fb6c8b3497759e9e61fed8048389465e198c0e20e58c6fd3e65a69f5bb681c3d4e47a0c864ab40775faba7c0698aa1

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

@@ -2,25 +2,70 @@ module MikePlayer
   class Display
     PAUSE_INDICATOR = '||'.freeze
     INDICATOR_SIZE  = 4
+    PROGRESS_WIDTH  = 40
 
-    def initialize
-      @width     = 0
-      @indicator = ''
-      @changed   = false
+    TITLE_ROW = 4
+    BAR_ROW   = 5
+    HINT_ROW  = 7
+
+    HINT_TEXT = 'c: pause/play   v: next   z: previous   t: set timer   q: quit'.freeze
+
+    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\e[?25l".freeze
+    EXIT_ALT_SCREEN  = "\e[?25h\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(fullscreen: false)
+      @width           = 0
+      @indicator       = ''
+      @paused          = false
+      @changed         = false
+      @color           = $stdout.tty?
+      @fullscreen      = fullscreen
+      @elapsed_seconds = 0
+      @length          = 0
     end
 
     def song_info=(v)
-      @info_prefix = "\r#{v}".freeze
+      @position = v[:position].freeze
+      @title    = v[:title].freeze
+      @length   = v[:length].to_f
     end
 
     def elapsed=(v)
+      @elapsed_seconds = 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
@@ -28,22 +73,76 @@ module MikePlayer
     def display!(elapsed_info, countdown = nil)
       return unless changed?
 
+      if @fullscreen
+        display_panel!(elapsed_info, countdown)
+      else
+        display_line!(elapsed_info, countdown)
+      end
+    end
+
+    def changed?
+      true == @changed
+    end
+
+    private
+
+    def display_line!(elapsed_info, countdown)
       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) : ''
+
+      plain_info = "Playing #{@position}: #{@title} #{elapsed_info} #{mindicator}#{@indicator}"
+      info       = "\rPlaying #{position}: #{title} #{elapsed} #{count}#{indicator}"
 
-      info  = "#{@info_prefix} #{elapsed_info} #{mindicator}#{@indicator}"
+      print("\r" << ' '.ljust(@width))
 
       print(info)
 
-      @width   = info.size
+      @width   = plain_info.size
       @changed = false
 
       $stdout.flush
     end
 
-    def changed?
-      true == @changed
+    def display_panel!(elapsed_info, countdown)
+      mindicator = "(#{countdown}↓) " if countdown
+      count      = countdown ? colorize(mindicator, COUNTDOWN_COLOR) : ''
+      state      = colorize(@paused ? 'PAUSED' : 'PLAYING', @paused ? PAUSE_COLOR : PLAY_COLOR)
+
+      move_to(TITLE_ROW)
+      print("Playing #{colorize(@position, DIM_COLOR)}: #{colorize(@title, TITLE_COLOR)}")
+
+      move_to(BAR_ROW)
+      print("#{progress_bar} #{colorize(elapsed_info, ELAPSED_COLOR)} #{count}#{state}")
+
+      move_to(HINT_ROW)
+      print(colorize(HINT_TEXT, DIM_COLOR))
+
+      @changed = false
+
+      $stdout.flush
+    end
+
+    def move_to(row)
+      print("\e[#{row};1H\e[2K")
+    end
+
+    def progress_bar
+      pct    = @length.positive? ? (@elapsed_seconds.to_f / @length).clamp(0, 1) : 0
+      filled = (pct * PROGRESS_WIDTH).round
+      bar    = "[#{'#' * filled}#{'-' * (PROGRESS_WIDTH - filled)}]"
+
+      colorize(bar, @paused ? PAUSE_COLOR : PLAY_COLOR)
+    end
+
+    def colorize(text, color)
+      return text unless @color
+
+      "#{color}#{text}#{RESET}"
     end
   end
 end

data/lib/mikeplayer/play_thread.rb

@@ -16,6 +16,7 @@ module MikePlayer
 
       if paused?
         start_position = @elapsed
+        @paused        = false
       else
         @elapsed = 0
       end

data/lib/mikeplayer/playlist.rb

@@ -69,8 +69,9 @@ module MikePlayer
 
     def song_info(i)
       song_i_str = "#{i + 1}".rjust(self.size.to_s.size)
+      song       = get(i)
 
-      return "Playing (#{song_i_str}/#{self.size}): #{get(i).info}".freeze
+      return { position: "(#{song_i_str}/#{self.size})", title: song.info, length: song.length }
     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/version.rb

@@ -1,3 +1,3 @@
 module MikePlayer
-  VERSION = '1.1.2'.freeze
+  VERSION = '1.3.0'.freeze
 end

data/lib/mikeplayer.rb

@@ -49,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."
@@ -59,7 +64,7 @@ module MikePlayer
       end
 
       @thread = Thread.new do
-        @display = Display.new
+        @display = Display.new(fullscreen: @settings.fullscreen?)
         @song_i  = 0
 
         while (@song_i < @playlist.size)
@@ -79,12 +84,14 @@ module MikePlayer
             sleep(sleep_time)
           end
 
-          if playing? && @player.stopped?
-            next_song
-          elsif paused?
+          if @player.paused?
+            @display.display!(song.length_str(@player.elapsed), minutes_remaining)
+
             while paused?
               sleep(sleep_time)
             end
+          elsif playing?
+            next_song
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mikeplayer
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Mike Crockett