kagu 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5554a2cdae2643810de486c520ab8be37349942aeaafc133f701b464fec48539
-  data.tar.gz: 15743bbb99e062c49d05cb0b3de1f61d5cbd29d59b5b82ef0bc5493ccf2af9b3
+  metadata.gz: a0334dfd2cbbf21419dd63838d1f1c2ddf33799086aeb6c4f424f641fb848366
+  data.tar.gz: 9a20fd6dcb1014b70c1e5819ecda2d1134e69e69749269437a59685b67c2e451
 SHA512:
-  metadata.gz: 5b656afcc5b0df1adf19e3b31072c1afb37ef3ff508389c3888b03c4a65ccd98a9475db17c3e8b26e9b1240b65e54d02e156bb61a183643a1ca8745bda9e4ada
-  data.tar.gz: fe0de589becaab538524f5dc9c0d21566478819c46ccdebcae9a7d75660ec387901dc661e756e09d9e749f2e247598a5495bf9ffc8d2551e058fef6470b579b1
+  metadata.gz: f72d388cb967ea25ef360c378036956f3b7566c393614688733a1fd4316ed6b9f68928df97539df74f494e5ae2fcb5160e2a9bff60a6af0b9a0d8532cdb9d85d
+  data.tar.gz: 9f405adb7ed3da432c01d5466666326ac34de34bb796d3525699bf8cc93806c8fe60ad530ec849c85136bb67a6eca815ad089be09b0f2c8d486cc80e12aa7b2c

data/README.mdown

@@ -1,6 +1,11 @@
 # Kagu
 
-Ruby API to manage iTunes tracks and playlists.
+Ruby API to manage macOS Music tracks and playlists.
+
+**Important note for macOS Catalina (10.15) users**: Apple dropped automatic
+XML library export you need to manually export your XML library to
+`$HOME/Music/iTunes/iTunes Music Library.xml` path to make `kagu` work
+properly.
 
 ## Installation
 

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/kagu.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
   s.author = 'Alexis Toulotte'
   s.email = 'al@alweb.org'
   s.homepage = 'https://github.com/alexistoulotte/kagu'
-  s.summary = 'API for iTunes'
-  s.description = 'API to manage iTunes tracks and playlists'
+  s.summary = 'API for macOS Music'
+  s.description = 'API to manage macOS Music tracks and playlists'
   s.license = 'MIT'
 
   s.files = `git ls-files | grep -vE '^(spec/|test/|\\.|Gemfile|Rakefile)'`.split("\n")

data/lib/kagu/finder.rb

@@ -116,7 +116,7 @@ module Kagu
     def tracks
       return @tracks if @tracks
       (@tracks = library.tracks.to_a).tap do |tracks|
-        Kagu.logger.debug('Kagu') { "Loaded #{tracks.size} track(s) from iTunes library" }
+        Kagu.logger.debug('Kagu') { "Loaded #{tracks.size} track(s) from library" }
       end
     end
 

data/lib/kagu/playlist.rb

@@ -28,10 +28,10 @@ module Kagu
     private
 
     def add_tracks
-      Kagu.logger.info('Kagu') { "Adding #{tracks.size} track(s) to iTunes playlist #{name.inspect}" }
+      Kagu.logger.info('Kagu') { "Adding #{tracks.size} track(s) to playlist #{name.inspect}" }
       tracks.map(&:id).each_slice(500) do |ids|
         AppleScript.execute(%Q{
-          tell application "iTunes"
+          tell application "Music"
             set playlistToPush to user playlist #{name.inspect}
             set idsToAdd to {#{ids.join(',')}}
             repeat with idToAdd in idsToAdd
@@ -46,9 +46,9 @@ module Kagu
     end
 
     def clear
-      Kagu.logger.info('Kagu') { "Removing all tracks from iTunes playlist #{name.inspect}" }
+      Kagu.logger.info('Kagu') { "Removing all tracks from playlist #{name.inspect}" }
       AppleScript.execute(%Q{
-        tell application "iTunes"
+        tell application "Music"
           delete tracks of playlist #{name.inspect}
         end tell
       })
@@ -58,9 +58,9 @@ module Kagu
     end
 
     def create
-      Kagu.logger.info('Kagu') { "Creating iTunes playlist #{name.inspect}" }
+      Kagu.logger.info('Kagu') { "Creating playlist #{name.inspect}" }
       AppleScript.execute(%Q{
-        tell application "iTunes"
+        tell application "Music"
           if not (exists user playlist #{name.inspect}) then
             make new user playlist with properties { name: #{name.inspect} }
           end if
@@ -71,11 +71,6 @@ module Kagu
       raise Error.new(e)
     end
 
-    def itunes_name=(value)
-      @@html_entities ||= HTMLEntities.new
-      self.name = @@html_entities.decode(value)
-    end
-
     def name=(value)
       @name = value.to_s.squish.presence
     end
@@ -84,6 +79,11 @@ module Kagu
       @tracks = [values].flatten.select { |value| value.is_a?(Track) }
     end
 
+    def xml_name=(value)
+      @@html_entities ||= HTMLEntities.new
+      self.name = @@html_entities.decode(value)
+    end
+
   end
 
 end

data/lib/kagu/playlists.rb

@@ -24,7 +24,7 @@ module Kagu
       tracks = {}.tap do |tracks|
         library.tracks.each { |track| tracks[track.id] = track }
       end
-      Kagu.logger.debug('Kagu') { "Reading iTunes library playlists from #{library.path.inspect}" }
+      Kagu.logger.debug('Kagu') { "Reading library playlists from #{library.path.inspect}" }
       File.open(library.path, 'r') do |file|
         begin
           line = file.readline.strip
@@ -39,7 +39,7 @@ module Kagu
             next
           end
           if line == '</array>'
-            yield(Playlist.new(itunes_name: playlist_name, tracks: playlist_tracks)) if playlist_name.present? && playlist_tracks.any?
+            yield(Playlist.new(tracks: playlist_tracks, xml_name: playlist_name)) if playlist_name.present? && playlist_tracks.any?
             playlist_name = nil
             playlist_tracks = []
             next

data/lib/kagu/track.rb

@@ -74,62 +74,62 @@ module Kagu
       @id = value.to_s =~ /\A[0-9]+\z/ ? value.to_i : nil
     end
 
-    def itunes_album=(value)
+    def length=(value)
+      @length = value.to_s =~ /\A[0-9]+\z/ ? value.to_i : nil
+    end
+
+    def path=(value)
+      @path = value.to_s.presence
+      raise Error.new("No such file: #{path.inspect}") if File.exists?(path) && !exists?
+      Kagu.logger.error('Kagu') { "No such track: #{path.inspect}" } unless exists?
+    end
+
+    def title=(value)
+      @title = value.to_s.squish.presence
+    end
+
+    def xml_album=(value)
       self.album = html_entities_decode(value)
     end
 
-    def itunes_artist=(value)
+    def xml_artist=(value)
       self.artist = html_entities_decode(value)
     end
 
-    def itunes_bpm=(value)
+    def xml_bpm=(value)
       self.bpm = value
     end
 
-    def itunes_date_added=(value)
+    def xml_date_added=(value)
       self.added_at = value.present? ? Time.parse(value.to_s) : nil
     end
 
-    def itunes_genre=(value)
+    def xml_genre=(value)
       self.genre = html_entities_decode(value)
     end
 
-    def itunes_location=(value)
+    def xml_location=(value)
       path = CGI.unescape(html_entities_decode(value).gsub('+', '%2B')).gsub(/\Afile:\/\/(localhost)?/, '')
       path = path.encode('UTF-8', 'UTF-8-MAC') if IS_MAC_OS
       self.path = path
     end
 
-    def itunes_name=(value)
+    def xml_name=(value)
       self.title = html_entities_decode(value)
     end
 
-    def itunes_total_time=(value)
+    def xml_total_time=(value)
       self.length = value.to_s =~ /\A[0-9]+\z/ ? (value.to_i / 1000.0).round : nil
     end
 
-    def itunes_track_id=(value)
+    def xml_track_id=(value)
       self.id = value
     end
 
-    def itunes_year=(value)
+    def xml_year=(value)
       self.year = value
     end
 
-    def length=(value)
-      @length = value.to_s =~ /\A[0-9]+\z/ ? value.to_i : nil
-    end
-
-    def path=(value)
-      @path = value.to_s.presence
-      raise Error.new("No such file: #{path.inspect}") if File.exists?(path) && !exists?
-      Kagu.logger.error('Kagu') { "No such iTunes track: #{path.inspect}" } unless exists?
-    end
-
-    def title=(value)
-      @title = value.to_s.squish.presence
-    end
-
     def year=(value)
       @year = value.to_s =~ /\A\d{,4}\z/ ? value.to_i : nil
     end

data/lib/kagu/tracks.rb

@@ -15,7 +15,7 @@ module Kagu
 
     def each(&block)
       return unless block_given?
-      Kagu.logger.debug('Kagu') { "Loading iTunes library tracks from #{library.path.inspect}" }
+      Kagu.logger.debug('Kagu') { "Loading library tracks from #{library.path.inspect}" }
       File.open(library.path, 'r') do |file|
         while !file.eof? && (line = file.readline.strip)
           next unless line.starts_with?('<key>Track ID</key>')
@@ -23,11 +23,11 @@ module Kagu
           begin
             match = line.match(/<key>(.+)<\/key><(\w+)>(.*)<\/\2>/)
             next unless match
-            name = "itunes_#{match[1].downcase.gsub(' ', '_')}"
+            name = "xml_#{match[1].downcase.gsub(' ', '_')}"
             value = match[3]
             attributes[name] = value
           end while (line = file.readline.strip) != '</dict>'
-          yield(Track.new(attributes)) if attributes['itunes_track_type'] == 'File' && attributes['itunes_podcast'].blank? && EXTENSIONS.include?(File.extname(attributes['itunes_location'].try(:downcase)))
+          yield(Track.new(attributes)) if attributes['xml_track_type'] == 'File' && attributes['xml_podcast'].blank? && EXTENSIONS.include?(File.extname(attributes['xml_location'].try(:downcase)))
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kagu
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Alexis Toulotte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2019-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -130,7 +130,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.8.0
-description: API to manage iTunes tracks and playlists
+description: API to manage macOS Music tracks and playlists
 email: al@alweb.org
 executables: []
 extensions: []
@@ -168,9 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: API for iTunes
+summary: API for macOS Music
 test_files: []