kagu 2.0.3 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d63ebef06f4a301d40205bd5fb3968605c05a00d6c179839b87623eaea617c7
-  data.tar.gz: 00add6c458440f5e4b26a5141b22b602c9c5555cec62ceffb61b3c6e40977bef
+  metadata.gz: 525d281da8b729c56214956d8fe81f699b105331c15e86976f65ffc983a0b2ea
+  data.tar.gz: 9a5200a627a5a6224f0f1d2a6972f9262515a1957ca33e60eebdac20be4303a7
 SHA512:
-  metadata.gz: 5e8a3186584bc2d4e29ce6fca5315c7a51bbdfe1af54207ff90544cca5eef14d14aeaa045690e41a14ffd597e4ea71fb3c0f0e1eddddbadc3613626e42d20d94
-  data.tar.gz: 70c013d695a15f25e853a6efe98d2f074c2de0001b9ab4e604e5baf9a1d51d6d813601517a0f9bc9ab3894a945261fd8f8bebcc033b5ec6801ae07e7f4c96487
+  metadata.gz: d54df53f2489cd5d5f6f734c994c89f03ee0fe5c8834547272f8cda4d5b206f6266b9a7474a72be5f734eeae9d0095969762cb5d042b1f600946de9260628670
+  data.tar.gz: 928913d1a8454a838ba48fc1c8bfecc992057276de00d22b904864859f66c70db3bf1bf5f2e1028600bacb21e18c5c21f850a7e18efd75fc7f52db41f7260706

data/VERSION

@@ -1 +1 @@
-2.0.3
+3.0.0

data/kagu.gemspec

@@ -15,11 +15,10 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.0.0'
 
-  s.add_dependency 'activesupport', '>= 4.1.0', '< 6.0.0'
+  s.add_dependency 'activesupport', '>= 4.1.0', '< 7.0.0'
   s.add_dependency 'applescript', '>= 1.0', '< 2.0'
-  s.add_dependency 'htmlentities', '>= 4.3.0', '< 4.4.0'
 
-  s.add_development_dependency 'byebug', '>= 3.2.0', '< 10.0.0'
-  s.add_development_dependency 'rake', '>= 10.3.0', '< 13.0.0'
-  s.add_development_dependency 'rspec', '>= 3.1.0', '< 3.8.0'
+  s.add_development_dependency 'byebug', '>= 3.2.0', '< 12.0.0'
+  s.add_development_dependency 'rake', '>= 10.3.0', '< 14.0.0'
+  s.add_development_dependency 'rspec', '>= 3.1.0', '< 3.10.0'
 end

data/lib/kagu/finder.rb

@@ -4,8 +4,6 @@ module Kagu
 
     MANDATORY_ATTRIBUTES = []
 
-    attr_reader :library
-
     delegate :replace, :transliterate, to: 'self.class'
 
     def self.replace(value, replacements = {})
@@ -20,9 +18,7 @@ module Kagu
       ActiveSupport::Inflector.transliterate(value.to_s).squish.downcase.presence
     end
 
-    def initialize(library, options = {})
-      raise ArgumentError.new("#{self.class}#library must be a library, #{library.inspect} given") unless library.is_a?(Library)
-      @library = library
+    def initialize(options = {})
       reload(options)
     end
 
@@ -115,7 +111,7 @@ module Kagu
 
     def tracks
       return @tracks if @tracks
-      (@tracks = library.tracks.to_a).tap do |tracks|
+      (@tracks = Tracks.new.to_a).tap do |tracks|
         Kagu.logger.debug('Kagu') { "Loaded #{tracks.size} track(s) from library" }
       end
     end

data/lib/kagu/library.rb

@@ -2,31 +2,16 @@ module Kagu
 
   class Library
 
-    PATH = File.expand_path("#{ENV['HOME']}/Music/iTunes/iTunes Music Library.xml")
-
-    attr_reader :path
-
-    def initialize(path = PATH)
-      self.path = path
-    end
-
     def finder(options = {})
-      Finder.new(self, options)
+      Finder.new(options)
     end
 
     def playlists
-      Playlists.new(self)
+      Playlists.new
     end
 
     def tracks
-      Tracks.new(self)
-    end
-
-    private
-
-    def path=(path)
-      raise Error.new("No such file: #{path.inspect}") unless File.file?(path)
-      @path = path
+      Tracks.new
     end
 
   end

data/lib/kagu/playlist.rb

@@ -28,15 +28,16 @@ module Kagu
     private
 
     def add_tracks
+      return if tracks.empty?
       Kagu.logger.info('Kagu') { "Adding #{tracks.size} track(s) to playlist #{name.inspect}" }
-      tracks.map(&:id).each_slice(500) do |ids|
+      Dir.mktmpdir do |directory|
+        path = "#{directory}/#{name}.m3u"
+        File.open(path, 'w') do |io|
+          tracks.each { |track| io << "file://#{URI.escape(track.path.to_s)}\n" }
+        end
         AppleScript.execute(%Q{
           tell application #{Kagu::OSX_APP_NAME.inspect}
-            set playlistToPush to user playlist #{name.inspect}
-            set idsToAdd to {#{ids.join(',')}}
-            repeat with idToAdd in idsToAdd
-              duplicate (tracks of library playlist 1 whose database ID is idToAdd) to playlistToPush
-            end repeat
+            open #{path.inspect}
           end tell
         })
       end
@@ -79,11 +80,6 @@ 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

@@ -4,13 +4,6 @@ module Kagu
 
     include Enumerable
 
-    attr_reader :library
-
-    def initialize(library)
-      raise ArgumentError.new("#{self.class}#library must be a library, #{library.inspect} given") unless library.is_a?(Library)
-      @library = library
-    end
-
     def build(attributes = {})
       Playlist.new(attributes)
     end
@@ -21,42 +14,34 @@ module Kagu
 
     def each(&block)
       return unless block_given?
+      Kagu.logger.debug('Kagu') { 'Loading library playlists' }
       tracks = {}.tap do |tracks|
-        library.tracks.each { |track| tracks[track.id] = track }
+        Tracks.new.each { |track| tracks[track.id] = track }
       end
-      Kagu.logger.debug('Kagu') { "Reading library playlists from #{library.path.inspect}" }
-      File.open(library.path, 'r') do |file|
-        begin
-          line = file.readline.strip
-        end while !line.starts_with?('<key>Playlists</key>')
-        playlist_name = nil
-        playlist_tracks = []
-        skip_next = false
-        while !file.eof? && (line = file.readline.strip)
-          if line == '<key>Master</key><true/>'
-            playlist_name = nil
-            skip_next = true
-            next
-          end
-          if line == '</array>'
-            yield(Playlist.new(tracks: playlist_tracks, xml_name: playlist_name)) if playlist_name.present? && playlist_tracks.any?
-            playlist_name = nil
-            playlist_tracks = []
-            next
-          end
-          match = line.match(/<key>(.+)<\/key><(\w+)>(.*)<\/\2>/)
-          next unless match
-          name = match[1]
-          value = match[3]
-          if name == 'Name'
-            if skip_next
-              skip_next = false
-            else
-              playlist_name = value
-            end
-          elsif name == 'Track ID'
-            playlist_tracks << tracks[value.to_i]
-          end
+      playlist_name = nil
+      playlist_tracks = []
+      SwiftHelper.execute(%Q{
+        import iTunesLibrary
+
+        let library = try! ITLibrary(apiVersion: "1")
+        for playlist in library.allPlaylists.filter({ !$0.isMaster }) {
+          print("BEGIN_PLAYLIST")
+          print(playlist.name)
+          for track in playlist.items.filter({ $0.mediaKind == ITLibMediaItemMediaKind.kindSong }) {
+            print(String(format: "%02X", track.persistentID.intValue))
+          }
+          print("END_PLAYLIST")
+        }
+      }) do |line|
+        if line == 'BEGIN_PLAYLIST'
+          playlist_name = nil
+          playlist_tracks = []
+        elsif line == 'END_PLAYLIST'
+          yield(Playlist.new(name: playlist_name, tracks: playlist_tracks)) if playlist_name.present?
+        elsif playlist_name.nil?
+          playlist_name = line
+        else
+          playlist_tracks << tracks[line]
         end
       end
     end

data/lib/kagu/swift_helper.rb

@@ -0,0 +1,28 @@
+module Kagu
+
+  module SwiftHelper
+
+    def self.execute(code, &block)
+      tempfile = Tempfile.new
+      begin
+        tempfile << code
+      ensure
+        tempfile.close
+      end
+      begin
+        stdout, stderr, result = Open3.capture3("swift #{tempfile.path.inspect}")
+        raise(stderr.presence || "Swift command returned with code: #{result.exitstatus}") unless result.success?
+        if block_given?
+          stdout.lines.each { |line| yield(line.chomp) }
+          nil
+        else
+          stdout
+        end
+      ensure
+        tempfile.unlink
+      end
+    end
+
+  end
+
+end

data/lib/kagu/track.rb

@@ -9,10 +9,6 @@ module Kagu
 
     attr_reader :added_at, :album, :artist, :bpm, :genre, :id, :length, :path, :title, :year
 
-    def initialize(attributes = {})
-      super
-    end
-
     def <=>(other)
       return nil unless other.is_a?(self.class)
       length <=> other.length
@@ -27,7 +23,7 @@ module Kagu
     end
 
     def exists?
-      File.file?(path)
+      path.file?
     end
 
     def hash
@@ -35,7 +31,8 @@ module Kagu
     end
 
     def relative_path(directory)
-      directory.present? && directory.starts_with?(directory) ? path.gsub(/\A#{Regexp.escape(directory)}\//, '') : path
+      directory = directory.to_s
+      directory.present? ? Pathname.new(path.to_s.gsub(/\A#{Regexp.escape(directory)}\//, '')) : path
     end
 
     def to_s
@@ -45,6 +42,11 @@ module Kagu
     private
 
     def added_at=(value)
+      if value.is_a?(String)
+        value = Time.parse(value)
+      elsif value.is_a?(Integer)
+        value = Time.at(value)
+      end
       @added_at = value.is_a?(Time) ? value.utc : nil
     end
 
@@ -64,13 +66,8 @@ module Kagu
       @genre = value.to_s.squish.presence
     end
 
-    def html_entities_decode(value)
-      @@html_entities ||= HTMLEntities.new
-      @@html_entities.decode(value.to_s)
-    end
-
     def id=(value)
-      @id = value.to_s =~ /\A[0-9]+\z/ ? value.to_i : nil
+      @id = value.to_s.presence
     end
 
     def length=(value)
@@ -78,8 +75,11 @@ module Kagu
     end
 
     def path=(value)
-      @path = value.to_s.presence
-      raise Error.new("No such file: #{path.inspect}") if File.exists?(path) && !exists?
+      value = value.to_s.presence
+      value = URI.unescape(URI.parse(value).path) if value.is_a?(String) && value.starts_with?('file://')
+      value = value.encode('UTF-8', 'UTF-8-MAC') if Kagu::IS_MAC_OS
+      @path = Pathname.new(value)
+      raise Error.new("No such file: #{path.to_s.inspect}") if path.exist? && !exists?
       Kagu.logger.error('Kagu') { "No such track: #{path.inspect}" } unless exists?
     end
 
@@ -87,48 +87,6 @@ module Kagu
       @title = value.to_s.squish.presence
     end
 
-    def xml_album=(value)
-      self.album = html_entities_decode(value)
-    end
-
-    def xml_artist=(value)
-      self.artist = html_entities_decode(value)
-    end
-
-    def xml_bpm=(value)
-      self.bpm = value
-    end
-
-    def xml_date_added=(value)
-      self.added_at = value.present? ? Time.parse(value.to_s) : nil
-    end
-
-    def xml_genre=(value)
-      self.genre = html_entities_decode(value)
-    end
-
-    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 Kagu::IS_MAC_OS
-      self.path = path
-    end
-
-    def xml_name=(value)
-      self.title = html_entities_decode(value)
-    end
-
-    def xml_total_time=(value)
-      self.length = value.to_s =~ /\A[0-9]+\z/ ? (value.to_i / 1000.0).round : nil
-    end
-
-    def xml_track_id=(value)
-      self.id = value
-    end
-
-    def xml_year=(value)
-      self.year = value
-    end
-
     def year=(value)
       @year = value.to_s =~ /\A\d{,4}\z/ ? value.to_i : nil
     end

data/lib/kagu/tracks.rb

@@ -6,28 +6,42 @@ module Kagu
 
     EXTENSIONS = %w(.aac .flac .mp3 .wav).freeze
 
-    attr_reader :library
-
-    def initialize(library)
-      raise ArgumentError.new("#{self.class}#library must be a library, #{library.inspect} given") unless library.is_a?(Library)
-      @library = library
-    end
-
     def each(&block)
       return unless block_given?
-      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>')
+      Kagu.logger.debug('Kagu') { 'Loading library tracks' }
+      attributes = {}
+      SwiftHelper.execute(%Q{
+        import iTunesLibrary
+
+        func printObjectProperty<T: Encodable>(name: String, value: T?) {
+          let jsonEncoder = JSONEncoder()
+          let jsonData = try! jsonEncoder.encode(value)
+          let json = String(data: jsonData, encoding: String.Encoding.utf8)
+          print("\\(name)=\\(json!)")
+        }
+
+        let library = try! ITLibrary(apiVersion: "1")
+        for track in library.allMediaItems.filter({ $0.mediaKind == ITLibMediaItemMediaKind.kindSong }) {
+          print("BEGIN_TRACK")
+          printObjectProperty(name: "added_at", value: track.addedDate!.timeIntervalSince1970)
+          printObjectProperty(name: "album", value: track.album.title)
+          printObjectProperty(name: "artist", value: track.artist!.name)
+          printObjectProperty(name: "bpm", value: track.beatsPerMinute)
+          printObjectProperty(name: "genre", value: track.genre)
+          printObjectProperty(name: "id", value: String(track.persistentID.uint64Value, radix: 16).uppercased())
+          printObjectProperty(name: "length", value: track.totalTime)
+          printObjectProperty(name: "path", value: track.location)
+          printObjectProperty(name: "title", value: track.title)
+          printObjectProperty(name: "year", value: track.year)
+          print("END_TRACK")
+        }
+      }) do |line|
+        if line == 'BEGIN_TRACK'
           attributes = {}
-          begin
-            match = line.match(/<key>(.+)<\/key><(\w+)>(.*)<\/\2>/)
-            next unless match
-            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['xml_track_type'] == 'File' && attributes['xml_podcast'].blank? && EXTENSIONS.include?(File.extname(attributes['xml_location'].try(:downcase)))
+        elsif line == 'END_TRACK'
+          yield(Track.new(attributes))
+        elsif match = /(^\w+)=(.*)/.match(line)
+          attributes[match[1]] = JSON.parse(match[2])
         end
       end
     end

data/lib/kagu.rb

@@ -2,8 +2,10 @@ require 'active_support'
 require 'active_support/core_ext'
 require 'applescript'
 require 'byebug' if ENV['DEBUGGER']
-require 'htmlentities'
 require 'logger'
+require 'open3'
+require 'pathname'
+require 'tempfile'
 
 lib_path = "#{__dir__}/kagu"
 
@@ -29,5 +31,6 @@ require "#{lib_path}/finder"
 require "#{lib_path}/library"
 require "#{lib_path}/playlist"
 require "#{lib_path}/playlists"
+require "#{lib_path}/swift_helper"
 require "#{lib_path}/track"
 require "#{lib_path}/tracks"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kagu
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 3.0.0
 platform: ruby
 authors:
 - Alexis Toulotte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-09 00:00:00.000000000 Z
+date: 2019-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
         version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: applescript
   requirement: !ruby/object:Gem::Requirement
@@ -50,26 +50,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: htmlentities
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.3.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 4.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.3.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +59,7 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: 12.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -89,7 +69,7 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: 12.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -99,7 +79,7 @@ dependencies:
         version: 10.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 13.0.0
+        version: 14.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -109,7 +89,7 @@ dependencies:
         version: 10.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 13.0.0
+        version: 14.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +99,7 @@ dependencies:
         version: 3.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -129,7 +109,7 @@ dependencies:
         version: 3.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.10.0
 description: API to manage macOS Music tracks and playlists
 email: al@alweb.org
 executables: []
@@ -147,6 +127,7 @@ files:
 - lib/kagu/library.rb
 - lib/kagu/playlist.rb
 - lib/kagu/playlists.rb
+- lib/kagu/swift_helper.rb
 - lib/kagu/track.rb
 - lib/kagu/tracks.rb
 homepage: https://github.com/alexistoulotte/kagu