muzak 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dde0b299d121d7389c4ffc2e24c5239a6320ba92
-  data.tar.gz: bab3a86df140ae8b470d5781fb075b189ba7bc14
+  metadata.gz: 171a96f96d977d9cb964db7e1e14643117921dbe
+  data.tar.gz: 9cea9f8e1f6f229b24e6974b2efc698c3a9d5cd9
 SHA512:
-  metadata.gz: 9244e21c503e122501659f1dcc58531f4b1ccc4764ac52a075b68be8c155d8e54ca3ce7e0e83043a368112e8dd4d4ec8a51f39a177a0b58678dd52f6dd570b2e
-  data.tar.gz: 274799ee46ae741ec52a36e2ddeba7072469f3503f297c887844091a62ad347a96673d42cc3b9df51ba6fccc352748df24f73fb780bfc1a5a81312bb976d867a
+  metadata.gz: dae34d10b94fb1f44e689209edef9e72e78ad42f1dcfb0ea50abf56f0e53f95c1317b25b20d964f89bdb7d4e41b974489535831da9a1e414a8de1a53965a72b9
+  data.tar.gz: 9283f7fa57a368be217d41c8b30e18385481bc4cc08b5a75d9427f5ede6522233f777014299cf7d935ecfb0b6ddaf2ef22aaebff24eef027f8e9f4dc688a594d

data/bin/muzak-index

@@ -5,10 +5,10 @@ require "muzak"
 VERSION = 1
 
 OPTS = {
-  deep: ARGV.delete("--deep") || ARGV.delete("-d"),
-  verbose: ARGV.delete("--verbose") || ARGV.delete("-V"),
-  help: ARGV.delete("--help") || ARGV.delete("-h"),
-  version: ARGV.delete("--version") || ARGV.delete("-v")
+  deep: !!(ARGV.delete("--deep") || ARGV.delete("-d")),
+  verbose: !!(ARGV.delete("--verbose") || ARGV.delete("-V")),
+  help: !!(ARGV.delete("--help") || ARGV.delete("-h")),
+  version: !!(ARGV.delete("--version") || ARGV.delete("-v"))
 }
 
 def help
@@ -73,31 +73,33 @@ Dir.entries(tree).each do |artist|
 
     info "\tindexing '#{album}'..."
 
-    index_hash["artists"][artist]["albums"][album] = {}
-    index_hash["artists"][artist]["albums"][album]["songs"] = []
-    index_hash["artists"][artist]["albums"][album]["deep-songs"] = []
+    album_hash = {}
+    album_hash["songs"] = []
+    album_hash["deep-songs"] = []
 
     Dir.glob(File.join(tree, artist, album, "**")) do |file|
-      index_hash["artists"][artist]["albums"][album]["cover"] = file if Muzak::Utils.album_art?(file)
+      album_hash["cover"] = file if Muzak::Utils.album_art?(file)
 
       if Muzak::Utils.music?(file)
-        index_hash["artists"][artist]["albums"][album]["songs"] << file
+        album_hash["songs"] << file
         if OPTS[:deep]
-          index_hash["artists"][artist]["albums"][album]["deep-songs"] << Muzak::Song.new(file)
+          album_hash["deep-songs"] << Muzak::Song.new(file)
         end
       end
     end
 
-    index_hash["artists"][artist]["albums"][album]["songs"].sort!
+    album_hash["songs"].sort!
 
     # if any of the track numbers in the album are > 0 (the fallback),
     # sort by ID3 track numbers. otherwise, hope that the song
     # paths contain track numbers (e.g, "01 song.mp3").
-    if index_hash["artists"][artist]["albums"][album]["deep-songs"].any? { |s| s.track > 0 }
-      index_hash["artists"][artist]["albums"][album]["deep-songs"].sort_by!(&:track)
+    if album_hash["deep-songs"].any? { |s| s.track > 0 }
+      album_hash["deep-songs"].sort_by!(&:track)
     else
-      index_hash["artists"][artist]["albums"][album]["deep-songs"].sort_by!(&:path)
+      album_hash["deep-songs"].sort_by!(&:path)
     end
+
+    index_hash["artists"][artist]["albums"][album] = album_hash
   end
 end
 

data/lib/muzak/const.rb

@@ -1,6 +1,6 @@
 module Muzak
   # Muzak's current version
-  VERSION = "0.2.1".freeze
+  VERSION = "0.2.2".freeze
 
   # The root directory for all user configuration, data, etc
   CONFIG_DIR = File.expand_path("~/.config/muzak").freeze

data/lib/muzak/index.rb

@@ -14,21 +14,17 @@ module Muzak
     # @return [String] the path of the root of the music tree
     attr_accessor :tree
 
-    # @return [Boolean] whether the index is "deep" (includes metadata) or not
-    attr_accessor :deep
-
     # @return [Hash] the index hash
     attr_accessor :hash
 
     # @param index_file [String] the path of the index data file
     def initialize(file: INDEX_FILE)
       @hash = Marshal.load(File.read file)
-      @deep = @hash["deep"]
     end
 
     # @return [Boolean] whether or not the current index is deep
     def deep?
-      deep
+      @hash["deep"]
     end
 
     # @return [Integer] the UNIX timestamp from when the index was built

data/lib/muzak/player.rb

@@ -6,6 +6,8 @@ Dir.glob(File.join(__dir__, "player/*")) { |file| require_relative file }
 module Muzak
   # The namespace for muzak players.
   module Player
+    extend Utils
+
     # An association of shorthand player "names" to Class objects.
     PLAYER_MAP = {
       "stub" => Player::StubPlayer,
@@ -15,7 +17,15 @@ module Muzak
     # Returns an instantiated player as specified in `Config.player`.
     # @return [StubPlayer] the player instance
     def self.load_player!(instance)
-      PLAYER_MAP[Config.player].new(instance)
+      klass = PLAYER_MAP[Config.player]
+
+      error! "#{Config.player} isn't a known player" unless klass
+
+      if klass.available?
+        klass.new(instance)
+      else
+        error! "#{Config.player} isn't available, do you need to install it?"
+      end
     end
   end
 end

data/lib/muzak/player/mpv.rb

@@ -7,6 +7,11 @@ module Muzak
   module Player
     # Exposes MPV's IPC to muzak for playback control.
     class MPV < StubPlayer
+      # @return [Boolean] Whether or not MPV is available for execution
+      def self.available?
+        Utils.which?("mpv")
+      end
+
       # @return [Boolean] Whether or not the current instance is running.
       def running?
         begin

data/lib/muzak/player/stub_player.rb

@@ -7,6 +7,11 @@ module Muzak
       # @return [Instance] the instance associated with this player
       attr_reader :instance
 
+      # @return [true] whether or not this type of player is available
+      def self.available?
+        true
+      end
+
       # @param instance [Instance] the instance associated with the player
       def initialize(instance)
         @instance = instance

data/lib/muzak/utils.rb

@@ -33,6 +33,15 @@ module Muzak
       File.basename(filename) =~ /(cover)|(folder).(jpg)|(png)/i
     end
 
+    # Tests whether the given utility is available in the system path.
+    # @param util [String] the utility to test
+    # @return [Boolean] whether or not the utility is available
+    def self.which?(util)
+      ENV["PATH"].split(File::PATH_SEPARATOR).any? do |path|
+        File.executable?(File.join(path, util))
+      end
+    end
+
     # @return [Boolean] whether or not muzak is running in debug mode
     def debug?
       Config.debug
@@ -79,7 +88,8 @@ module Muzak
     # @param args [Array<String>] the message(s)
     # @return [void]
     def error(*args)
-      output pretty(:red, "error"), "[#{self.class.name}]", args
+      context = self.is_a?(Module) ? name : self.class.name
+      output pretty(:red, "error"), "[#{context}]", args
     end
 
     # Outputs a boxed error message and then exits.
@@ -95,8 +105,8 @@ module Muzak
     # @return [void]
     def debug(*args)
       return unless debug?
-
-      output pretty(:yellow, "debug"), "[#{self.class.name}]", args
+      context = self.is_a?(Module) ? name : self.class.name
+      output pretty(:yellow, "debug"), "[#{context}]", args
     end
 
     # Outputs a boxed verbose message.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: muzak
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - William Woodruff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: taglib-ruby