kagu 3.0.6 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4e99368adaa97b1dc53ed962f73aaa70fb9215f63d19cd0d7d064723814877f
-  data.tar.gz: 7bed18a725c323edcde770be5f49cf1113d0b90d95a6fdd356bb274cf05923d5
+  metadata.gz: 5358df20144489a5d2c8a49fec5716a2078046631b9c43e52b6ecf3265cec875
+  data.tar.gz: 6cce3b0f9f8c8d32bfdd6eeb0615a0cfc6402201c0f977db4ee2007fc0b4a761
 SHA512:
-  metadata.gz: 4348fc1cfcba406c528d8719eec7b0147bd3fd82d8b19472d5b786a06ac0ba14fc1a3d73193a6cea95cefb7323c8a175d94a35d36dfe2782b1349e33441c0833
-  data.tar.gz: 509cc114a1c0087d5df86195cdb868cac1ed4d2ec83ea53a3d25fdb9defe5990e16c478712d7eade5fe279c11799671a961b65cfc906085ceffea43c7cee7232
+  metadata.gz: 7fd8f9d7221dde8a0fb25ab993e4dd97cc127fa003ee385ed7133dccee2f6ec84ccd2a93e60aac15dc2d79ee8f044a3c11bbcca7914a4a0e245a9ae278f75cec
+  data.tar.gz: c1f3fbfb7413b0aa9de63931f6a71fcaf454e47bfd918dd12c74cfbad2df03033c499d6754fae82f32025ed9d60ed69878421cc6d53e54a837f1cdb29dc55481

data/VERSION

@@ -1 +1 @@
-3.0.6
+3.1.0

data/lib/kagu/attributes_initializer.rb

@@ -7,7 +7,7 @@ module Kagu
         send("#{name}=", value) if respond_to?("#{name}=", true)
       end
       self.class.const_get(:MANDATORY_ATTRIBUTES).each do |attribute|
-        raise Error.new("#{self.class}##{attribute} is mandatory") if send(attribute).nil?
+        raise Error.new("#{self.class}##{attribute} is mandatory for #{inspect}") if send(attribute).nil?
       end
     end
 

data/lib/kagu/playlists.rb

@@ -28,11 +28,11 @@ module Kagu
           print("BEGIN_PLAYLIST")
           print(playlist.name)
           for track in playlist.items.filter({ $0.mediaKind == ITLibMediaItemMediaKind.kindSong }) {
-            print(String(format: "%02X", track.persistentID.intValue))
+            print(String(track.persistentID.uint64Value, radix: 16).uppercased())
           }
           print("END_PLAYLIST")
         }
-      }) do |line|
+      }).each do |line|
         if line == 'BEGIN_PLAYLIST'
           playlist_name = nil
           playlist_tracks = []
@@ -44,6 +44,7 @@ module Kagu
           playlist_tracks << tracks[line]
         end
       end
+      nil
     end
 
   end

data/lib/kagu/swift_helper.rb

@@ -2,7 +2,7 @@ module Kagu
 
   module SwiftHelper
 
-    def self.execute(code, &block)
+    def self.execute(code)
       tempfile = Tempfile.new
       begin
         tempfile << code
@@ -12,12 +12,7 @@ module Kagu
       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
+        stdout.lines.map(&:chomp)
       ensure
         tempfile.unlink
       end

data/lib/kagu/track.rb

@@ -5,7 +5,7 @@ module Kagu
     include AttributesInitializer
     include Comparable
 
-    MANDATORY_ATTRIBUTES = %w(added_at id length path)
+    MANDATORY_ATTRIBUTES = %w(added_at id length)
 
     attr_reader :added_at, :album, :artist, :bpm, :genre, :id, :length, :path, :title, :year
 
@@ -22,19 +22,14 @@ module Kagu
       super || self == other
     end
 
-    def exists?
-      path.file?
+    def exists_on_disk?
+      path.present? && path.file?
     end
 
     def hash
       [artist, title].hash
     end
 
-    def relative_path(directory)
-      directory = directory.to_s
-      directory.present? ? Pathname.new(path.to_s.gsub(/\A#{Regexp.escape(directory)}\//, '')) : path
-    end
-
     def to_s
       "#{artist} - #{title}"
     end
@@ -59,7 +54,8 @@ module Kagu
     end
 
     def bpm=(value)
-      @bpm = value.to_s =~ /\A[0-9]+\z/ ? value.to_i : nil
+      value = value.to_s =~ /\A[0-9]+\z/ ? value.to_i : nil
+      @bpm = (value && value > 0) ? value : nil
     end
 
     def genre=(value)
@@ -76,11 +72,9 @@ module Kagu
 
     def path=(value)
       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?
+      value = URI.unescape(URI.parse(value).path).presence if value.is_a?(String) && value.starts_with?('file://')
+      value = value.encode('UTF-8', 'UTF-8-MAC') if value.present? && Kagu::IS_MAC_OS
+      @path = value.present? ? Pathname.new(value) : nil
     end
 
     def title=(value)

data/lib/kagu/tracks.rb

@@ -35,7 +35,7 @@ module Kagu
           printObjectProperty(name: "year", value: track.year)
           print("END_TRACK")
         }
-      }) do |line|
+      }).each do |line|
         if line == 'BEGIN_TRACK'
           attributes = {}
         elsif line == 'END_TRACK'
@@ -44,6 +44,7 @@ module Kagu
           attributes[match[1]] = JSON.parse(match[2])
         end
       end
+      nil
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kagu
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.1.0
 platform: ruby
 authors:
 - Alexis Toulotte
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-06 00:00:00.000000000 Z
+date: 2020-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -134,7 +134,7 @@ homepage: https://github.com/alexistoulotte/kagu
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: API for macOS Music
 test_files: []