Merge branch 'release/1.2.3'

MainasuK · Oct 29, 2019 · 648b145 · 648b145
2 parents f89482d + 462e76f
commit 648b145
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 14 deletions.
diff --git a/Podfile.lock b/Podfile.lock
@@ -7,7 +7,7 @@ DEPENDENCIES:
   - MASShortcut
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  https://github.com/CocoaPods/Specs.git:
     - MASShortcut
 
 EXTERNAL SOURCES:
@@ -25,4 +25,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 22990987400160704799d9a65bb9be8983c907a2
 
-COCOAPODS: 1.7.3
+COCOAPODS: 1.8.4
diff --git a/Press/Automation.png b/Press/Automation.png
diff --git a/README.md b/README.md
@@ -14,3 +14,7 @@ macOS app for rating music in iTunes/Music.app
 ## FAQ
 ### How can I check the track rating in iTunes/Music.app?  
 Check the checkbox for "Star Ratings" in General preferences. [More info](https://support.apple.com/guide/music/general-preferences-mus4130f48/mac)
+
+### Why Song Rating not show star rating when iTunes/Music playing?
+Please check the Security & Privacy settings and check the checkbox of Song Rating.
+![Automation](./Press/Automation.png)
diff --git a/Song Rating.xcodeproj/project.pbxproj b/Song Rating.xcodeproj/project.pbxproj
@@ -768,15 +768,15 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_TEAM = A8K92XFF77;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "Song Rating/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mainasuk.Song-Rating";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -796,15 +796,15 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_TEAM = A8K92XFF77;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "Song Rating/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mainasuk.Song-Rating";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/Song Rating.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist b/Song Rating.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
 		<key>Song Rating - Debug Memory.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>0</integer>
 		</dict>
 		<key>Song Rating Helper.xcscheme_^#shared#^_</key>
 		<dict>
@@ -17,7 +17,7 @@
 		<key>Song Rating.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>1</integer>
 		</dict>
 		<key>iTunesBridge.xcscheme_^#shared#^_</key>
 		<dict>

diff --git a/Song Rating/iTunes/iTunesPlayerHistory.swift b/Song Rating/iTunes/iTunesPlayerHistory.swift
@@ -35,10 +35,12 @@ extension iTunesPlayerHistory {
         _tracks = _tracks.suffix(limit)
 
         os_log("%{public}s[%{public}ld], %{public}s: playback history append track: %{public}s", ((#file as NSString).lastPathComponent), #line, #function, track.name ?? "null")
-
+
+        /*
         for track in tracks {
-            // print(track.name, track.databaseID)
+            print(track.name, track.databaseID)
         }
+         */
     }
 
 }

diff --git a/Song Rating/iTunes/iTunesRadioStation.swift b/Song Rating/iTunes/iTunesRadioStation.swift
@@ -22,14 +22,18 @@ final class iTunesRadioStation {
 
     // MARK: - Singleton
     static let shared = iTunesRadioStation()
+
+    private lazy var _iTunes: iTunesApplication? = {
+        let application = SBApplication(bundleIdentifier: OSVersionHelper.bundleIdentifier)
+        application?.delegate = self
+        return application
+    }()
 
     var iTunes: iTunesApplication? {
-        let application = SBApplication(bundleIdentifier: OSVersionHelper.bundleIdentifier)
-        guard application?.isRunning == true else {
+        guard _iTunes?.isRunning == true else {
             return nil
         }
-        application?.delegate = self
-        return application
+        return _iTunes
     }
 
     private(set) var latestPlayInfo: PlayInfo? {