mikeplayer 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4134931c94f4e92cc8e93b24e40613d00ceff68081fa70c60fdadf2843da4bcb
-  data.tar.gz: 11c874e73e5e821162aea11db794d0c74f4e90e66a7903691674933d37a2d2a1
+  metadata.gz: 9c728cfd9eb2f597286887596e1e527806a58a8a0ee6bcaafdf3eaf4062c4352
+  data.tar.gz: e1e22cc887f2d762acf5148f088d2f183a936f9b01c03ddb85f4c861865142a5
 SHA512:
-  metadata.gz: 5703e62a29788946d071dfcd2663501b054f0a3013bb12154f3df5baf56ad3051a77fde4729209730131f3047d33b29e7edb6d4f1e5295993ac89e49da24d5ca
-  data.tar.gz: 58cd63e6f442ee1162c76ad12fb106daf10c0e51257a85f372718af53b54cfc70bbf1e168a85250f9d899bb65f29649405ef555aed96c3c2e8cbe5d5ecc9bad8
+  metadata.gz: f07c38e3dca4034f40bfcf7d6b0c4d5f9f378ed46bf15df6d1f627d6ae26755968c5b1b10074f528f7cd642f4b5bee312109980330a96e0ec45b830f612acfd6
+  data.tar.gz: 99d6ee3c7d5fd22db5de384fe7e578107cedfb424c6ee38800a9542bc83a2c327f008705c43e4ba4ecb80a841ddcffe788ddfe0cc664158c6653f438f07c98f5

data/lib/mikeplayer/settings.rb

@@ -5,7 +5,7 @@ module MikePlayer
     SETTINGS_DIRECTORY = '.mikeplayer'.freeze
     PL_FILE_ENDING     = '.mpl'.freeze
 
-    attr_reader :random, :music_dir, :playlist, :volume
+    attr_reader :random, :music_dir, :playlist, :volume, :minutes
 
     def initialize(options)
       @shuffle   = options[:shuffle]

data/lib/mikeplayer/version.rb

@@ -1,3 +1,3 @@
 module MikePlayer
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/lib/mikeplayer.rb

@@ -19,6 +19,7 @@ module MikePlayer
     def initialize(options, *args)
       @settings  = Settings.new(options)
       @playlist  = Playlist.new(@settings.playlist)
+      @minutes   = @settings.minutes
       @command   = ''
       @pid       = nil
       @timer_start = nil
@@ -67,6 +68,7 @@ module MikePlayer
           @state   = PLAYING
           @pid     = thread_info.pid
           indicator = ''
+          info_changed = false
 
           while (true == pid_alive?)
             pause_if_over_time_limit
@@ -92,6 +94,7 @@ module MikePlayer
 
               print(info)
 
+              info_changed = false
               $stdout.flush
             end
 
@@ -178,9 +181,12 @@ module MikePlayer
     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}.")
@@ -240,7 +246,15 @@ module MikePlayer
     end
 
     def playing_time
-      return (Time.now - @song_start).to_i
+      return (Time.now - @song_start).to_i - pause_time
+    end
+
+    def pause_time
+      if (@pause_time.nil?)
+        return 0
+      else
+        return (Time.now - @pause_time).to_i
+      end
     end
 
     def minutes_remaining

metadata

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