muzak 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a171d18242a3650ec6a70d1cedb0bb9e156229c
-  data.tar.gz: 5e5552a3b45cd2ced07e1ff2a79508bd8820dcd6
+  metadata.gz: 8e876cf1c3b780e3df5a034b8bd0b39929d29488
+  data.tar.gz: a07901cc1392f0da1a57b5dee944dc3c79cbc800
 SHA512:
-  metadata.gz: b02efb2b8ef6f3d2811cf469267c4e4f183459267c8027794a76ce04a2a08738b588ecfbeef8b091aa737b66b6dcea7a7fceadf348a2ae35747c13bb7b0cab50
-  data.tar.gz: b49dea00fefd160228bedc48e5b133b46ce781e5630052068f4f2d632db6c73f35201075173bdf873027821b2dd4e107e74df219834b01ae7027b056909b053f
+  metadata.gz: addec21a1b711fef4737b67a709b042bb9e5418414a9a540b8f28de953294b6758d0cb2fa25d71c65cc037e5fb67e9abe94581167c57cd702e7a16f7f7b18a32
+  data.tar.gz: 65d2e9edd5c2698f243bf92ff6d5b79ef6d963b4b4ef898dbc923a0f3fe092ab140740d307f7beddb8ae6e6bdc8be598d6f2ac3dd0c3aad0f0fa052a2a546221

data/bin/muzak

@@ -7,7 +7,6 @@ require "shellwords"
 opts = {
   debug: ARGV.include?("--debug") || ARGV.include?("-d"),
   verbose: ARGV.include?("--verbose") || ARGV.include?("-v"),
-  batch: ARGV.include?("--batch") || ARGV.include?("-b")
 }
 
 Thread.abort_on_exception = opts[:debug]

data/bin/muzakd

@@ -6,7 +6,6 @@ require "shellwords"
 opts = {
   debug: ARGV.include?("--debug") || ARGV.include?("-d"),
   verbose: ARGV.include?("--verbose") || ARGV.include?("-v"),
-  batch: ARGV.include?("--batch") || ARGV.include?("-b")
 }
 
 Process.daemon unless opts[:debug] || opts[:verbose]

data/lib/muzak/cmd/config.rb

@@ -21,6 +21,7 @@ module Muzak
       @config = {
         "music" => File.expand_path("~/music"),
         "player" => "mpv",
+        "index-autobuild" => 86400
       }
 
       Dir.mkdir(CONFIG_DIR) unless Dir.exist?(CONFIG_DIR)
@@ -37,32 +38,6 @@ module Muzak
       @config = YAML::load_file(CONFIG_FILE)
     end
 
-    def config_set(*args)
-      return unless _config_loaded?
-
-      fail_arity(args, 2)
-      key, value = args
-      return if key.nil? || value.nil?
-
-      debug "setting '#{key}' to '#{value}' in config"
-
-      @config[key] = value
-      _config_sync
-    end
-
-    def config_del(*args)
-      return unless _config_loaded?
-
-      fail_arity(args, 1)
-      key = args.shift
-      return if key.nil?
-
-      debug "removing '#{key}' from config"
-
-      @config.delete(key)
-      _config_sync
-    end
-
     def config_get(*args)
       return unless _config_loaded?
 

data/lib/muzak/cmd/index.rb

@@ -8,6 +8,10 @@ module Muzak
       !!@index
     end
 
+    def _index_outdated?
+      Time.now.to_i - @index["timestamp"] >= @config["index-autobuild"]
+    end
+
     def _index_sync
       debug "syncing index hash with #{INDEX_FILE}"
       File.open(INDEX_FILE, "w") { |io| io.write @index.hash.to_yaml }
@@ -17,6 +21,13 @@ module Muzak
       debug "loading index from #{INDEX_FILE}"
 
       @index = Index.load_index(INDEX_FILE)
+
+      # the order is important here, since @config["index-autobuild"]
+      # will short-circuit if index-autobuild isn't set
+      if @config["index-autobuild"] && _index_outdated?
+        verbose "rebuilding outdated index"
+        index_build
+      end
     end
 
     def index_build(*args)

data/lib/muzak/cmd/playlist.rb

@@ -30,6 +30,8 @@ module Muzak
         @playlist = Playlist.new(pname, [])
         playlist_sync
       end
+
+      event :playlist_loaded, @playlist
     end
 
     def playlist_delete(*args)
@@ -56,6 +58,7 @@ module Muzak
       return unless _playlist_loaded?
 
       @player.enqueue_playlist(@playlist)
+      event :playlist_enqueued, @playlist
     end
 
     def playlist_add_album(*args)

data/lib/muzak/const.rb

@@ -1,14 +1,17 @@
 module Muzak
-  VERSION = "0.0.1".freeze
+  VERSION = "0.0.2".freeze
 
   CONFIG_DIR = File.expand_path("~/.config/muzak").freeze
   CONFIG_FILE = File.join(CONFIG_DIR, "muzak.yml").freeze
   INDEX_FILE = File.join(CONFIG_DIR, "index.yml").freeze
   PLAYLIST_DIR = File.join(CONFIG_DIR, "playlists").freeze
+  USER_PLUGIN_DIR = File.join(CONFIG_DIR, "plugins").freeze
 
   PLUGIN_EVENTS = [
     :player_activated,
     :player_deactivated,
-    :song_loaded
+    :song_loaded,
+    :playlist_loaded,
+    :playlist_enqueued
   ]
 end

data/lib/muzak/instance.rb

@@ -24,9 +24,9 @@ module Muzak
 
       @player = Player::PLAYER_MAP[@config["player"]].new(self)
 
-      playlist_load @config["default-playlist"] if @config["default-playlist"]
-
       @plugins = initialize_plugins!
+
+      playlist_load @config["default-playlist"] if @config["default-playlist"]
     end
 
     def initialize_plugins!

data/lib/muzak/plugin.rb

@@ -1,10 +1,14 @@
 # we have to require StubPlugin first because ruby's module resolution is bad
 require_relative "plugin/stub_plugin"
 
+# load plugins included with muzak
 Dir.glob(File.join(__dir__, "plugin/*")) { |file| require_relative file }
 
 module Muzak
   module Plugin
+    # load plugins included by the user
+    Dir.glob(File.join(USER_PLUGIN_DIR, "*")) { |file| require file }
+
     def self.plugin_classes
       constants.map(&Plugin.method(:const_get)).grep(Class)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: muzak
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - William Woodruff