mikeplayer 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 129df9ce63171d9efbe8bd1e581fdbfdf33fdadf127936089db72149ebd76a54
-  data.tar.gz: 25f8be729ae785873137a34e291c63983fcb9a5ff71ccb035e6160bbb3448007
+  metadata.gz: 6447a8b4d80be57938640f4beaa73d51e158b71a5616e4fd7867f87a1a25a792
+  data.tar.gz: 30b3252b18975ab2e62f8bd07d2a6021902b86c8819e7789f959cb196ddb9ae5
 SHA512:
-  metadata.gz: b1ec4ae4f8a765ffeed9fb96d7097f97392a27db66211a4bfc4bb14f7a1636b876ec40ecd84458a8ce8a53050cc160d36769a18088fa99533ce927e8ac5185c8
-  data.tar.gz: eebd1b3afce640dd29ba8e639122f56b64c7b7e0878a1b50e0f7e72cc78a4b258708e50ef8cde1e5fc1f43916b39b42444339b339ad488cdada53a387692ac6e
+  metadata.gz: a93ea2bef948f0bc1fec7ae071b3549448366c5333b22182de34dd01b52b3bee5073bf06fdd0f6f5b6df709d2aaaae8b9b39d0b0730eb886748a6dd75774e6fb
+  data.tar.gz: 0a72819b5c7a56dd3658ed2e6b0c9872c2afb2c4885ec4f2b06f5b84c40dcddf47b22878aac7820c232592dce3a95a64fe67db698f1487c764a6fab4df4aef52

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/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,22 +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
-
-      @song_i = 0 if @song_i < 0
-
-      return self.current
+    def get(i)
+      return @songs[i]
     end
 
     def shuffle!
@@ -79,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} songs with length #{Song.as_duration_str(@length)}, added #{self.size - @loaded_song_count}"
     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.3'.freeze
+  VERSION = '1.0.4'.freeze
 end

data/lib/mikeplayer.rb

@@ -10,7 +10,8 @@ require 'mikeplayer/song'
 
 module MikePlayer
   class Player
-    PAUSE_INDICATOR    = " ||".freeze
+    PAUSE_INDICATOR    = "||".freeze
+    INDICATOR_SIZE     = 4
     SLEEP_SETTING      = 0.5
     STOPPED            = :stopped
     PLAYING            = :playing
@@ -50,19 +51,21 @@ 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
+        @song_i         = 0
         display_width   = 0
 
-        while (false == @playlist.finished?)
-          song        = @playlist.current
+        while (@song_i < @playlist.size)
+          song        = @playlist.get(@song_i)
           @song_start = Time.now
-          info_prefix = "\r#{@playlist.current_song_info}".freeze
+          @pause_time = nil
+          info_prefix = "\r#{@playlist.song_info(@song_i)}".freeze
 
           stdin, stdother, thread_info = Open3.popen2e('play', '--no-show-progress', '--volume', @settings.volume, song.filename)
 
@@ -75,10 +78,10 @@ module MikePlayer
             pause_if_over_time_limit
 
             if (true == playing?)
-              indicator = "#{'>' * (playing_time % 4)}".ljust(4)
+              indicator = "#{'>' * (playing_time % INDICATOR_SIZE)}".ljust(INDICATOR_SIZE)
               info_changed = true
             elsif (true == paused?) && (PAUSE_INDICATOR != indicator)
-              indicator = PAUSE_INDICATOR
+              indicator = PAUSE_INDICATOR.ljust(INDICATOR_SIZE)
               info_changed = true
             end
 
@@ -109,8 +112,8 @@ module MikePlayer
 
           @pid = nil
 
-          if (true == playing?)
-            next_song unless @pid.nil?
+          if (true == playing?) && (playing_time >= (song.length - 1))
+            next_song
           end
         end
 
@@ -198,10 +201,6 @@ module MikePlayer
     end
 
     def stop_song
-      if (true == paused?)
-        kill("CONT")
-      end
-
       kill("INT")
 
       sleep 0.2
@@ -211,7 +210,6 @@ module MikePlayer
       end
 
       @state = STOPPED
-      @pid   = nil
     end
 
     def pid_alive?(pid = @pid)
@@ -223,16 +221,20 @@ module MikePlayer
     end
 
     def next_song
+      debug('n')
       stop_song
 
-      @playlist.next
+      @song_i += 1
     end
 
     def previous_song
+      debug('p')
       stop_song
 
       if (playing_time < 10)
-        @playlist.previous
+        @song_i -= 1 unless @song_i <= 0
+      else
+        debug('x')
       end
     end
 
@@ -271,5 +273,9 @@ module MikePlayer
         return (@minutes - ((Time.now - @timer_start).to_i / 60).to_i)
       end
     end
+
+    def debug(str)
+      print(str) if @settings.debug?
+    end
   end
 end

metadata

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