Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@xjbeta
xjbeta committed Nov 21, 2024
2 parents ebdf056 + 62a8c8f commit 23ae99a
Show file tree
Hide file tree
Showing 51 changed files with 7,627 additions and 8,564 deletions.
46 changes: 32 additions & 14 deletions IINA+.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
012738C12C731EEB0031E643 /* TaskExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012738C02C731EEB0031E643 /* TaskExtension.swift */; };
0132B2E32123D05E001EB7DC /* BilibiliCardProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0132B2E22123D05E001EB7DC /* BilibiliCardProgressView.swift */; };
0132B2E52123D68D001EB7DC /* BilibiliCardImageBoxView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0132B2E42123D68D001EB7DC /* BilibiliCardImageBoxView.swift */; };
013598962CEC8EC400B3EFC0 /* Bangumi.swift in Sources */ = {isa = PBXBuildFile; fileRef = 013598952CEC8EC400B3EFC0 /* Bangumi.swift */; };
013598982CEC95AE00B3EFC0 /* BilbiliShare.swift in Sources */ = {isa = PBXBuildFile; fileRef = 013598972CEC95AE00B3EFC0 /* BilbiliShare.swift */; };
013850FA214EA2AA003817CE /* huya.js in Resources */ = {isa = PBXBuildFile; fileRef = 013850F9214EA2AA003817CE /* huya.js */; };
01398985210F27A600B7042F /* PreferencesWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01398984210F27A600B7042F /* PreferencesWindowController.swift */; };
01398987210F58E500B7042F /* MainWindowTableRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01398986210F58E500B7042F /* MainWindowTableRowView.swift */; };
Expand Down Expand Up @@ -118,8 +120,11 @@
01C0809A27BC079200E87A8C /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = 01C0809927BC079200E87A8C /* Sparkle */; };
01C0809D27BC0BC400E87A8C /* SocketRocket in Frameworks */ = {isa = PBXBuildFile; productRef = 01C0809C27BC0BC400E87A8C /* SocketRocket */; };
01C248B52A623EC000C92639 /* IINAApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01C248B42A623EC000C92639 /* IINAApp.swift */; };
01C248CA2CE480670074A76F /* TokenBucket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01C248C92CE480670074A76F /* TokenBucket.swift */; };
01C248CD2CE480F30074A76F /* DequeModule in Frameworks */ = {isa = PBXBuildFile; productRef = 01C248CC2CE480F30074A76F /* DequeModule */; };
01C338B528E47B3F004CC0B8 /* MBGA.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01C338B428E47B3F004CC0B8 /* MBGA.swift */; };
01C373592429F2C2006778D1 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 01C373582429F2C2006778D1 /* README.md */; };
01D482BB2CAF978C00F636EE /* CharacterSetExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D482BA2CAF978C00F636EE /* CharacterSetExtension.swift */; };
01D8282A2AC3E1D6003A73BA /* mpegts.js in Copy Web Files */ = {isa = PBXBuildFile; fileRef = 01D828282AC3E1A6003A73BA /* mpegts.js */; };
01D8762927D459C5001140DD /* crypto-js.js in Resources */ = {isa = PBXBuildFile; fileRef = 01D8762827D459C5001140DD /* crypto-js.js */; };
01DCD2F9259710D800D286C8 /* BilibiliDMMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01DCD2F8259710D800D286C8 /* BilibiliDMMessage.swift */; };
Expand All @@ -130,7 +135,6 @@
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 */
Expand Down Expand Up @@ -206,6 +210,8 @@
012738C02C731EEB0031E643 /* TaskExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskExtension.swift; sourceTree = "<group>"; };
0132B2E22123D05E001EB7DC /* BilibiliCardProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BilibiliCardProgressView.swift; sourceTree = "<group>"; };
0132B2E42123D68D001EB7DC /* BilibiliCardImageBoxView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BilibiliCardImageBoxView.swift; sourceTree = "<group>"; };
013598952CEC8EC400B3EFC0 /* Bangumi.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bangumi.swift; sourceTree = "<group>"; };
013598972CEC95AE00B3EFC0 /* BilbiliShare.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BilbiliShare.swift; sourceTree = "<group>"; };
013850F9214EA2AA003817CE /* huya.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = huya.js; sourceTree = "<group>"; };
01398984210F27A600B7042F /* PreferencesWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesWindowController.swift; sourceTree = "<group>"; };
01398986210F58E500B7042F /* MainWindowTableRowView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainWindowTableRowView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -285,8 +291,10 @@
01C0807927BB5CFF00E87A8C /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Preferences.strings"; sourceTree = "<group>"; };
01C248B42A623EC000C92639 /* IINAApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IINAApp.swift; sourceTree = "<group>"; };
01C248B62A62418E00C92639 /* iina-plugin-danmaku.iinaplgz */ = {isa = PBXFileReference; lastKnownFileType = file; path = "iina-plugin-danmaku.iinaplgz"; sourceTree = "<group>"; };
01C248C92CE480670074A76F /* TokenBucket.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TokenBucket.swift; sourceTree = "<group>"; };
01C338B428E47B3F004CC0B8 /* MBGA.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MBGA.swift; sourceTree = "<group>"; };
01C373582429F2C2006778D1 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; };
01D482BA2CAF978C00F636EE /* CharacterSetExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CharacterSetExtension.swift; sourceTree = "<group>"; };
01D828282AC3E1A6003A73BA /* mpegts.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = mpegts.js; path = "IINA+/WebFiles/node_modules/mpegts.js/dist/mpegts.js"; sourceTree = SOURCE_ROOT; };
01D8762827D459C5001140DD /* crypto-js.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = "crypto-js.js"; path = "IINA+/WebFiles/node_modules/crypto-js/crypto-js.js"; sourceTree = SOURCE_ROOT; };
01DCD2F8259710D800D286C8 /* BilibiliDMMessage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BilibiliDMMessage.swift; sourceTree = "<group>"; };
Expand All @@ -311,10 +319,10 @@
01C0809D27BC0BC400E87A8C /* SocketRocket in Frameworks */,
01C0808827BC049500E87A8C /* CryptoSwift in Frameworks */,
01C0809427BC06EC00E87A8C /* SwiftProtobuf in Frameworks */,
01C248CD2CE480F30074A76F /* DequeModule in Frameworks */,
013F9B4B2C2C0A060024020C /* Swifter in Frameworks */,
01C0807C27BC00EA00E87A8C /* Alamofire in Frameworks */,
01C0809727BC074000E87A8C /* SDWebImage in Frameworks */,
01F829CA2C5FA783004E4893 /* Semaphore in Frameworks */,
01C0808527BC03E300E87A8C /* SwiftSoup in Frameworks */,
01C0808B27BC04C500E87A8C /* Marshal in Frameworks */,
);
Expand Down Expand Up @@ -403,6 +411,7 @@
012601722119BA6D00C9C639 /* Utils */ = {
isa = PBXGroup;
children = (
01C248C92CE480670074A76F /* TokenBucket.swift */,
01BAD2AD2B13960600A64D55 /* Extensions */,
018F4F5F280D89BB0045B67C /* VideoDecoder */,
01B090A6281CFF1B00E305B7 /* Danmaku */,
Expand Down Expand Up @@ -493,6 +502,8 @@
01A183DA2B789728006FA874 /* HuyaUrl.swift */,
018F4F6B2817FFF30045B67C /* BiliLive.swift */,
01683DDA2118905D0016A886 /* Bilibili.swift */,
013598972CEC95AE00B3EFC0 /* BilbiliShare.swift */,
013598952CEC8EC400B3EFC0 /* Bangumi.swift */,
018739ED2852135200156F3F /* QQLive.swift */,
01C338B428E47B3F004CC0B8 /* MBGA.swift */,
010BEA6B2C4FE2C60061E1DC /* BilibiliDash.swift */,
Expand Down Expand Up @@ -596,6 +607,7 @@
isa = PBXGroup;
children = (
01942A3527C49D850092FA5A /* WKWebViewExtension.swift */,
01D482BA2CAF978C00F636EE /* CharacterSetExtension.swift */,
01010124211DBC27002F0F7F /* StringExtension.swift */,
0184D7112B2025FF00C7901A /* DateExtension.swift */,
012738C02C731EEB0031E643 /* TaskExtension.swift */,
Expand Down Expand Up @@ -659,7 +671,7 @@
01C0809927BC079200E87A8C /* Sparkle */,
01C0809C27BC0BC400E87A8C /* SocketRocket */,
013F9B4A2C2C0A060024020C /* Swifter */,
01F829C92C5FA783004E4893 /* Semaphore */,
01C248CC2CE480F30074A76F /* DequeModule */,
);
productName = "iina+";
productReference = 01AEC8A720EDFD01001406E8 /* IINA+.app */;
Expand Down Expand Up @@ -715,7 +727,7 @@
01C0809B27BC0BC400E87A8C /* XCRemoteSwiftPackageReference "SocketRocket" */,
010CE8C72A911010002FA130 /* XCRemoteSwiftPackageReference "SwiftBrotli" */,
013F9B492C2C0A060024020C /* XCRemoteSwiftPackageReference "swifter" */,
01F829C82C5FA783004E4893 /* XCRemoteSwiftPackageReference "Semaphore" */,
01C248CB2CE480F30074A76F /* XCRemoteSwiftPackageReference "swift-collections" */,
);
productRefGroup = 01AEC8A820EDFD01001406E8 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -803,6 +815,7 @@
01AEC8C920F1081C001406E8 /* Identifiers.swift in Sources */,
01010125211DBC27002F0F7F /* StringExtension.swift in Sources */,
013A05EF2BC8052900AD63DD /* MainWindowTableView.swift in Sources */,
013598982CEC95AE00B3EFC0 /* BilbiliShare.swift in Sources */,
010BEA6C2C4FE2C60061E1DC /* BilibiliDash.swift in Sources */,
0182F5DF295FDAB600DB8BDD /* DouYinPushFrame.pb.swift in Sources */,
0196CB6421214B4200BCD29E /* AdvancedViewController.swift in Sources */,
Expand All @@ -813,6 +826,7 @@
0182F5DD295F108D00DB8BDD /* DouYinResponse.pb.swift in Sources */,
01260178211ABD3B00C9C639 /* VideoViewsFormatter.swift in Sources */,
016A71F32A91C50F007B4CA3 /* BiliLiveDMv2.pb.swift in Sources */,
01C248CA2CE480670074A76F /* TokenBucket.swift in Sources */,
014B447E210069FF00E7AA6A /* BookmarkExtension.swift in Sources */,
01B881372C4128EA00E44B97 /* BilibiliDynamicManger.swift in Sources */,
01479CD5210AFACB0046AAAD /* AddBookmarkViewController.swift in Sources */,
Expand All @@ -823,6 +837,7 @@
01F46CA12102EF4600FE9DAD /* GereralViewController.swift in Sources */,
015C19DC218B0D4F003B2F3A /* VideoGetStructs.swift in Sources */,
013CE8DE2184459E000271FB /* Danmaku.swift in Sources */,
013598962CEC8EC400B3EFC0 /* Bangumi.swift in Sources */,
0101012B211DCE1C002F0F7F /* SidebarTableCellView.swift in Sources */,
0184D7122B2025FF00C7901A /* DateExtension.swift in Sources */,
011E4D3321E99CA400997633 /* Log.swift in Sources */,
Expand Down Expand Up @@ -854,6 +869,7 @@
01AEC8AB20EDFD01001406E8 /* AppDelegate.swift in Sources */,
0102924627ACF8AC00CB74B5 /* ControllersVisualEffectView.swift in Sources */,
0106179D2AF34EFF005C7877 /* JSPlayerURL.swift in Sources */,
01D482BB2CAF978C00F636EE /* CharacterSetExtension.swift in Sources */,
01010137211EFA75002F0F7F /* SuggestionsTableView.swift in Sources */,
016D772427B0CD4300358E2F /* WaitTimer.swift in Sources */,
01E6A09C211AD62800C6EF98 /* VideoDurationFormatter.swift in Sources */,
Expand Down Expand Up @@ -971,6 +987,7 @@
SDKROOT = macosx;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_STRICT_CONCURRENCY = complete;
};
name = Debug;
};
Expand Down Expand Up @@ -1029,6 +1046,7 @@
SDKROOT = macosx;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_STRICT_CONCURRENCY = complete;
};
name = Release;
};
Expand All @@ -1049,14 +1067,14 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MACOSX_DEPLOYMENT_TARGET = 11.5;
MARKETING_VERSION = 0.8.4;
PRODUCT_BUNDLE_IDENTIFIER = "com.xjbeta.iina-plus";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "IINA+/iina+-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 6.0;
};
name = Debug;
};
Expand All @@ -1076,14 +1094,14 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MACOSX_DEPLOYMENT_TARGET = 11.5;
MARKETING_VERSION = 0.8.4;
PRODUCT_BUNDLE_IDENTIFIER = "com.xjbeta.iina-plus";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "IINA+/iina+-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 6.0;
};
name = Release;
};
Expand Down Expand Up @@ -1199,12 +1217,12 @@
kind = branch;
};
};
01F829C82C5FA783004E4893 /* XCRemoteSwiftPackageReference "Semaphore" */ = {
01C248CB2CE480F30074A76F /* XCRemoteSwiftPackageReference "swift-collections" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/groue/Semaphore";
repositoryURL = "https://github.com/apple/swift-collections.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 0.1.0;
minimumVersion = 1.1.4;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down Expand Up @@ -1260,10 +1278,10 @@
package = 01C0809B27BC0BC400E87A8C /* XCRemoteSwiftPackageReference "SocketRocket" */;
productName = SocketRocket;
};
01F829C92C5FA783004E4893 /* Semaphore */ = {
01C248CC2CE480F30074A76F /* DequeModule */ = {
isa = XCSwiftPackageProductDependency;
package = 01F829C82C5FA783004E4893 /* XCRemoteSwiftPackageReference "Semaphore" */;
productName = Semaphore;
package = 01C248CB2CE480F30074A76F /* XCRemoteSwiftPackageReference "swift-collections" */;
productName = DequeModule;
};
/* End XCSwiftPackageProductDependency section */

Expand Down
38 changes: 19 additions & 19 deletions IINA+.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"originHash" : "002db082d67dd04ceef35a0e7fc98dc59d5b2928b472f339c49f8bce81f0f426",
"originHash" : "e25d26158a9202447104dd429e63878698e1f4c65378618a6d336f857726dcad",
"pins" : [
{
"identity" : "alamofire",
"kind" : "remoteSourceControl",
"location" : "https://github.com/Alamofire/Alamofire",
"state" : {
"revision" : "f455c2975872ccd2d9c81594c658af65716e9b9a",
"version" : "5.9.1"
"revision" : "e16d3481f5ed35f0472cb93350085853d754913f",
"version" : "5.10.1"
}
},
{
Expand Down Expand Up @@ -42,17 +42,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/SDWebImage/SDWebImage",
"state" : {
"revision" : "8a1be70a625683bc04d6903e2935bf23f3c6d609",
"version" : "5.19.7"
}
},
{
"identity" : "semaphore",
"kind" : "remoteSourceControl",
"location" : "https://github.com/groue/Semaphore",
"state" : {
"revision" : "2543679282aa6f6c8ecf2138acd613ed20790bc2",
"version" : "0.1.0"
"revision" : "10d06f6a33bafae8c164fbfd1f03391f6d4692b3",
"version" : "5.20.0"
}
},
{
Expand All @@ -61,7 +52,7 @@
"location" : "https://github.com/xjbeta/SocketRocket/",
"state" : {
"branch" : "dev",
"revision" : "c81e0ea3776ad369211259b9078c8bf5204c240f"
"revision" : "9c2ecc3179c602a7f5143a0b03c0c98530470212"
}
},
{
Expand All @@ -73,13 +64,22 @@
"version" : "2.6.4"
}
},
{
"identity" : "swift-collections",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-collections.git",
"state" : {
"revision" : "671108c96644956dddcd89dd59c203dcdb36cec7",
"version" : "1.1.4"
}
},
{
"identity" : "swift-protobuf",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-protobuf.git",
"state" : {
"revision" : "edb6ed4919f7756157fe02f2552b7e3850a538e5",
"version" : "1.28.1"
"revision" : "ebc7251dd5b37f627c93698e4374084d98409633",
"version" : "1.28.2"
}
},
{
Expand All @@ -105,8 +105,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/scinfu/SwiftSoup",
"state" : {
"revision" : "3c2c7e1e72b8abd96eafbae80323c5c1e5317437",
"version" : "2.7.5"
"revision" : "0837db354faf9c9deb710dc597046edaadf5360f",
"version" : "2.7.6"
}
}
],
Expand Down
3 changes: 2 additions & 1 deletion IINA+/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Cocoa
import SDWebImage
import Sparkle

@NSApplicationMain
@main
class AppDelegate: NSObject, NSApplicationDelegate {

let updaterController = SPUStandardUpdaterController(startingUpdater: true, updaterDelegate: nil, userDriverDelegate: nil)
Expand Down Expand Up @@ -74,6 +74,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
return true
}

@MainActor
func showUpdateAlert() {
guard !Preferences.shared.updateInfo070 else { return }
Preferences.shared.updateInfo070 = true
Expand Down
Loading

0 comments on commit 23ae99a

Please sign in to comment.