apple_music_library 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d57d33d85a24895e93ca386313d43fe9dd28c6a48bec21fbb4348ec3b168a177
-  data.tar.gz: d3d0b25dbd54fa23f03cea03b46729224d9b1054da276060a62cac40ab0016e3
+  metadata.gz: b67a41ade93ef2a93fb61db6496506bfd4bb57f6df952c7b3c57f91474116fdc
+  data.tar.gz: '068639ed7660feb425b667394861d5f295b0f4a211c6cb6c4c2bf4334357649e'
 SHA512:
-  metadata.gz: 319fb967951a32d12f0d871c32d40b56a2c4d674bbb8966de6bf6b592da5b5ed0af41f9443caf2b7b222345ded89264af85bdf75694856a8ed7e37162ab706f1
-  data.tar.gz: 148f0638affc3d19f1c96619e732280966574885fce0c66acc69e083d0cd569200e2a8535f75f96e8ef06b75fdee07b6f0ca82befd0ab8a4bcf914b86af2fff5
+  metadata.gz: 62eaabf37c4288bf1dc65fd00ce39b7bd944882c647043cb79df6b5340461109e959e80016d98e74800d170e9f66bc15aa05c01cd887aba3d068366682f5b01f
+  data.tar.gz: d8b7ed8641d329c4f33d3aedd0fd2262d021e817ca02aa2bb2d2994c1e91993ab9d9210eb1fd7202dc3b1bd7d6716212daa3d63620b65ed7ed26d5fa865913b8

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 ## [Unreleased]
 - Ability to print out playlist folder hierarchy
 
+## 0.10.0 - 2022-03-15
+### Fixed
+- Fixed incorrect handling of tracks when added to track collections
+### Added
+- Added Year model to retrieve tracks and track counts per year of release
+
 ## 0.9.0 - 2022-03-15
 ### Added
 - Ability to get genres associated with an artist

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    apple_music_library (0.9.0)
+    apple_music_library (0.10.0)
       facets (~> 3.1)
       plist (~> 3.6)
 

data/README.md

@@ -76,6 +76,12 @@ library.genres.each do |genre|
   puts "#{genre.track_count} #{genre.name}"
 end
 
+# Display track counts per year
+library.years.each do |year|
+  puts "#{year.track_count} #{year.name}"
+end
+
+
 ```
 All stored attributes are available via snake_cased methods on `Track` and `Playlist`. However, note that `#artist`, `#album`, and `#genre` are special cases, returning Ruby objects rather than their associated string values. Methods to return the string versions of these track attributes are provided as `track.artist_name`, `track.album_name`, and `track.genre_name`.
 

data/lib/apple_music_library/album.rb

@@ -42,5 +42,9 @@ module AppleMusicLibrary
       end
     end
 
+    def self.token
+      :album
+    end
+
   end
 end

data/lib/apple_music_library/genre.rb

@@ -1,6 +1,9 @@
 module AppleMusicLibrary
   class Genre < TrackCollection
 
+    def self.token
+      :genre
+    end
 
   end
 end

data/lib/apple_music_library/library.rb

@@ -4,6 +4,7 @@ require_relative 'genre'
 require_relative 'playlist'
 require_relative 'playlist_folder'
 require_relative 'track'
+require_relative 'year'
 require_relative "utils"
 require 'plist'
 
@@ -84,6 +85,10 @@ module AppleMusicLibrary
       Track.find(track_id)
     end
 
+    def years
+      @years ||= Year.all
+    end
+
     def valid?
       has_tracks?
     end

data/lib/apple_music_library/playlist.rb

@@ -59,6 +59,10 @@ module AppleMusicLibrary
       folder.present?
     end
 
+    def token
+      :playlist
+    end
+
     private
 
     def load_tracks

data/lib/apple_music_library/track.rb

@@ -43,6 +43,11 @@ module AppleMusicLibrary
       # end
       @genre = Genre.find_or_create(genre_name)
 
+      if year_name.present?
+        @year = Year.find_or_create(year_name)
+        @year.add_track(self)
+      end
+
       @artist.add_track(self)
       @artist.add_album(@album)
       @album.add_track(self)
@@ -79,6 +84,10 @@ module AppleMusicLibrary
       @info['Genre']
     end
 
+    def year_name
+      @info['Year']
+    end
+
     def star_rating
       rating / 20
     end

data/lib/apple_music_library/track_collection.rb

@@ -7,7 +7,7 @@ module AppleMusicLibrary
 
     def initialize(name, *args)
       @tracks = []
-      @name = name
+      @name = name.present? ? name : 'Unknown'
     end
 
     def self.all
@@ -19,13 +19,23 @@ module AppleMusicLibrary
     end
 
     def self.find_or_create(lookup_name)
+      if lookup_name.blank?
+        lookup_name = 'Unknown'
+      end
+      # puts "Finding or creating #{token}: #{lookup_name}"
       unless @@track_collections[token]
         @@track_collections[token] = {}
       end
+      if @@track_collections[token][lookup_name]
+        # puts "FOUND"
+        return @@track_collections[token][lookup_name]
+      end
+      # puts "CREATING"
       @@track_collections[token][lookup_name] = self.new(lookup_name)
     end
 
     def add_track(track)
+      # puts "Adding #{track.name} to #{self.class.token} #{name}"
       @tracks << track
     end
 
@@ -44,13 +54,6 @@ module AppleMusicLibrary
       @rated_tracks ||= tracks.select{|t| t.rated?}
     end
 
-    def self.token
-      self.class.name
-    end
-
-    def token
-      self.class.token
-    end
 
   end
 end

data/lib/apple_music_library/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AppleMusicLibrary
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

data/lib/apple_music_library/year.rb

@@ -0,0 +1,20 @@
+require_relative 'track_collection'
+
+module AppleMusicLibrary
+  class Year < TrackCollection
+
+    def self.dump
+      self.all.sort_by{|y| y.name}.each do |year|
+        puts "#{year.name} - #{year.track_count} tracks"
+        # year.tracks.each do |track|
+        #   puts "\t#{track.name}"
+        # end
+      end
+    end
+
+    def self.token
+      :year
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apple_music_library
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Todd Gehman
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-15 00:00:00.000000000 Z
+date: 2022-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -134,6 +134,7 @@ files:
 - lib/apple_music_library/track_collection.rb
 - lib/apple_music_library/utils.rb
 - lib/apple_music_library/version.rb
+- lib/apple_music_library/year.rb
 - sig/apple_music_library.rbs
 homepage: https://github.com/pugetive/apple_music_library
 licenses:
@@ -157,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Provides a Ruby interface to the information stored in an Apple Music (formerly