muzak 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0f970a0a6e2731b8014245f91e9b97e10bdbfa8
-  data.tar.gz: 0c8d58beb2f2bd3b8cf77af94a6a4e8aef753b0c
+  metadata.gz: 99bf2869397efa5ed245f727b5a6d4ccf57c9f6c
+  data.tar.gz: 4903fe98bf3a597ed41f7d9c0e3f76a5afd6366d
 SHA512:
-  metadata.gz: bd1b4f8bc4af206042d99b6156d1dd90d57cb263d0a2885e8d29b4ce4d25b56ba13358ce1dc23d28142a9f0a9228e419f1816df5aa1619c05a31d2e8b07ba102
-  data.tar.gz: 12bc26a48046a905bcd3678b8e829fc5f2a221f13eee34ce0d0d87bcc72add2528c5f37244ce0d272999f2d58647b42558991cbc5fb62d57c0ff2b82a100f7de
+  metadata.gz: 6a50fd4a229375188d327ad6703565656945996e0ef6746df3bd62745cddb6111b30195488ea87f1fdbe41e47e804d8a05d36b5cbbc8445bb4e9a7edcd0b4441
+  data.tar.gz: 22238bb77209eb6eec0a2719d1ddd3c1e59d0d4e332f3965208661dd2014527c6670fa11149c213df633a259e1c9ea6fcf96b32c63a1cf5de6ef3fa58606530d

data/README.md

@@ -37,3 +37,4 @@ as well as on RubyDoc.
 * GUI "frontend"?
 * isolation of art and music output (`Muzak::ArtProvider`?)
 * current indexing/sorting logic is terrible
+* replace MPV IPC implementation with [ruby-mpv](https://github.com/woodruffw/ruby-mpv)

data/lib/muzak/cmd/player.rb

@@ -119,9 +119,7 @@ module Muzak
     def jukebox(count = Config.jukebox_size)
       songs = index.jukebox(count.to_i)
 
-      Thread.new do
-        songs.each { |s| player.enqueue_song s }
-      end
+      songs.each { |s| player.enqueue_song s }
 
       build_response data: {
         jukebox: songs.map(&:full_title)

data/lib/muzak/const.rb

@@ -1,6 +1,6 @@
 module Muzak
   # Muzak's current version
-  VERSION = "0.2.3".freeze
+  VERSION = "0.2.4".freeze
 
   # The root directory for all user configuration, data, etc
   CONFIG_DIR = File.expand_path("~/.config/muzak").freeze

data/lib/muzak/player/mpv.rb

@@ -2,6 +2,7 @@ require "tempfile"
 require "socket"
 require "json"
 require "thread"
+require "mpv"
 
 module Muzak
   module Player
@@ -14,11 +15,7 @@ module Muzak
 
       # @return [Boolean] Whether or not the current instance is running.
       def running?
-        begin
-          !!@pid && Process.waitpid(@pid, Process::WNOHANG).nil?
-        rescue Errno::ECHILD
-          false
-        end
+        @mpv&.running?
       end
 
       # Activate mpv by executing it and preparing for event processing.
@@ -28,39 +25,24 @@ module Muzak
 
         debug "activating #{self.class}"
 
-        @sock_path = Dir::Tmpname.make_tmpname("/tmp/mpv", ".sock")
         mpv_args = [
-          "--idle",
           # if i get around to separating album art from playback,
           # these two flags disable mpv's video output entirely
           # "--no-force-window",
           # "--no-video",
+          # there's also this, which (might) also work
+          # "--audio-display=no",
           "--no-osc",
           "--no-osd-bar",
           "--no-input-default-bindings",
           "--no-input-cursor",
-          "--no-terminal",
           "--load-scripts=no", # autoload and other scripts with clobber our mpv management
-          "--input-ipc-server=%{socket}" % { socket: @sock_path }
         ]
 
         mpv_args << "--geometry=#{Config.art_geometry}" if Config.art_geometry
 
-        @pid = Process.spawn("mpv", *mpv_args)
-
-        until File.exists?(@sock_path)
-          sleep 0.1
-        end
-
-        @socket = UNIXSocket.new(@sock_path)
-
-        @command_queue = Queue.new
-        @result_queue = Queue.new
-        @event_queue = Queue.new
-
-        @command_thread = Thread.new { pump_commands! }
-        @results_thread = Thread.new { pump_results! }
-        @events_thread = Thread.new { dispatch_events! }
+        @mpv = ::MPV::Session.new(user_args: mpv_args)
+        @mpv.callbacks << ::MPV::Callback.new(self, :dispatch_event!)
 
         instance.event :player_activated
       end
@@ -72,17 +54,10 @@ module Muzak
 
         debug "deactivating #{self.class}"
 
-        command "quit"
-
-        Process.kill :TERM, @pid
-        Process.wait @pid
-        @pid = nil
-
-        @socket.close
+        @mpv.quit!
       ensure
         @_now_playing = nil
         instance.event :player_deactivated
-        File.delete(@sock_path) if @sock_path && File.exists?(@sock_path)
       end
 
       # Tell mpv to begin playback.
@@ -91,7 +66,7 @@ module Muzak
       def play
         return unless running?
 
-        set_property "pause", false
+        @mpv.set_property "pause", false
       end
 
       # Tell mpv to pause playback.
@@ -100,28 +75,28 @@ module Muzak
       def pause
         return unless running?
 
-        set_property "pause", true
+        @mpv.set_property "pause", true
       end
 
       # @return [Boolean] Whether or not mpv is currently playing.
       def playing?
         return false unless running?
 
-        !get_property "pause"
+        !@mpv.get_property "pause"
       end
 
       # Tell mpv to play the next song in its queue.
       # @return [void]
       # @note Does nothing if the current song is the last.
       def next_song
-        command "playlist-next"
+        @mpv.command "playlist-next"
       end
 
       # Tell mpv to play the previous song in its queue.
       # @return [void]
       # @note Does nothing if the current song is the first.
       def previous_song
-        command "playlist-prev"
+        @mpv.command "playlist-prev"
       end
 
       # Tell mpv to add the given song to its queue.
@@ -170,7 +145,7 @@ module Muzak
           # TODO: this is slow and should be avoided at all costs,
           # since we have access to these Song instances earlier
           # in the object's lifecycle.
-          playlist << Song.new(get_property("playlist/#{i}/filename"))
+          playlist << Song.new(@mpv.get_property("playlist/#{i}/filename"))
         end
 
         playlist
@@ -181,7 +156,7 @@ module Muzak
       def shuffle_queue
         return unless running?
 
-        command "playlist-shuffle"
+        @mpv.command "playlist-shuffle"
       end
 
       # Clears mpv's internal queue.
@@ -189,88 +164,41 @@ module Muzak
       def clear_queue
         return unless running?
 
-        command "playlist-clear"
+        @mpv.command "playlist-clear"
       end
 
       # Get mpv's currently loaded song.
       # @return [Song, nil] the currently loaded song
       def now_playing
-        path = get_property "path"
+        path = @mpv.get_property "path"
         return if path&.empty?
-        @_now_playing ||= Song.new(get_property "path")
+        @_now_playing ||= Song.new(@mpv.get_property "path")
       end
 
-      private
-
+      # Load a song and optional album art into mpv.
+      # @param song [Song] the song to load
+      # @param art [String] the art file to load
+      # @return [void]
+      # @api private
       def load_song(song, art)
         cmds = ["loadfile", song.path, "append-play"]
         cmds << "external-file=\"#{art}\"" if art
-        command *cmds
-      end
-
-      def pump_commands!
-        loop do
-          begin
-            @socket.puts(@command_queue.pop)
-          rescue EOFError # the player is deactivating
-            Thread.exit
-          end
-        end
-      end
-
-      def pump_results!
-        loop do
-          begin
-            response = JSON.parse(@socket.readline)
-
-            if response["event"]
-              @event_queue << response["event"]
-            else
-              @result_queue << response
-            end
-          rescue EOFError, IOError # the player is deactivating
-            Thread.exit
-          end
-        end
+        @mpv.command *cmds
       end
 
-      def dispatch_events!
-        loop do
-          event = @event_queue.pop
-
-          Thread.new do
-            case event
-            when "file-loaded"
-              instance.event :song_loaded, now_playing
-            when "end-file"
-              instance.event :song_unloaded
-              @_now_playing = nil
-            end
-          end
+      # Dispatch the given event to the active {Muzak::Instance}.
+      # @param event [String] the event
+      # @return [void]
+      # @api private
+      def dispatch_event!(event)
+        case event
+        when "file-loaded"
+          instance.event :song_loaded, now_playing
+        when "end-file"
+          instance.event :song_unloaded
+          @_now_playing = nil
         end
       end
-
-      def command(*args)
-        return unless running?
-
-        payload = {
-          "command" => args
-        }
-
-        debug "mpv payload: #{payload.to_s}"
-
-        @command_queue << JSON.generate(payload)
-
-        @result_queue.pop
-      end
-
-      def set_property(*args)
-        command "set_property", *args
-      end
-
-      def get_property(*args)
-        command("get_property", *args)["data"]
-      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: muzak
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - William Woodruff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: taglib-ruby
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: mpv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 description: A library for controlling playlists and media players.
 email: william@tuffbizz.com
 executables: