muzak 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 684cfddb194c4ee5a540002d298a9a2cfbf58103
-  data.tar.gz: e6ce386617717a7ded0ed2f8f736f2a68052f805
+  metadata.gz: b64a222cbd2a691404714a63b195ee2a78bb82b3
+  data.tar.gz: 8d5547a8facf37798f822e53c97d9070dd29b6aa
 SHA512:
-  metadata.gz: 196bc4a565223cc1d49b7876c959ac2e806869e80c9bf5bf89c4ceb7f802f26a91fe92454ca348b89ac8114ce01e641a6388652bb961e8218c16a046d064bfa3
-  data.tar.gz: '09d1c8cd2349ae4d6c2e91829a0c02bb9140cf20eb66537116dd280dad593acf4e533fa09e7ca8f5031cb1372c406135646696ee1b1159314c28386931c61b40'
+  metadata.gz: 999969bedb0fb6d2ea42fa856266702f2464207d6e3480eaccf8cad09f69b260e7981e8c7dc119cf0e02dfba0a9bf821230c1f8eb199137f9739e1d8866fa772
+  data.tar.gz: db562a2611427925e9c2a1621b5d294f6597dba8813647d9035ef7ecc57d8293b90f4f30c53f055b5b22a684ba418e0e2ecf9a5606c1a3268af47bb0d3144cf6

data/lib/muzak/album.rb

@@ -10,17 +10,13 @@ module Muzak
     # @return [String] the path to the album's cover art
     attr_reader :cover_art
 
-    # @note instead of passing an album hash directly from the index, this
-    #   should really just take a title and an array of Song objects.
-    def initialize(title, album_hash)
+    # @param title [String] the album's title
+    # @param songs [Array<Song>] the album's songs
+    # @param cover_art [String] the album's cover art
+    def initialize(title, songs, cover_art = nil)
       @title = title
-      @cover_art = album_hash["cover"]
-
-      unless album_hash["deep-songs"].empty?
-        @songs = album_hash["deep-songs"]
-      else
-        @songs = album_hash["songs"].map { |s| Song.new(s) }
-      end
+      @songs = songs
+      @cover_art = cover_art
     end
   end
 end

data/lib/muzak/const.rb

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

data/lib/muzak/index.rb

@@ -19,6 +19,8 @@ module Muzak
 
     # @param index_file [String] the path of the index data file
     def initialize(file: INDEX_FILE)
+      debug "loading index from '#{INDEX_FILE}'..."
+
       @hash = Marshal.load(File.read file)
     end
 
@@ -45,7 +47,12 @@ module Muzak
 
         artists.each do |a|
           @hash["artists"][a]["albums"].each do |title, album_hash|
-            albums_hash[title] = Album.new(title, album_hash)
+            if deep?
+              songs = album_hash["deep-songs"]
+            else
+              songs = album_hash["songs"].map { |s| Song.new(s) }
+            end
+            albums_hash[title] = Album.new(title, songs, album_hash["cover"])
           end
         end
 
@@ -64,7 +71,14 @@ module Muzak
     # @return [Array<Album>] all albums by the given artist
     def albums_by(artist)
       if artists.include?(artist)
-        @hash["artists"][artist]["albums"].map { |title, album| Album.new(title, album) }
+        @hash["artists"][artist]["albums"].map do |title, album_hash|
+          if deep?
+            songs = album_hash["deep-songs"]
+          else
+            songs = album_hash["songs"].map { |s| Song.new(s) }
+          end
+          Album.new(title, songs, album_hash["cover"])
+        end
       else
         error "no such artist: '#{artist}'" unless @hash["artists"].key?(artist)
         []

data/lib/muzak/player/mpv.rb

@@ -170,8 +170,6 @@ module Muzak
       # Get mpv's currently loaded song.
       # @return [Song, nil] the currently loaded song
       def now_playing
-        path = @mpv.get_property "path"
-        return if path&.empty?
         @_now_playing ||= Song.new(@mpv.get_property "path")
       end
 

metadata

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