mikeplayer 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b38d5b7fef4b5141b1f884d386ca6d8cbc17b4890aacaac2a649b06aefd84674
-  data.tar.gz: 1f38509a5e275b35d9adbb83c4cf09b23c739f999afe71c7d8ffc16ffbd865d6
+  metadata.gz: b1834e8d8cb1fad633b10c27790ba3bf4fb39c55f78cd3eabd772f6bfda7e1f1
+  data.tar.gz: 33684c8449ff729057767d320bbb562fac4f1e849f6c201374267ae4c5c817a5
 SHA512:
-  metadata.gz: 0216f0b2f19389ce060bd48fb1ce7bbfbd13a8e9ff3ae461c16830b745c5eaa463e9f4f1c6706e2085338cc44848d11b855e32e0454a98e5f8cdd96ec916939c
-  data.tar.gz: a72f9a0446bcc94e87229812029b7de95bfb1d881450d665fce45e8161c0aa9ee83c762bf42d392e08491e68f10c03244819efa8e94499725d767c7be6f02338
+  metadata.gz: 9d3d763eb65a94c25d05cc23ffa711a3dc25c178f0fb91d5f8eba471797296281fe71ab9f58ea80d2b68f41c0b82209d8e218cb82e71589c4f0c05d44af6e55b
+  data.tar.gz: 4b985da8d1283c6803d26a311510a811dfb707f39ae4ccf60a54ca73edf2b29f0b36f4da4f2f1e18dd84c142c125fdd7affac49a1befb175264d9b84fd232280

data/lib/mikeplayer/display.rb

@@ -2,6 +2,13 @@ module MikePlayer
   class Display
     PAUSE_INDICATOR = '||'.freeze
     INDICATOR_SIZE  = 4
+    PROGRESS_WIDTH  = 40
+
+    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
@@ -12,8 +19,14 @@ module MikePlayer
     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
+    ENTER_ALT_SCREEN = "\e[?1049h\e[2J\e[H\e[?25l".freeze
+    EXIT_ALT_SCREEN  = "\e[?25h\e[?1049l".freeze
+
+    PUSH_TITLE = "\e[22;0t".freeze
+    POP_TITLE  = "\e[23;0t".freeze
+
+    PLAY_GLYPH  = '▶'.freeze
+    PAUSE_GLYPH = '⏸'.freeze
 
     def self.colorize(text, color)
       return text unless $stdout.tty?
@@ -31,23 +44,54 @@ module MikePlayer
       $stdout.flush
     end
 
-    def initialize
-      @width     = 0
-      @indicator = ''
-      @paused    = false
-      @changed   = false
-      @color     = $stdout.tty?
+    def self.set_title(text)
+      return unless $stdout.tty?
+
+      print("\e]0;#{text}\a")
+      $stdout.flush
+    end
+
+    def self.push_title
+      return unless $stdout.tty?
+
+      print(PUSH_TITLE)
+      $stdout.flush
+    end
+
+    def self.pop_title
+      return unless $stdout.tty?
+
+      print(POP_TITLE)
+      $stdout.flush
+    end
+
+    def initialize(fullscreen: false)
+      @width           = 0
+      @indicator       = ''
+      @paused          = false
+      @changed         = false
+      @color           = $stdout.tty?
+      @fullscreen      = fullscreen
+      @elapsed_seconds = 0
+      @length          = 0
+      @last_title      = nil
     end
 
     def song_info=(v)
       @position = v[:position].freeze
       @title    = v[:title].freeze
+      @length   = v[:length].to_f
+
+      update_terminal_title
     end
 
     def elapsed=(v)
+      @elapsed_seconds = v
       @indicator = "#{'>' * (v % INDICATOR_SIZE)}".ljust(INDICATOR_SIZE)
       @paused    = false
       @changed   = true
+
+      update_terminal_title
     end
 
     def paused
@@ -55,12 +99,28 @@ module MikePlayer
         @indicator = PAUSE_INDICATOR.ljust(INDICATOR_SIZE)
         @paused    = true
         @changed   = true
+
+        update_terminal_title
       end
     end
 
     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
 
       position  = colorize(@position, DIM_COLOR)
@@ -82,11 +142,49 @@ module MikePlayer
       $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
 
-    private
+    def update_terminal_title
+      return if @title.nil?
+
+      glyph = @paused ? PAUSE_GLYPH : PLAY_GLYPH
+      title = "#{glyph} #{@title} #{@position}"
+
+      return if title == @last_title
+
+      @last_title = title
+
+      Display.set_title(title)
+    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

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 { position: "(#{song_i_str}/#{self.size})", title: get(i).info }
+      return { position: "(#{song_i_str}/#{self.size})", title: song.info, length: song.length }
     end
 
     def size

data/lib/mikeplayer/version.rb

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

data/lib/mikeplayer.rb

@@ -49,6 +49,9 @@ module MikePlayer
     def play
       @playlist.shuffle! if @settings.shuffle?
 
+      Display.push_title
+      at_exit { Display.pop_title }
+
       if @settings.fullscreen?
         Display.enter_fullscreen
         at_exit { Display.exit_fullscreen }
@@ -64,7 +67,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)
@@ -84,14 +87,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.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Mike Crockett