apple_music_library 0.7.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be251230181d53ca2f311d1b3fe47f60773c16300f3c7c115761e98bfa8da47b
-  data.tar.gz: e0ebe21930daf26dacca4d16e4ff94f5fad36da8a2e07e06ae4fa8b94ef7d721
+  metadata.gz: b67a41ade93ef2a93fb61db6496506bfd4bb57f6df952c7b3c57f91474116fdc
+  data.tar.gz: '068639ed7660feb425b667394861d5f295b0f4a211c6cb6c4c2bf4334357649e'
 SHA512:
-  metadata.gz: a9ddddc083a2d4621110b304d32474fc1164471c67ec3c671a33ae5cbe40bc51ce6bb23b51c7a930d456fd9c8f33300dbd67b39e553ecf15558a3ae54515e774
-  data.tar.gz: 1b08775b63e98f7e1eae53c6caa2ec5f6dbed16ba4b2c97df5ee41dfa8b836116ef58cf370b3b689485bad38d31e151f8dae732b337798d74dd5b6c172b94f9c
+  metadata.gz: 62eaabf37c4288bf1dc65fd00ce39b7bd944882c647043cb79df6b5340461109e959e80016d98e74800d170e9f66bc15aa05c01cd887aba3d068366682f5b01f
+  data.tar.gz: d8b7ed8641d329c4f33d3aedd0fd2262d021e817ca02aa2bb2d2994c1e91993ab9d9210eb1fd7202dc3b1bd7d6716212daa3d63620b65ed7ed26d5fa865913b8

data/CHANGELOG.md

@@ -3,6 +3,20 @@
 ## [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
+
+## 0.8.0 - 2022-03-13
+### Added
+- Ability to sort artists by track count and album count
+
 ## 0.7.0 - 2022-03-12
 ### Added
 - Average star ratings for track collectsion (albums, playlists, genres)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    apple_music_library (0.7.0)
+    apple_music_library (0.10.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}
 
@@ -56,10 +61,27 @@ library.artists(:most_played).each do |artist|
   puts "#{artist.play_count} :: #{artist.name}"
 end
 
+# List out artists with the most tracks
+library.artists(:most_tracks).each do |artist|
+  puts "#{artist.track_count} :: #{artist.name}"
+end
+
+# List out artists with the most albums
+library.artists(:most_albums).each do |artist|
+  puts "#{artist.album_count} :: #{artist.name}"
+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
+
+
 ```
 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

@@ -4,14 +4,10 @@ module AppleMusicLibrary
   class Album < TrackCollection
     attr_reader :artist
 
-
-    attr_reader :artist
-
     @@albums = {}
 
-    def initialize(artist, album_name)
+    def initialize(album_name, artist)
       @artist = artist
-      @album_name = album_name
       super
     end
 
@@ -24,7 +20,7 @@ module AppleMusicLibrary
       if @@albums[key]
         return @@albums[key]
       end
-      @@albums[key] = self.new(artist, album_name)
+      @@albums[key] = self.new(album_name, artist)
     end
 
     def id
@@ -46,5 +42,9 @@ module AppleMusicLibrary
       end
     end
 
+    def self.token
+      :album
+    end
+
   end
 end

data/lib/apple_music_library/artist.rb

@@ -16,11 +16,15 @@ module AppleMusicLibrary
     end
 
     def self.most_played(limit = 20)
-      if limit.nil?
-        self.all.sort_by(&:play_count).reverse
-      else
-        self.all.sort_by(&:play_count).reverse.take(limit)
-      end
+      self.sorted_set(:play_count, limit)
+    end
+
+    def self.most_tracks(limit = 20)
+      self.sorted_set(:track_count, limit)
+    end
+
+    def self.most_albums(limit = 20)
+      self.sorted_set(:album_count, limit)
     end
 
     def self.find_or_create(name)
@@ -53,13 +57,34 @@ module AppleMusicLibrary
       @albums.sort_by(&:year)
     end
 
+    def album_count
+      @albums.size
+    end
+
     def tracks
       @tracks
     end
 
+    def track_count
+      @tracks.size
+    end
+
     def play_count
       tracks.map(&:play_count).sum
     end
 
+    def genres
+      @genres ||= tracks.map(&:genre).uniq
+    end
+
+    protected
+
+    def self.sorted_set(sort_by_method, limit)
+      if limit.nil?
+        self.all.sort_by{|a| a.send(sort_by_method)}.reverse
+      else
+        self.all.sort_by{|a| a.send(sort_by_method)}.reverse.take(limit)
+      end
+    end
   end
 end

data/lib/apple_music_library/genre.rb

@@ -1,28 +1,8 @@
 module AppleMusicLibrary
   class Genre < TrackCollection
 
-    attr_reader :name
-
-    @@genres = {}
-
-    def initialize(name)
-      @name = name
-      super
-    end
-
-    def self.all
-      @@genres.values
-    end
-    
-    def self.find_or_create(name)
-      if @@genres[name]
-        return @@genres[name]
-      end
-      @@genres[name] = self.new(name)
-    end
-
-    def self.find_by_name(name)
-      @@genres[name]
+    def self.token
+      :genre
     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

@@ -1,16 +1,48 @@
 module AppleMusicLibrary
   class TrackCollection
 
-    attr_reader :tracks
+    attr_reader :name, :tracks
 
-    def initialize(*args)
+    @@track_collections = {}
+
+    def initialize(name, *args)
       @tracks = []
+      @name = name.present? ? name : 'Unknown'
+    end
+
+    def self.all
+      @@track_collections[token].values
+    end
+
+    def self.find_by_name(lookup_name)
+      @@track_collections[token][lookup_name]
+    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 star_rating
       return nil if rated_tracks.empty?      
       rated_tracks.map(&:star_rating).sum / rated_tracks.size
@@ -22,5 +54,6 @@ module AppleMusicLibrary
       @rated_tracks ||= tracks.select{|t| t.rated?}
     end
 
+
   end
 end

data/lib/apple_music_library/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AppleMusicLibrary
-  VERSION = "0.7.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.7.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Todd Gehman
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-12 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: