muzak 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3338e70c6fa7dc2320227d38b13c944e7041f6a1
-  data.tar.gz: 38ba81685e38e29ad8bb4ce55897d2aa12d30d98
+  metadata.gz: c8e7f564cf871bb52f85bee9f9ce174955f5cb8b
+  data.tar.gz: 34f79d424c5d0ff80141d5b7469bbec26a8f2490
 SHA512:
-  metadata.gz: ccbf8b59dc56189f0805e8c382f54a91d6a2e646802d2e920402e7a1387622832446415419ca22f73547bca00fe43a3bf41cead6de8feb832df678114f3790b8
-  data.tar.gz: fb3b416d63a3ea9517b488881d5f94301d2ce9958ff8b00a1fb7dde8e2b5c93a6b1d19f4a6b4d6acad5cef2fc3463fb738395f8c64ab0367962052c6d30c92e8
+  metadata.gz: 117f0feb185eed6a940db827d565580a4e274bfe30bc448c7ad54c0aaca8e088b349947be63c6aa3b140ec3366dda053aa525d467ea3245a1557ac5968c2bad5
+  data.tar.gz: 65c7640651c2bba52a89499db61da01819911d625ecddf480831cd01db6bdfdc6104467b73c33669c562ddafa466a282511cc01de173dca69670f9f68d1696b4

data/COMMANDS.md

@@ -938,6 +938,39 @@ $ muzak-cmd quit
 }
 ```
 
+## `reload-index`
+
+Reloads muzak's in-memory index.
+
+**Note:** This does *not* rebuild the index file - `muzak-index` is provided
+as a command line utility for that.
+
+### Syntax
+
+`reload-index`
+
+### Example
+
+```bash
+$ muzak-cmd reload-index
+```
+
+### Example Response
+
+```json
+{
+   "response" : {
+      "error" : null,
+      "data" : {
+         "artist_count" : 262,
+         "album_count" : 1161,
+         "deep" : true
+      },
+      "method" : "reload_index"
+   }
+}
+```
+
 ## `shuffle-queue`
 
 Shuffles the player's playback queue.

data/bin/muzakd

@@ -7,7 +7,6 @@ require "json"
 require "thread"
 
 Process.daemon unless Muzak::Config.debug || Muzak::Config.verbose
-Thread.abort_on_exception = Muzak::Config.debug
 
 muzak = Muzak::Instance.new
 

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.8".freeze
+  VERSION = "0.3.9".freeze
 end

data/lib/muzak/cmd/index.rb

@@ -1,5 +1,19 @@
 module Muzak
   module Cmd
+    # Reload the active index from the index file.
+    # @note This does *not* rebuild the index.
+    # @command `reload-index`
+    # @cmdexample `muzak> reload-index`
+    def reload_index
+      index.reload!
+
+      build_response data: {
+        artist_count: index.artists.size,
+        album_count: index.albums.size,
+        deep: index.deep?,
+      }
+    end
+
     # List all artists in the index.
     # @command `list-artists`
     # @cmdexample `muzak> list-artists`

data/lib/muzak/config.rb

@@ -94,7 +94,7 @@ module Muzak
     end
 
     # @return [Boolean] whether or not the given plugin is configured
-    # @note the truth-value of this method is used to determine which
+    # @note the truth-value of this method is used in part to determine which
     #   plugins should be loaded.
     def self.plugin?(pname)
       respond_to? "plugin_#{pname}"

data/lib/muzak/index.rb

@@ -12,6 +12,9 @@ module Muzak
       end
     end
 
+    # @return [String] the path of the index data file
+    attr_accessor :file
+
     # @return [String] the path of the root of the music tree
     attr_accessor :tree
 
@@ -20,18 +23,22 @@ module Muzak
 
     # @param file [String] the path of the index data file
     def initialize(file: Config::INDEX_FILE)
-      debug "loading index from '#{Config::INDEX_FILE}'..."
+      debug "loading index from '#{file}'..."
+
+      @file = file
 
       @hash = Marshal.load(File.read file)
 
-      # create some frequently accessed collections
-      @all_albums = @hash["artists"].map { |_, a| a["albums"] }.flatten
+      memoize_collections!
+    end
 
-      if deep?
-        @all_deep_songs = @all_albums.map { |aa| aa.map { |_, a| a["deep-songs"] } }.flatten
-      else
-        @all_songs = @all_albums.map { |aa| aa.map { |_, a| a["songs"] } }.flatten
-      end
+    # Refresh the {Index} instance's state from the index data file.
+    # @note This method does *not* rebuild the index data file.
+    # @return [void]
+    def reload!
+      debug "reloading index from '#{file}'..."
+      @hash = Marshal.load(File.read file)
+      memoize_collections!
     end
 
     # @return [Boolean] whether or not the current index is deep
@@ -132,5 +139,18 @@ module Muzak
         []
       end
     end
+
+    # Create some frequently accessed collections to speed things up a bit.
+    # @return [void]
+    # @api private
+    def memoize_collections!
+      @all_albums = @hash["artists"].map { |_, a| a["albums"] }.flatten
+
+      if deep?
+        @all_deep_songs = @all_albums.map { |aa| aa.map { |_, a| a["deep-songs"] } }.flatten
+      else
+        @all_songs = @all_albums.map { |aa| aa.map { |_, a| a["songs"] } }.flatten
+      end
+    end
   end
 end

data/lib/muzak/instance.rb

@@ -64,12 +64,10 @@ module Muzak
       return unless Config::PLUGIN_EVENTS.include?(type)
 
       plugins.each do |plugin|
-        Thread.new do
-          begin
-            plugin.send(type, *args)
-          rescue => e
-            error "something went wrong in #{plugin.class.plugin_name}: #{e}"
-          end
+        begin
+          Thread.new { plugin.send(type, *args) }
+        rescue => e
+          error "something went wrong in #{plugin.class.plugin_name}: #{e}"
         end
       end
     end

data/lib/muzak/plugin.rb

@@ -26,7 +26,10 @@ module Muzak
     # Instantiates all configured plugins and returns them.
     # @return [Array<StubPlugin>] the instantiated plugins
     def self.load_plugins!
-      pks = PLUGIN_CLASSES.select { |pk| Config.plugin? pk.plugin_name }
+      pks = PLUGIN_CLASSES.select do |pk|
+        Config.plugin?(pk.plugin_name) && pk.available?
+      end
+
       pks.map { |pk| pk.new }
     end
   end

data/lib/muzak/plugin/stub_plugin.rb

@@ -12,6 +12,11 @@ module Muzak
         name.split("::").last.downcase
       end
 
+      # @return [true] whether or not this plugin is available
+      def self.available?
+        true
+      end
+
       def initialize
         debug "loading #{self.class}"
       end

metadata

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