apple_music_library 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1148dd5f546044638ace3b635c61799d36f427cdf380e19d146be4ab55a0128
-  data.tar.gz: ceeafe5ace4e3ac2d76aa34bb2695592584799755b9318ce99b055bdfc971f83
+  metadata.gz: 840cb609f61bcb54a260d57acc3e6f5ff4ac72acbaf582bba56aeb1cc1b4bcd7
+  data.tar.gz: 9987bdbcf17275cdddc99ec4fa81f815932ffe394eb1e9d48b98bfd68016c1c2
 SHA512:
-  metadata.gz: 289f57dc10c8ec89d0ddf9506fbea8083ab8c6d07d0bfc1b060d481434e47e375e73bb8e6b5518570babd5add4f24bb3817a2bf6dce5108f173edbe43ed5b506
-  data.tar.gz: 0276d14ab7d07c5b2aaf1c56c95494ddb81680a2d6811ce3c5a0254e3f93a18fbbf8c8d85223de7b6ea0ec110a00748cc9727d936c46c98c5fd87ab4f0d98aa6
+  metadata.gz: aa00cf271b73e5465a5c383a85002071211f615bbd6244977f2480bff5e3c44f783d46fcd050db5702958b84e24a27c3195b8e2987062213a065ec21a962365f
+  data.tar.gz: 6d1f93fc11f8dc2e7a64e0a94c073b5aac70e5e5ee3389e17b7ca3d02b86b329069f3c507bbca9d93c9ba1576cf1394809e0913918f9e59e56d8b29d4aec3482

data/Gemfile.lock

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

data/lib/apple_music_library/album.rb

@@ -5,12 +5,26 @@ module AppleMusicLibrary
 
     attr_reader :artist, :album_name, :tracks
 
+    @@albums = {}
+
     def initialize(artist, album_name)
       @artist = artist
       @album_name = album_name
       @tracks = []
     end
 
+    def self.all
+      @@albums.values
+    end
+
+    def self.find_or_create(artist, album_name)
+      key = "#{artist.name}-#{album_name}"
+      if @@albums[key]
+        return @@albums[key]
+      end
+      @@albums[key] = self.new(artist, album_name)
+    end
+
     def id
       "#{artist.name}-#{album_name}"
     end
@@ -20,7 +34,7 @@ module AppleMusicLibrary
     end
 
     def year
-      @year ||= tracks.sort(&:year).last.year
+      @year ||= @tracks.sort_by(&:year).last.year
     end
 
   end

data/lib/apple_music_library/artist.rb

@@ -3,24 +3,50 @@ module AppleMusicLibrary
 
     attr_reader :name
 
+    @@artists = {}
+
     def initialize(name)
       @name = name
       @albums = []
+      @tracks = []
+    end
+
+    def self.all
+      @@artists.values
+    end
+
+    def self.find_or_create(name)
+      if @@artists[name]
+        return @@artists[name]
+      end
+      @@artists[name] = self.new(name)
+    end
+
+    def self.find_by_name(artist_name)
+      if @@artists[artist_name]
+        return @@artists[artist_name]
+      end
+      nil
     end
 
     def add_album(album)
-      unless albums.include?(album)
+      unless @albums.include?(album)
         @albums << album
       end
     end
 
+    def add_track(track)
+      unless @tracks.include?(track)
+        @tracks << track
+      end
+    end
 
     def albums
-      @albums.sort(&:year)
+      @albums.sort_by(&:year)
     end
 
     def tracks
-      @tracks ||= @albums.map(&:tracks).flatten
+      @tracks
     end
 
   end

data/lib/apple_music_library/genre.rb

@@ -3,11 +3,28 @@ module AppleMusicLibrary
 
     attr_reader :name, :tracks
 
+    @@genres = {}
+
     def initialize(name)
       @name = name
       @tracks = []
     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]
+    end
+
     def add_track(track)
       unless tracks.include?(track)
         @tracks << track

data/lib/apple_music_library/library.rb

@@ -36,53 +36,43 @@ module AppleMusicLibrary
         raise Error, "Failed to parse library xml file [#{e.message}]"
       end
 
-      @artists_hash   = {}
-      @tracks_hash    = {}
-      @playlists_hash = {}
-      @albums_hash    = {}
-      @genres_hash    = {}
-
-      @locations_hash = {}
-      @slugs_hash     = {}      
-
       extract_plist_info
     end
 
-    def tracks
-      @tracks_hash.values
+    def albums
+      @albums ||= Album.all
     end
 
     def artists
-      @artists_hash.values
+      @artists ||= Artist.all
     end
 
     def artist(artist_name)
-      artists.find{|a| a.name == artist_name}
+      Artist.find_by_name(artist_name)
     end
 
-    def albums
-      @albums_hash.values
+    def genres
+      @genres ||= Genre.all
     end
 
-    def playlists
-      @playlists_hash.values
+    def genre(genre_name)
+      Genre.find_by_name(genre_name)
     end
 
-    def playlist(playlist_name)
-      playlists.find{|p| p.name == playlist_name}
+    def playlists
+      @playlists ||= Playlist.all
     end
 
-
-    def albums
-      @albums_hash.values
+    def playlist(playlist_name)
+      Playlist.find_by_name(playlist_name)
     end
 
-    def genres
-      @genres_hash.values.sort_by{|g| g.name}
+    def tracks
+      @tracks ||= Track.all
     end
 
-    def genre(genre_name)
-        genres.find{|g| g.name == genre_name}
+    def track(track_id)
+      Track.find(track_id)
     end
 
     def valid?
@@ -93,83 +83,113 @@ module AppleMusicLibrary
       tracks.any?
     end
 
-    def track(track_id)
-      track = @tracks_hash[track_id.to_i]
-      if track.nil?
-        message("Cound not find track with ID [#{track_id}]")
-        message("Searched tracks: [#{@tracks_hash.keys.sort.join(', ')}]")
-      end
-      track
-    end
-
     private
 
     def extract_plist_info
+      extract_tracks_from_plist
+      extract_playlists_from_plist
+    end
+
+    def extract_tracks_from_plist
       non_music_formats = {}
       plist['Tracks'].each do |track|
         if MUSIC_FORMATS.include?(track[1]['Kind'])
-          track = Track.new(track[1])
-          # next if track.artist.name == 'NPR'
-          @tracks_hash[track.id] = track
-          # @locations_hash[track.location] = track
-
-          artist = add_artist(track.artist)
-          album = add_track_to_album(track, track.album)
-          artist.add_album(album)
-
-          if track.genre_name.present?
-            genre = add_track_to_genre(track)
-          end
+          Track.new(track[1])
         else
           non_music_formats[track[1]['Kind']] = true
         end
       end
 
-      plist['Playlists'].each do |playlist_info|
-        playlist = Playlist.new(playlist_info, self)
-        next if playlist.folder?
-        @playlists_hash[playlist.id] = playlist
-      end
-
       if non_music_formats.any?
         message("Skipped the following non-music formats:\n#{non_music_formats.keys.join(', ')}")
       end
-    end
 
+    end
 
-    def add_artist(artist)
-      unless @artists_hash[artist.name]
-        @artists_hash[artist.name] = artist
+    def extract_playlists_from_plist
+      plist['Playlists'].each do |playlist_info|
+        Playlist.new(playlist_info, self)
       end
-      artist
     end
 
-    def add_track_to_album(track, album)
-      return if @albums_hash[album.id]
-      # message("Creating new artist #{artist.name}")
-      @albums_hash[album.id] = album
-      album.add_track(track)
-      album
-    end
 
-    def find_or_create_album(album)
-      unless @albums_hash[album.id]
-        @albums_hash[album.id] = album
-      end
-      album.artist.add_album(album)
-    end
 
 
-    def add_track_to_genre(track)
-      if @genres_hash[track.genre_name]
-        return @genres_hash[track.genre_name]
-      end
-        # message("Creating new artist #{artist.name}")
-      genre = AppleMusicLibrary::Genre.new(track.genre_name)
-      @genres_hash[track.genre_name] = genre
-      genre.add_track(track)
-      genre
-    end
+
+    # def track(track_id)
+    #   track = @tracks_hash[track_id.to_i]
+    #   if track.nil?
+    #     message("Cound not find track with ID [#{track_id}]")
+    #     message("Searched tracks: [#{@tracks_hash.keys.sort.join(', ')}]")
+    #   end
+    #   track
+    # end
+
+    # private
+
+    # def extract_plist_info
+    #   non_music_formats = {}
+    #   plist['Tracks'].each do |track|
+    #     if MUSIC_FORMATS.include?(track[1]['Kind'])
+    #       track = Track.new(track[1])
+    #       # next if track.artist.name == 'NPR'
+    #       @tracks_hash[track.id] = track
+    #       # @locations_hash[track.location] = track
+
+    #       artist = Artist.find_or_create(track.artist_name)
+    #       album = add_track_to_album(track, track.album)
+    #       artist.add_album(album)
+
+    #       if track.genre_name.present?
+    #         genre = add_track_to_genre(track)
+    #       end
+    #     else
+    #       non_music_formats[track[1]['Kind']] = true
+    #     end
+    #   end
+
+    #   plist['Playlists'].each do |playlist_info|
+    #     playlist = Playlist.new(playlist_info, self)
+    #     next if playlist.folder?
+    #     @playlists_hash[playlist.id] = playlist
+    #   end
+
+    #   if non_music_formats.any?
+    #     message("Skipped the following non-music formats:\n#{non_music_formats.keys.join(', ')}")
+    #   end
+    # end
+
+
+    # def add_artist(artist)      
+    #   Artist.find_or_create(artist_name)
+    # end
+
+    # def add_track_to_album(track, album)
+    #   unless album = @albums_hash[album.id]
+    #     @albums_hash[album.id] = album
+    #   end
+    #   album.add_track(track)
+    #   album
+    # end
+
+    # def find_or_create_album(album)
+    #   unless @albums_hash[album.id]
+    #     @albums_hash[album.id] = album
+    #   end
+    #   album.artist.add_album(album)
+    # end
+
+
+    # def add_track_to_genre(track)
+    #   if @genres_hash[track.genre_name]
+    #     return @genres_hash[track.genre_name]
+    #   end
+    #     # message("Creating new artist #{artist.name}")
+    #   genre = AppleMusicLibrary::Genre.new(track.genre_name)
+    #   @genres_hash[track.genre_name] = genre
+    #   genre.add_track(track)
+    #   genre
+    # end
 
   end
 

data/lib/apple_music_library/playlist.rb

@@ -19,6 +19,8 @@ module AppleMusicLibrary
 
     attr_reader :info, :tracks
 
+    @@playlists = {}
+
     ATTRIBUTES = ['Name',
                   'Description',
                   'Playlist ID',
@@ -31,10 +33,23 @@ module AppleMusicLibrary
 
     def initialize(info, library)
       @info = info
+
+      return nil if folder?
+
       @library = library
       @tracks = []
 
       load_tracks
+
+      @@playlists[id] = self
+    end
+
+    def self.all
+      @@playlists.values
+    end
+
+    def self.find_by_name(playlist_name)
+      @@playlists.values.select{|p| p.name == playlist_name}
     end
 
     def id

data/lib/apple_music_library/track.rb

@@ -2,13 +2,13 @@ require 'facets'
 
 module AppleMusicLibrary
   class Track
-    attr_reader :info, :artist, :album
+    attr_reader :artist, :album, :genre
 
-    ATTRIBUTES = ['Track ID', 
-                  'Name',
                   # 'Artist', The #artist, #album, and #genre methods return objects rather than strings and have methods like #artist_name to retrieve the strings.
                   # 'Album',
                   # 'Genre',
+    ATTRIBUTES = ['Track ID', 
+                  'Name',
                   'Kind',
                   'Size',
                   'Total Time',
@@ -31,10 +31,28 @@ module AppleMusicLibrary
                   'File Folder Count',
                   'Library Folder Count']
 
+    @@tracks = {}
+
     def initialize(info)
       @info = info
-      @artist = Artist.new(artist_name)
-      @album = Album.new(@artist, album_name)
+      @artist = Artist.find_or_create(artist_name)
+      @album = Album.find_or_create(@artist, album_name)
+      @genre = Genre.find_or_create(genre_name)
+
+      @artist.add_track(self)
+      @artist.add_album(@album)
+      @album.add_track(self)
+      @genre.add_track(self)
+      @@tracks[id] = self
+    end
+
+
+    def self.find(track_id)
+      @@tracks[track_id]
+    end
+
+    def self.all
+      @@tracks.values
     end
 
     def id
@@ -42,22 +60,21 @@ module AppleMusicLibrary
     end      
 
     def artist_name
-      info['Artist']
+      @info['Artist']
     end
 
     def album_name
-      info['Album']
+      @info['Album']
     end
 
     def genre_name
-      info['Genre']
+      @info['Genre']
     end
 
-    ATTRIBUTES.each do |attribute|
-      define_method(attribute.to_s.snakecase) do
-        info[attribute]
+    ATTRIBUTES.each do |track_attribute|
+      define_method(track_attribute.to_s.snakecase) do
+        @info[track_attribute]
       end
-
     end
 
     # def slug

data/lib/apple_music_library/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apple_music_library
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Todd Gehman