muzak 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 171a96f96d977d9cb964db7e1e14643117921dbe
-  data.tar.gz: 9cea9f8e1f6f229b24e6974b2efc698c3a9d5cd9
+  metadata.gz: c0f970a0a6e2731b8014245f91e9b97e10bdbfa8
+  data.tar.gz: 0c8d58beb2f2bd3b8cf77af94a6a4e8aef753b0c
 SHA512:
-  metadata.gz: dae34d10b94fb1f44e689209edef9e72e78ad42f1dcfb0ea50abf56f0e53f95c1317b25b20d964f89bdb7d4e41b974489535831da9a1e414a8de1a53965a72b9
-  data.tar.gz: 9283f7fa57a368be217d41c8b30e18385481bc4cc08b5a75d9427f5ede6522233f777014299cf7d935ecfb0b6ddaf2ef22aaebff24eef027f8e9f4dc688a594d
+  metadata.gz: bd1b4f8bc4af206042d99b6156d1dd90d57cb263d0a2885e8d29b4ce4d25b56ba13358ce1dc23d28142a9f0a9228e419f1816df5aa1619c05a31d2e8b07ba102
+  data.tar.gz: 12bc26a48046a905bcd3678b8e829fc5f2a221f13eee34ce0d0d87bcc72add2528c5f37244ce0d272999f2d58647b42558991cbc5fb62d57c0ff2b82a100f7de

data/bin/muzak-index

@@ -55,23 +55,20 @@ index_file = ARGV.shift || Muzak::INDEX_FILE
 index_hash = {
   "tree" => tree,
   "timestamp" => Time.now.to_i,
-  "artists" => {},
   "deep" => OPTS[:deep]
 }
 
-Dir.entries(tree).each do |artist|
-  next unless File.directory?(File.join(tree, artist))
-  next if artist.start_with?(".")
+artist_names = Dir.entries(tree).reject! { |ent| ent.start_with?(".") }
 
-  info "indexing '#{artist}'..."
-
-  index_hash["artists"][artist] = {}
-  index_hash["artists"][artist]["albums"] = {}
+index_hash["artists"] = artist_names.map do |artist|
+  [artist, { "albums" => {} }]
+end.to_h
 
+artist_names.each do |artist|
   Dir.entries(File.join(tree, artist)).each do |album|
     next if album.start_with?(".")
 
-    info "\tindexing '#{album}'..."
+    info "indexing '#{artist}' - '#{album}'..."
 
     album_hash = {}
     album_hash["songs"] = []

data/lib/muzak/const.rb

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

data/lib/muzak/player/mpv.rb

@@ -80,6 +80,7 @@ module Muzak
 
         @socket.close
       ensure
+        @_now_playing = nil
         instance.event :player_deactivated
         File.delete(@sock_path) if @sock_path && File.exists?(@sock_path)
       end
@@ -227,7 +228,7 @@ module Muzak
             else
               @result_queue << response
             end
-          rescue EOFError # the player is deactivating
+          rescue EOFError, IOError # the player is deactivating
             Thread.exit
           end
         end

data/lib/muzak/song.rb

@@ -76,8 +76,10 @@ module Muzak
       full
     end
 
+    # @return [Boolean] whether or not the given object is equal to this one
+    # @note compares song paths, not metadata
     def ==(other)
-      path == other.path
+      other.is_a?(Song) && path == other.path
     end
   end
 end

metadata

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