Merge branch 'develop'

xjbeta · Aug 10, 2024 · 717d996 · 717d996
2 parents 9f3e43c + e36ae88
commit 717d996
Show file tree

Hide file tree

Showing 25 changed files with 865 additions and 511 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,7 +27,7 @@ jobs:
           mkdir Sparkle
           tar -xf Sparkle*.tar.xz -C Sparkle
 
-      - uses: apple-actions/import-codesign-certs@v2
+      - uses: apple-actions/import-codesign-certs@v3
         with: 
           p12-file-base64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
           p12-password: ${{ secrets.P12_PASSWORD }}
@@ -56,7 +56,7 @@ jobs:
         uses: robinraju/[email protected]
         with:
           repository: 'xjbeta/iina-plugin-danmaku'
-          tag: "0.1.8"
+          tag: "0.1.9"
           fileName: "iina-plugin-danmaku.iinaplgz"
           out-file-path: "IINA+"
 
@@ -78,7 +78,7 @@ jobs:
           ditto -c -k --sequesterRsrc --keepParent ../../dSYMs dSYMs.zip
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: "!startsWith(github.ref, 'refs/tags/')"
         with:
           name: archive

diff --git a/IINA+.xcodeproj/project.pbxproj b/IINA+.xcodeproj/project.pbxproj
@@ -17,6 +17,7 @@
 		0101013921200DC5002F0F7F /* LiveUrlTableCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0101013821200DC5002F0F7F /* LiveUrlTableCellView.swift */; };
 		0102924627ACF8AC00CB74B5 /* ControllersVisualEffectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0102924527ACF8AB00CB74B5 /* ControllersVisualEffectView.swift */; };
 		0106179D2AF34EFF005C7877 /* JSPlayerURL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0106179C2AF34EFF005C7877 /* JSPlayerURL.swift */; };
+		010BEA6C2C4FE2C60061E1DC /* BilibiliDash.swift in Sources */ = {isa = PBXBuildFile; fileRef = 010BEA6B2C4FE2C60061E1DC /* BilibiliDash.swift */; };
 		010F0EF220F890DB00F33553 /* MainWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 010F0EF120F890DB00F33553 /* MainWindowController.swift */; };
 		010F0F1320FE1DD100F33553 /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 010F0F1220FE1DD100F33553 /* Preferences.swift */; };
 		010F0F1920FE4F0900F33553 /* DataModel.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 010F0F1720FE4F0900F33553 /* DataModel.xcdatamodeld */; };
@@ -128,6 +129,7 @@
 		01EDCCA82A791EE0001DC138 /* test.htm in Copy Web Files */ = {isa = PBXBuildFile; fileRef = 01EDCCA62A791EB5001DC138 /* test.htm */; };
 		01F46CA12102EF4600FE9DAD /* GereralViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F46CA02102EF4600FE9DAD /* GereralViewController.swift */; };
 		01F5151A2109F002007C7153 /* LiveStatusTableCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F515192109F002007C7153 /* LiveStatusTableCellView.swift */; };
+		01F829CA2C5FA783004E4893 /* Semaphore in Frameworks */ = {isa = PBXBuildFile; productRef = 01F829C92C5FA783004E4893 /* Semaphore */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -185,6 +187,7 @@
 		0101013821200DC5002F0F7F /* LiveUrlTableCellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveUrlTableCellView.swift; sourceTree = "<group>"; };
 		0102924527ACF8AB00CB74B5 /* ControllersVisualEffectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ControllersVisualEffectView.swift; sourceTree = "<group>"; };
 		0106179C2AF34EFF005C7877 /* JSPlayerURL.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSPlayerURL.swift; sourceTree = "<group>"; };
+		010BEA6B2C4FE2C60061E1DC /* BilibiliDash.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BilibiliDash.swift; sourceTree = "<group>"; };
 		010F0EF120F890DB00F33553 /* MainWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainWindowController.swift; sourceTree = "<group>"; };
 		010F0F1220FE1DD100F33553 /* Preferences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Preferences.swift; sourceTree = "<group>"; };
 		010F0F1820FE4F0900F33553 /* Bookmark.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Bookmark.xcdatamodel; sourceTree = "<group>"; };
@@ -309,6 +312,7 @@
 				013F9B4B2C2C0A060024020C /* Swifter in Frameworks */,
 				01C0807C27BC00EA00E87A8C /* Alamofire in Frameworks */,
 				01C0809727BC074000E87A8C /* SDWebImage in Frameworks */,
+				01F829CA2C5FA783004E4893 /* Semaphore in Frameworks */,
 				01C0808527BC03E300E87A8C /* SwiftSoup in Frameworks */,
 				01C0808B27BC04C500E87A8C /* Marshal in Frameworks */,
 			);
@@ -489,6 +493,7 @@
 				01683DDA2118905D0016A886 /* Bilibili.swift */,
 				018739ED2852135200156F3F /* QQLive.swift */,
 				01C338B428E47B3F004CC0B8 /* MBGA.swift */,
+				010BEA6B2C4FE2C60061E1DC /* BilibiliDash.swift */,
 			);
 			path = VideoDecoder;
 			sourceTree = "<group>";
@@ -651,6 +656,7 @@
 				01C0809927BC079200E87A8C /* Sparkle */,
 				01C0809C27BC0BC400E87A8C /* SocketRocket */,
 				013F9B4A2C2C0A060024020C /* Swifter */,
+				01F829C92C5FA783004E4893 /* Semaphore */,
 			);
 			productName = "iina+";
 			productReference = 01AEC8A720EDFD01001406E8 /* IINA+.app */;
@@ -706,6 +712,7 @@
 				01C0809B27BC0BC400E87A8C /* XCRemoteSwiftPackageReference "SocketRocket" */,
 				010CE8C72A911010002FA130 /* XCRemoteSwiftPackageReference "SwiftBrotli" */,
 				013F9B492C2C0A060024020C /* XCRemoteSwiftPackageReference "swifter" */,
+				01F829C82C5FA783004E4893 /* XCRemoteSwiftPackageReference "Semaphore" */,
 			);
 			productRefGroup = 01AEC8A820EDFD01001406E8 /* Products */;
 			projectDirPath = "";
@@ -745,6 +752,7 @@
 /* Begin PBXShellScriptBuildPhase section */
 		01003E712B771D9100A152ED /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 12;
 			files = (
 			);
@@ -790,6 +798,7 @@
 				01AEC8C920F1081C001406E8 /* Identifiers.swift in Sources */,
 				01010125211DBC27002F0F7F /* StringExtension.swift in Sources */,
 				013A05EF2BC8052900AD63DD /* MainWindowTableView.swift in Sources */,
+				010BEA6C2C4FE2C60061E1DC /* BilibiliDash.swift in Sources */,
 				0182F5DF295FDAB600DB8BDD /* DouYinPushFrame.pb.swift in Sources */,
 				0196CB6421214B4200BCD29E /* AdvancedViewController.swift in Sources */,
 				0199489E2742852E00C71708 /* SupportSites.swift in Sources */,
@@ -1037,7 +1046,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 0.8.0;
+				MARKETING_VERSION = 0.8.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.xjbeta.iina-plus";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1064,7 +1073,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 0.8.0;
+				MARKETING_VERSION = 0.8.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.xjbeta.iina-plus";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1186,6 +1195,14 @@
 				kind = branch;
 			};
 		};
+		01F829C82C5FA783004E4893 /* XCRemoteSwiftPackageReference "Semaphore" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/groue/Semaphore";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 0.1.0;
+			};
+		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
@@ -1239,6 +1256,11 @@
 			package = 01C0809B27BC0BC400E87A8C /* XCRemoteSwiftPackageReference "SocketRocket" */;
 			productName = SocketRocket;
 		};
+		01F829C92C5FA783004E4893 /* Semaphore */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 01F829C82C5FA783004E4893 /* XCRemoteSwiftPackageReference "Semaphore" */;
+			productName = Semaphore;
+		};
 /* End XCSwiftPackageProductDependency section */
 
 /* Begin XCVersionGroup section */

diff --git a/IINA+.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/IINA+.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "3ee7d1c78fc4d98bd1c9eaf35f9b4a263d0b9b98d97f310ecc74fcc7cf1d66ed",
+  "originHash" : "9446deb32a3da7eb6f718bd9d122561507cc76295435ffdb46184cca0f53082f",
   "pins" : [
     {
       "identity" : "alamofire",
@@ -46,6 +46,15 @@
         "version" : "5.19.3"
       }
     },
+    {
+      "identity" : "semaphore",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/groue/Semaphore",
+      "state" : {
+        "revision" : "2543679282aa6f6c8ecf2138acd613ed20790bc2",
+        "version" : "0.1.0"
+      }
+    },
     {
       "identity" : "socketrocket",
       "kind" : "remoteSourceControl",

diff --git a/IINA+/Preferences.swift b/IINA+/Preferences.swift
@@ -115,7 +115,7 @@ class Preferences: NSObject {
 
     @objc dynamic var dmPort: Int {
         get {
-			if Processes.shared.iina.buildVersion() > 16 {
+			if Processes.shared.iina.buildVersion > 16 {
                 return defaults(.dmPort) as? Int ?? 19080
             } else {
                 return 19080