muzak 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77d8a106e1b6479194813a854372b1623f3bac7b
-  data.tar.gz: 4eb72201a9378ba5ee92c43668009ab314c1e1ff
+  metadata.gz: 3338e70c6fa7dc2320227d38b13c944e7041f6a1
+  data.tar.gz: 38ba81685e38e29ad8bb4ce55897d2aa12d30d98
 SHA512:
-  metadata.gz: e94f921353d774220411452b8ecd4a49003792d0f0a7a3a96d8cbda3d6d92518e6b50a2c46d1afaf8a7050136ffadc0a069c08857ee0e717bc589e9613262f5d
-  data.tar.gz: 8bb4da0e3c69ad6e319b46db29a21031aec4d55ce6aef2b4ae33dca91dd4d44c7ec488f151b382485a29da7cdfa1e7be96fb1dca5135c5602c0412e3d6a397c9
+  metadata.gz: ccbf8b59dc56189f0805e8c382f54a91d6a2e646802d2e920402e7a1387622832446415419ca22f73547bca00fe43a3bf41cead6de8feb832df678114f3790b8
+  data.tar.gz: fb3b416d63a3ea9517b488881d5f94301d2ce9958ff8b00a1fb7dde8e2b5c93a6b1d19f4a6b4d6acad5cef2fc3463fb738395f8c64ab0367962052c6d30c92e8

data/CONFIGURATION.md

@@ -120,6 +120,17 @@ initialize and control.
 The short names of supported players can be found in
 {Muzak::Player::PLAYER_MAP}.
 
+### `mpv-no-art`
+
+*Optional.*
+
+*Default:* `false`
+
+If `mpv-no-art: true` is set in the configuration file *and* `player: mpv` is
+set, then `mpv` will be instructed to disable all video output entirely.
+This option is primarily useful in conjunction with plugins that provide
+album art display, or for making Muzak entirely non-graphical.
+
 ### `jukebox-size`
 
 *Mandatory.*
@@ -139,7 +150,7 @@ by default with the `jukebox` size.
 album art, in "WxH" format. If not set, album art will be displayed at
 any size the player pleases.
 
-It's entirely up to the user's player to obey this value.
+It's entirely up to the user's player and/or plugins to obey this value.
 
 ### `autoplay`
 
@@ -195,3 +206,14 @@ listen on.
 `dmenu-exec: <command args...>` can be used to alter `muzak-dmenu`'s
 invocation of `dmenu`. It can also be used to substitute a dmenu-compatible
 prompt like `rofi -dmenu`.
+
+### `dmenu-lines-exec`
+
+*Optional.*
+
+*No default.*
+
+`dmenu-lines-exec: <command args>` can be used to alter `muzak-dmenu`'s
+invocation of `dmenu` when showing selections on multiple lines (e.g.,
+when offering albums after `enqueue-album` has been selected). It can be
+used to substitute a dmenu-compatible prompt like `rofi -dmenu`.

data/bin/muzak-dmenu

@@ -2,29 +2,62 @@
 
 require "muzak"
 require "socket"
+require "json"
+require "open3"
+
+DMENU_EXEC = Muzak::Config.dmenu_exec || "dmenu"
+DMENU_LINES_EXEC = Muzak::Config.dmenu_lines_exec || "dmenu -l 10"
 
 def fatal(msg)
   STDERR.puts "Fatal: #{msg}"
   exit 1
 end
 
-def dmenu(options)
-	dmenu = Muzak::Config.dmenu_exec || "dmenu"
+def dmenu(options, lines: false)
+  dmenu_cmd = lines ? DMENU_LINES_EXEC : DMENU_EXEC
 	opts = options.join("\n")
-	`printf "#{opts}" | #{dmenu}`
+  Open3.popen2(dmenu_cmd) do |stdin, stdout|
+    stdin.puts opts
+    stdin.close
+    stdout.gets
+  end
 end
 
-begin
-  server_host = Muzak::Config.daemon_host
-  server_port = Muzak::Config.daemon_port
-  sock = TCPSocket.new server_host, server_port
-rescue
-  fatal "Is muzakd running?"
+def muzak_cmd(command)
+  begin
+    server_host = Muzak::Config.daemon_host
+    server_port = Muzak::Config.daemon_port
+    sock = TCPSocket.new server_host, server_port
+  rescue
+    fatal "Is muzakd running?"
+  end
+
+  sock.puts command unless command.empty?
+  response = sock.gets
+  sock.close
+
+  JSON.parse(response)
 end
 
 command = dmenu Muzak::Cmd.commands
 
-sock.puts command unless command.empty?
-puts sock.gets
+exit if command.nil? || command.empty?
+
+arguments = case command.chomp
+            when "enqueue-artist"
+              artists = muzak_cmd("list-artists")["response"]["data"]["artists"]
+              dmenu(artists, lines: true)
+            when "enqueue-album"
+              albums = muzak_cmd("list-albums")["response"]["data"]["albums"]
+              dmenu(albums, lines: true)
+            when "enqueue-playlist"
+              playlists = muzak_cmd("list-playlists")["response"]["data"]["playlists"]
+              dmenu(playlists, lines: true)
+            end
+
+command = "#{command.chomp} #{arguments}" if arguments
+
+puts command
+
+muzak_cmd command
 
-sock.close

data/bin/muzak-index

@@ -22,8 +22,8 @@ def help
       --version, -v   Print version information
 
     Arguments:
-      [tree]          The filesystem tree to index (default: ~/music)
-      [index]         The saved index (default: ~/.config/muzak/index.dat)
+      [tree]          The filesystem tree to index (default: #{Muzak::Config.music})
+      [index]         The saved index (default: #{Muzak::Config::INDEX_FILE})
   EOS
 
   exit

data/lib/muzak.rb

@@ -12,5 +12,5 @@ require_relative "muzak/instance"
 # The primary namespace for muzak.
 module Muzak
   # Muzak's current version
-  VERSION = "0.3.7".freeze
+  VERSION = "0.3.8".freeze
 end

data/lib/muzak/instance.rb

@@ -65,7 +65,11 @@ module Muzak
 
       plugins.each do |plugin|
         Thread.new do
-          plugin.send(type, *args)
+          begin
+            plugin.send(type, *args)
+          rescue => e
+            error "something went wrong in #{plugin.class.plugin_name}: #{e}"
+          end
         end
       end
     end

data/lib/muzak/player/mpv.rb

@@ -25,11 +25,7 @@ module Muzak
 
         debug "activating #{self.class}"
 
-        mpv_args = [
-          # if i get around to separating album art from playback,
-          # these two flags disable mpv's video output entirely
-          # "--no-force-window",
-          # "--no-video",
+        args = [
           # there's also this, which (might) also work
           # "--audio-display=no",
           "--no-osc",
@@ -39,14 +35,16 @@ module Muzak
           "--load-scripts=no", # autoload and other scripts with clobber our mpv management
         ]
 
-        mpv_args << "--geometry=#{Config.art_geometry}" if Config.art_geometry
+        args.concat ["--no-force-window", "--no-video"] if Config.mpv_no_art
+
+        args << "--geometry=#{Config.art_geometry}" if Config.art_geometry
 
         # this is an experimental flag, but it could improve
         # muzak's load times substantially when used with a network
         # mounted music library
-        mpv_args << "--prefetch-playlist" if ::MPV::Server.has_flag?("--prefetch-playlist")
+        args << "--prefetch-playlist" if ::MPV::Server.has_flag?("--prefetch-playlist")
 
-        @mpv = ::MPV::Session.new(user_args: mpv_args)
+        @mpv = ::MPV::Session.new(user_args: args)
         @mpv.callbacks << ::MPV::Callback.new(self, :dispatch_event!)
 
         instance.event :player_activated

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: muzak
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - William Woodruff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-04 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: taglib-ruby