muzak 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f7427db5881fd8253e6159081edcb049c221d83
-  data.tar.gz: 6e19639939bddfad3fdd995b741bacc7113c5531
+  metadata.gz: 2083f3ba445039c9dea5b52f8bd2383238eb4ea7
+  data.tar.gz: c3b1aaca1e968d7da6c104549c63cd8adfb23a3c
 SHA512:
-  metadata.gz: 5677c46efa1bfb8176e94d06d0c2793856e08978f46421cd6ba5b42c9b50370b42a57c5f833757b15c8f267682cdcceffeb7df82c653ebb1b5b0967b61cbacc5
-  data.tar.gz: 5d60702cd8a71f06ea06e2dc728187327f8913d67bc8a630a61cc659d729cb4a905264c558b8ed11c70e6c5575d4d68c7215e01743cd1e8a2fdbd87dee840244
+  metadata.gz: 62a18069ad690e2c07fe3a87840a32b3d02c0f82f041c05dca890db1a0637c0d5c935d06665c03276f2878f2eadbda1fec7bd0a2db0173cfa1fc94cde522fda6
+  data.tar.gz: 7f147ea2f6002c33e3e8fd6a996b0d4a136408e7dc556ca8d44510befd67514cbdae541bd98f5c64142d3ede5370d0fe5e38a72e74d4f0b7d1fa238c9a8c125e

data/bin/muzak

@@ -45,5 +45,5 @@ trap("INT", "SIG_IGN")
 while line = Readline.readline("muzak> ", true)
   cmd_argv = Shellwords.split(line) rescue next
   next if cmd_argv.empty? || cmd_argv.any?(&:empty?)
-  muzak.send Muzak::Cmd.resolve_command(cmd_argv.shift), *cmd_argv
+  muzak.command cmd_argv.shift, *cmd_argv
 end

data/bin/muzakd

@@ -21,7 +21,7 @@ File.open(fifo_path, "r") do |fifo|
   loop do
     cmd_argv = Shellwords.split(fifo.readline) rescue next
     next if cmd_argv.empty? || cmd_argv.any?(&:empty?)
-    muzak.send Muzak::Cmd.resolve_command(cmd_argv.shift), *cmd_argv
+    muzak.command cmd_argv.shift, *cmd_argv
   end
 end
 

data/lib/muzak/cmd/player.rb

@@ -68,6 +68,14 @@ module Muzak
       @player.enqueue_album album
     end
 
+    def jukebox(*args)
+      count = args.shift || @config["jukebox-size"]
+
+      songs = @index.jukebox(count.to_i).map { |s| Song.new(s) }
+
+      songs.each { |s| @player.enqueue_song s }
+    end
+
     def list_queue
       puts @player.list_queue.map(&:title)
     end
@@ -81,6 +89,8 @@ module Muzak
     end
 
     def now_playing
+      return unless @player.playing?
+
       info @player.now_playing.full_title
     end
   end

data/lib/muzak/const.rb

@@ -1,5 +1,5 @@
 module Muzak
-  VERSION = "0.0.4".freeze
+  VERSION = "0.0.5".freeze
 
   CONFIG_DIR = File.expand_path("~/.config/muzak").freeze
   CONFIG_FILE = File.join(CONFIG_DIR, "muzak.yml").freeze

data/lib/muzak/index.rb

@@ -69,6 +69,12 @@ module Muzak
       end
     end
 
+    def jukebox(count = 50)
+      @all_albums ||= @hash["artists"].map { |_, a| a["albums"] }.flatten
+      @all_songs ||= @all_albums.map { |aa| aa.map { |_, a| a["songs"] } }.flatten
+      @all_songs.sample(count)
+    end
+
     def songs_by(artist)
       error "no such artist: '#{artist}'" unless @hash["artists"].key?(artist)
 

data/lib/muzak/instance.rb

@@ -3,6 +3,10 @@ module Muzak
     include Cmd
     include Utils
 
+    def command(cmd, *args)
+      send Cmd.resolve_command(cmd), *args
+    end
+
     def method_missing(meth, *args)
       warn "unknown command: #{Cmd.resolve_method(meth)}"
       help
@@ -27,6 +31,7 @@ module Muzak
       @plugins = initialize_plugins!
 
       playlist_load @config["default-playlist"] if @config["default-playlist"]
+      enqueue_playlist if _playlist_loaded? && @config["autoplay"]
     end
 
     def initialize_plugins!

data/lib/muzak/player/mpv.rb

@@ -130,14 +130,20 @@ module Muzak
       end
 
       def shuffle_queue
+        return unless running?
+
         command "playlist-shuffle"
       end
 
       def clear_queue
+        return unless running?
+
         command "playlist-clear"
       end
 
       def now_playing
+        return unless running? && playing?
+
         Song.new(get_property "path")
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: muzak
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - William Woodruff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: taglib-ruby