kagu 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0334dfd2cbbf21419dd63838d1f1c2ddf33799086aeb6c4f424f641fb848366
-  data.tar.gz: 9a20fd6dcb1014b70c1e5819ecda2d1134e69e69749269437a59685b67c2e451
+  metadata.gz: 7d63ebef06f4a301d40205bd5fb3968605c05a00d6c179839b87623eaea617c7
+  data.tar.gz: 00add6c458440f5e4b26a5141b22b602c9c5555cec62ceffb61b3c6e40977bef
 SHA512:
-  metadata.gz: f72d388cb967ea25ef360c378036956f3b7566c393614688733a1fd4316ed6b9f68928df97539df74f494e5ae2fcb5160e2a9bff60a6af0b9a0d8532cdb9d85d
-  data.tar.gz: 9f405adb7ed3da432c01d5466666326ac34de34bb796d3525699bf8cc93806c8fe60ad530ec849c85136bb67a6eca815ad089be09b0f2c8d486cc80e12aa7b2c
+  metadata.gz: 5e8a3186584bc2d4e29ce6fca5315c7a51bbdfe1af54207ff90544cca5eef14d14aeaa045690e41a14ffd597e4ea71fb3c0f0e1eddddbadc3613626e42d20d94
+  data.tar.gz: 70c013d695a15f25e853a6efe98d2f074c2de0001b9ab4e604e5baf9a1d51d6d813601517a0f9bc9ab3894a945261fd8f8bebcc033b5ec6801ae07e7f4c96487

data/VERSION

@@ -1 +1 @@
-2.0.2
+2.0.3

data/lib/kagu/playlist.rb

@@ -31,7 +31,7 @@ module Kagu
       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 "Music"
+          tell application #{Kagu::OSX_APP_NAME.inspect}
             set playlistToPush to user playlist #{name.inspect}
             set idsToAdd to {#{ids.join(',')}}
             repeat with idToAdd in idsToAdd
@@ -48,7 +48,7 @@ module Kagu
     def clear
       Kagu.logger.info('Kagu') { "Removing all tracks from playlist #{name.inspect}" }
       AppleScript.execute(%Q{
-        tell application "Music"
+        tell application #{Kagu::OSX_APP_NAME.inspect}
           delete tracks of playlist #{name.inspect}
         end tell
       })
@@ -60,7 +60,7 @@ module Kagu
     def create
       Kagu.logger.info('Kagu') { "Creating playlist #{name.inspect}" }
       AppleScript.execute(%Q{
-        tell application "Music"
+        tell application #{Kagu::OSX_APP_NAME.inspect}
           if not (exists user playlist #{name.inspect}) then
             make new user playlist with properties { name: #{name.inspect} }
           end if

data/lib/kagu/track.rb

@@ -6,7 +6,6 @@ module Kagu
     include Comparable
 
     MANDATORY_ATTRIBUTES = %w(added_at id length path)
-    IS_MAC_OS = RUBY_PLATFORM =~ /darwin/
 
     attr_reader :added_at, :album, :artist, :bpm, :genre, :id, :length, :path, :title, :year
 
@@ -110,7 +109,7 @@ module Kagu
 
     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
+      path = path.encode('UTF-8', 'UTF-8-MAC') if Kagu::IS_MAC_OS
       self.path = path
     end
 

data/lib/kagu.rb

@@ -9,6 +9,15 @@ lib_path = "#{__dir__}/kagu"
 
 module Kagu
 
+  IS_MAC_OS = RUBY_PLATFORM =~ /darwin/
+  OSX_APP_NAME = begin
+    if IS_MAC_OS
+      `sw_vers -productVersion`.chomp.to_f >= 10.15 ? 'Music' : 'iTunes'
+    else
+      nil
+    end
+  end
+
   mattr_accessor :logger, instance_writer: false, instance_reader: false
   self.logger = Logger.new(nil)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kagu
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Alexis Toulotte