muzak 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6b8176c9db706a3a44a3bcdd0531cbf4f4bfc06
-  data.tar.gz: cc31f821a39863d88a98e3605102e4720e091609
+  metadata.gz: 2004a69f30d2467efb106868ca1882dcc8adcd1c
+  data.tar.gz: a2af36014644a54b49d3756ca0cf7823442dbea1
 SHA512:
-  metadata.gz: b2713fafa4ebd9f793c32a33040d021dd78aa475c283b101a141032de2865ca36423832b19432562bddc64f7699e55b489be40e8d7af4a4faad713d4eb163685
-  data.tar.gz: 177e33819737a1e629640b721f0540cc9ff7d7f44ebce31bda4acf42d30abaf697b862d2a8afc079c392b1d4b08f79529b631a405f8d5d90a7409c08cf9c3133
+  metadata.gz: 61fff1242efdd7eccd57a999352c2a58a41cad230b7b29e65bac2cdd8560aae6494dd22078ff9cdb3129aab4b45ad4d241f3f3ae3234a3aa5cbc7fecf933f803
+  data.tar.gz: de3071c222e36d73e08bdb7f8119552ac92828ffaa90a5d92d8709d60cb3495411e62fb6763327b1fce73f2c483d72e750cc1e9800ff2b5f2268d5c9f44584e2

data/README.md

@@ -9,7 +9,7 @@ and the state of the player.
 
 ### Screenshot
 
-![screenshot](https://sr.ht/A-oS.png)
+![screenshot](https://sr.ht/V4mX.gif)
 
 ### Usage
 

data/bin/muzak-dmenu

@@ -8,8 +8,9 @@ def fatal(msg)
 end
 
 def dmenu(options)
+	dmenu = Muzak::Config.dmenu_exec || "dmenu"
 	opts = options.join("\n")
-	`printf "#{opts}" | dmenu`
+	`printf "#{opts}" | #{dmenu}`
 end
 
 fifo_path = File.join(Muzak::CONFIG_DIR, "muzak.fifo")

data/lib/muzak.rb

@@ -1,5 +1,6 @@
 require_relative "muzak/const"
 require_relative "muzak/utils"
+require_relative "muzak/config"
 require_relative "muzak/plugin"
 require_relative "muzak/song"
 require_relative "muzak/album"

data/lib/muzak/cmd.rb

@@ -5,17 +5,9 @@ module Muzak
     # load commands included by the user
     Dir.glob(File.join(USER_COMMAND_DIR, "*")) { |file| require file }
 
-    def self.resolve_command(cmd)
-      cmd.tr "-", "_"
-    end
-
-    def self.resolve_method(meth)
-      meth.to_s.tr "_", "-"
-    end
-
     def self.commands
       commands = instance_methods.map(&:to_s).reject { |m| m.start_with?("_") }
-      commands.map { |c| c.tr "_", "-" }
+      commands.map { |c| Utils.resolve_method c }
     end
   end
 end

data/lib/muzak/cmd/config.rb

@@ -2,52 +2,12 @@ require "yaml"
 
 module Muzak
   module Cmd
-    def _config_available?
-      File.file?(CONFIG_FILE)
-    end
-
-    def _config_loaded?
-      !!@config
-    end
-
-    def _config_sync
-      debug "syncing config hash with #{CONFIG_FILE}"
-      File.open(CONFIG_FILE, "w") { |io| io.write @config.to_yaml }
-    end
-
-    def _config_init
-      debug "creating a config file in #{CONFIG_FILE}"
-
-      @config = {
-        "music" => File.expand_path("~/music"),
-        "player" => "mpv",
-        "index-autobuild" => 86400,
-        "deep-index" => false,
-        "jukebox-size" => 100
-      }
-
-      Dir.mkdir(CONFIG_DIR) unless Dir.exist?(CONFIG_DIR)
-      _config_sync
-    end
-
-    def _config_plugin?(name)
-      @config.key?("plugin-#{name}")
-    end
-
-    def config_load
-      verbose "loading config from #{CONFIG_FILE}"
-
-      @config = YAML::load_file(CONFIG_FILE)
-    end
-
     def config_get(*args)
-      return unless _config_loaded?
-
       fail_arity(args, 1)
       key = args.shift
       return if key.nil?
 
-      info "#{key}: #{@config[key]}"
+      info "#{key}: #{Config.send Utils.resolve_method(key)}"
     end
   end
 end

data/lib/muzak/cmd/index.rb

@@ -9,7 +9,7 @@ module Muzak
     end
 
     def _index_outdated?
-      Time.now.to_i - @index["timestamp"] >= @config["index-autobuild"]
+      Time.now.to_i - @index.timestamp >= Config.index_autobuild
     end
 
     def _index_sync
@@ -22,9 +22,9 @@ module Muzak
 
       @index = Index.load_index(INDEX_FILE)
 
-      # the order is important here, since @config["index-autobuild"]
+      # the order is important here, since Config.index_autobuild
       # will short-circuit if index-autobuild isn't set
-      if @config["index-autobuild"] && _index_outdated?
+      if Config.index_autobuild && _index_outdated?
         verbose "rebuilding outdated index"
         index_build
       end
@@ -35,7 +35,7 @@ module Muzak
 
       verbose "building a new index, this may take a while"
 
-      @index = Index.new(@config["music"], deep: !!@config["deep-index"])
+      @index = Index.new(Config.music, deep: Config.deep_index)
       _index_sync
     end
 

data/lib/muzak/cmd/player.rb

@@ -65,7 +65,7 @@ module Muzak
     end
 
     def jukebox(*args)
-      count = args.shift || @config["jukebox-size"]
+      count = args.shift || Config.jukebox_size
 
       songs = @index.jukebox(count.to_i)
 

data/lib/muzak/config.rb

@@ -0,0 +1,34 @@
+require "yaml"
+
+module Muzak
+  class Config
+    if File.exist?(CONFIG_FILE)
+      @config = YAML::load_file(CONFIG_FILE)
+    else
+      @config = {
+        "music" => File.expand_path("~/music"),
+        "player" => "mpv",
+        "index-autobuild" => 86400,
+        "deep-index" => false,
+        "jukebox-size" => 100
+      }
+
+      File.open(CONFIG_FILE, "w") { |io| io.write @config.to_yaml }
+    end
+
+    @config.each do |key, value|
+      define_singleton_method Utils.resolve_command(key) do
+        value
+      end
+    end
+
+    # if a key doesn't exist, assume it's false
+    def self.method_missing(method, *args)
+      false
+    end
+
+    def self.plugin?(pname)
+      respond_to? "plugin_#{pname}"
+    end
+  end
+end

data/lib/muzak/const.rb

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

data/lib/muzak/index.rb

@@ -50,6 +50,10 @@ module Muzak
       !!@hash["deep"]
     end
 
+    def timestamp
+      @hash["timestamp"]
+    end
+
     def artists
       @hash["artists"].keys
     end

data/lib/muzak/instance.rb

@@ -4,11 +4,11 @@ module Muzak
     include Utils
 
     def command(cmd, *args)
-      send Cmd.resolve_command(cmd), *args
+      send Utils.resolve_command(cmd), *args
     end
 
     def method_missing(meth, *args)
-      warn "unknown command: #{Cmd.resolve_method(meth)}"
+      warn "unknown command: #{Utils.resolve_method(meth)}"
       help
     end
 
@@ -20,22 +20,19 @@ module Muzak
 
       debug "muzak is starting..."
 
-      _config_init unless _config_available?
-      config_load
-
       index_build unless _index_available?
       index_load
 
-      @player = Player::PLAYER_MAP[@config["player"]].new(self)
+      @player = Player::PLAYER_MAP[Config.player].new(self)
 
       @plugins = initialize_plugins!
 
       playlists_load
-      enqueue_playlist @config["autoplay"] if @config["autoplay"]
+      enqueue_playlist Config.autoplay if Config.autoplay
     end
 
     def initialize_plugins!
-      pks = Plugin.plugin_classes.select { |pk| _config_plugin? pk.plugin_name }
+      pks = Plugin.plugin_classes.select { |pk| Config.plugin? pk.plugin_name }
       pks.map { |pk| pk.new(self) }
     end
 

data/lib/muzak/player/mpv.rb

@@ -35,7 +35,7 @@ module Muzak
           "--input-ipc-server=%{socket}" % { socket: @sock_path }
         ]
 
-        mpv_args << "--geometry=#{instance.config["art-geometry"]}" if instance.config["art-geometry"]
+        mpv_args << "--geometry=#{Config.art_geometry}" if Config.art_geometry
 
         @pid = Process.spawn("mpv", *mpv_args)
 

data/lib/muzak/plugin/cava.rb

@@ -7,7 +7,7 @@ module Muzak
 
       def initialize(instance)
         super
-        @term_args = Shellwords.split instance.config["plugin-cava"]
+        @term_args = Shellwords.split Config.plugin_cava
         @pid = nil
       end
 

data/lib/muzak/plugin/scrobble.rb

@@ -8,7 +8,7 @@ module Muzak
 
       def initialize(instance)
         super
-        @username, @password_hash = instance.config["plugin-scrobble"].split(":")
+        @username, @password_hash = Config.plugin_scrobble.split(":")
       end
 
       def song_loaded(song)

data/lib/muzak/utils.rb

@@ -1,5 +1,13 @@
 module Muzak
   module Utils
+    def self.resolve_command(cmd)
+      cmd.tr "-", "_"
+    end
+
+    def self.resolve_method(meth)
+      meth.to_s.tr "_", "-"
+    end
+
     def music?(filename)
       [".mp3", ".flac", ".m4a", ".wav", ".ogg", ".oga", ".opus"].include?(File.extname(filename))
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: muzak
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - William Woodruff
@@ -48,6 +48,7 @@ files:
 - lib/muzak/cmd/meta.rb
 - lib/muzak/cmd/player.rb
 - lib/muzak/cmd/playlist.rb
+- lib/muzak/config.rb
 - lib/muzak/const.rb
 - lib/muzak/index.rb
 - lib/muzak/instance.rb