apple_music_library 0.8.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c00fde335b53ca8bacdd13bdbce297b0bea1a7f5f4453f4c42bbe9c867b6c02
-  data.tar.gz: cec158953268525e8142c5a51960d0b79584e646c4e16def0fb2e71cd66b2b7e
+  metadata.gz: 7b345adc65b1d7e12d09e6a7019a857b8abd77ae831420d92e33266b0106fd61
+  data.tar.gz: a372d17051416b41edfd62095b5f09b35bd0ca580dffbf545650caac9c0283c8
 SHA512:
-  metadata.gz: debab2473712160521d5bc793b65e3febd984620f53d060e3864285bcb906119b074d645c678fcb4e865ea23ae90b6005eff4ccc89c26a3cfb0d91b556f26199
-  data.tar.gz: 47e7b6381f4d94afda90441cdd975fed9ba6afc6ff09de115e0cd0a1144b0bd9b3582cec0f5f736d394308d6537b5f3e31bba407cde5496b7ace6b5cc59ee6b6
+  metadata.gz: 1261413cf1b0583017abcc2189f986927820a67faa1d970e70fbe42e4ecf27bfa41adaf3599829f210cbfd5f12b1dda8c544f935405a43dced50f8349f2d7a28
+  data.tar.gz: 1cda8031165413f399bfa1eeaf58187063435f0a5598cf190b11cabc3785d7a45f0ce99d356e3176aad894ba48bcbb911cc183254ff821c136807bb669db867a

data/CHANGELOG.md

@@ -3,6 +3,20 @@
 ## [Unreleased]
 - Ability to print out playlist folder hierarchy
 
+## 0.11.0 - 2022-03-19
+### Added
+- Added Decade model to retrieve track and album info per decade
+
+## 0.10.0 - 2022-03-16
+### 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
+
 ## 0.8.0 - 2022-03-13
 ### Added
 - Ability to sort artists by track count and album count

data/Gemfile.lock

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

data/README.md

@@ -44,10 +44,15 @@ playlist.tracks.each do |track|
   puts track.name
 end
 
-# Count tracks by artist
+# Count tracks by an artist
 artist = library.artist('XTC')
 puts artist.tracks.count
 
+# List genres associated with the artist
+artist.genres.each do |genre|
+  puts genre.name
+end
+
 # Get favorite tracks by this artist
 favorite_tracks = artist.tracks.select{|t| t.loved? || t.star_rating > 3}
 
@@ -68,8 +73,29 @@ end
 
 # Display track counts per genre
 library.genres.each do |genre|
-  puts "#{genre.tracks.count} #{genre.name}"
+  puts "#{genre.track_count} #{genre.name}"
+end
+
+# Display track counts per year
+library.years.each do |year|
+  puts "#{year.track_count} #{year.name}"
+end
+
+# Display track counts per decade
+library.decades.each do |decade|
+  puts "#{decade.track_count} #{decade.name}"
 end
+
+# Print a report on all decades in the library
+#   e.g.
+# 1990-1999 - 7217 tracks on 1030 albums
+# 2000-2009 - 9083 tracks on 1876 albums
+# 2010-2019 - 4729 tracks on 1046 albums
+# 2020-2029 - 1074 tracks on 455 albums
+library.decades_report
+
+
+
 ```
 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/artist.rb

@@ -73,6 +73,10 @@ module AppleMusicLibrary
       tracks.map(&:play_count).sum
     end
 
+    def genres
+      @genres ||= tracks.map(&:genre).uniq
+    end
+
     protected
 
     def self.sorted_set(sort_by_method, limit)

data/lib/apple_music_library/decade.rb

@@ -0,0 +1,25 @@
+require_relative 'track_collection'
+
+module AppleMusicLibrary
+  class Decade < TrackCollection
+
+    def self.report
+      self.all.sort_by{|d| d.name}.each do |decade|
+        puts "#{decade.name} - #{decade.track_count} tracks on #{decade.album_count} albums"
+      end
+    end
+
+    def self.find_or_create_for(year_name)
+      decade_start_year = year_name.to_i - (year_name.to_i % 10)
+      decade_stop_year = decade_start_year + 9
+      decade_name = "#{decade_start_year}-#{decade_stop_year}"
+
+      self.find_or_create(decade_name)
+    end
+
+    def self.token
+      :decade
+    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

@@ -1,10 +1,4 @@
-require_relative 'album'
-require_relative 'artist'
-require_relative 'genre'
-require_relative 'playlist'
-require_relative 'playlist_folder'
-require_relative 'track'
-require_relative "utils"
+Dir[File.join(__dir__, '.', '*.rb')].each { |file| require file }
 require 'plist'
 
 module AppleMusicLibrary
@@ -84,6 +78,18 @@ module AppleMusicLibrary
       Track.find(track_id)
     end
 
+    def years
+      @years ||= Year.all
+    end
+
+    def decades
+      @decades ||= Decade.all
+    end
+
+    def decades_report
+      Decade.report
+    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,14 @@ 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)
+
+        @decade = Decade.find_or_create_for(year_name)
+        @decade.add_track(self)
+      end
+
       @artist.add_track(self)
       @artist.add_album(@album)
       @album.add_track(self)
@@ -79,6 +87,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,16 +19,34 @@ 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
 
+    def track_count
+      @track_count ||= tracks.count
+    end
+
+    def album_count
+      @ablum_count ||= tracks.map(&:album).uniq.count
+    end
+
     def star_rating
       return nil if rated_tracks.empty?      
       rated_tracks.map(&:star_rating).sum / rated_tracks.size
@@ -40,13 +58,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.8.0"
+  VERSION = "0.11.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.8.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Todd Gehman
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-13 00:00:00.000000000 Z
+date: 2022-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -126,6 +126,7 @@ files:
 - lib/apple_music_library.rb
 - lib/apple_music_library/album.rb
 - lib/apple_music_library/artist.rb
+- lib/apple_music_library/decade.rb
 - lib/apple_music_library/genre.rb
 - lib/apple_music_library/library.rb
 - lib/apple_music_library/playlist.rb
@@ -134,6 +135,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: