mikeplayer 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 121090e98631767a7c640e074f662732b39c4593bd30270c0d9f816a7833bb3f
-  data.tar.gz: 618b4294b29fa83a8263530cee8c480e050c3ce56be457086933366aef08977e
+  metadata.gz: 75710f4741268d6bbc3c8708b626733ac02bf3dbbcaf3c8224761ddaea270ca4
+  data.tar.gz: 75fff78aa2ebfa4b4a2815a743fca6a923a4f85ee9bddf25f528167b08cdfaf0
 SHA512:
-  metadata.gz: e666ab907816480ede76ad2d4e215116ec920c2ce0152d44687177675ecfb484c94de13b897006f2e110bb89f2c81039abb363a52ea6c43f1ace3e48a19c341a
-  data.tar.gz: ac571aae2fc74fcef162583c50924a4e8e81dd7ccd141503d9de47e8fbf03898bd6fc8aa2482875068a477ae13fa9ef9a882d7d5379285ee5b9259a19675615f
+  metadata.gz: 8d20411df67b44cd5f25b4aaea1b1ab22e632eaa8505a47c3fbee652e88e75e314e42785e525cfbb97bf71876fdf4300165248d90deb0bfeaf9be1eeba459e06
+  data.tar.gz: a2877632fb5b48cb60d1eec6502f8b3d5015384c952852a47d6aace6531690b6adee4d66851e07ec29bf040d3b69139bdd5ca5d95bb4cc20c2d28ae66fbb65c2

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?
@@ -88,11 +83,17 @@ module MikePlayer
     end
 
     def self.cmd_exist?(cmd)
-      if (true != system('command'))
-        raise "Missing 'command' command, which is used to test compatibility."
+      if @test_cmd.nil?
+        if system('command')
+          @test_cmd = 'command -v'
+        elsif system('bash -c "command"')
+          @test_cmd = 'bash -c "command -v"'
+        else
+          raise "Missing 'command' command, which is used to test compatibility."
+        end
       end
 
-      if (true != system("command -v #{cmd} >/dev/null 2>&1"))
+      if (true != system("#{@test_cmd} #{cmd} >/dev/null 2>&1"))
         return false
       end
 
@@ -111,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/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.0'.freeze
+  VERSION = '1.1.2'.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)}"}
@@ -158,27 +159,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.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Mike Crockett
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-08 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.2
-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: []