Skip to content

Commit 075f813

Browse files
xjbetaxjbeta
committed
Merge branch 'develop'
2 parents e10332d + 1707dcb commit 075f813

File tree

14 files changed

+914
-513
lines changed

14 files changed

+914
-513
lines changed

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
jobs:
1111
release-osx:
12-
runs-on: macos-14
12+
runs-on: macos-15
1313
steps:
1414
- uses: maxim-lobanov/setup-xcode@v1
1515
with:

‎IINA+.xcodeproj/project.pbxproj‎

Lines changed: 71 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@
4040
013A05EF2BC8052900AD63DD /* MainWindowTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 013A05EE2BC8052900AD63DD /* MainWindowTableView.swift */; };
4141
013CE8DE2184459E000271FB /* Danmaku.swift in Sources */ = {isa = PBXBuildFile; fileRef = 013CE8DD2184459E000271FB /* Danmaku.swift */; };
4242
013CE8E021854813000271FB /* VideoDecoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 013CE8DF21854813000271FB /* VideoDecoder.swift */; };
43-
013CE8F62185D992000271FB /* HttpServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 013CE8F52185D992000271FB /* HttpServer.swift */; };
44-
013F9B4B2C2C0A060024020C /* Swifter in Frameworks */ = {isa = PBXBuildFile; productRef = 013F9B4A2C2C0A060024020C /* Swifter */; };
4543
014327B722AF5BE100651064 /* OpenFilesWindow.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 014327B622AF5BE100651064 /* OpenFilesWindow.storyboard */; };
4644
014327BA22AF5BED00651064 /* OpenFilesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 014327B822AF5BED00651064 /* OpenFilesViewController.swift */; };
4745
014327BD22AF5C9D00651064 /* OpenFilesWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 014327BC22AF5C9D00651064 /* OpenFilesWindowController.swift */; };
@@ -50,6 +48,11 @@
5048
01479CD7210B35480046AAAD /* MainMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01479CD6210B35480046AAAD /* MainMenu.swift */; };
5149
014B447D210069FF00E7AA6A /* Bookmark.swift in Sources */ = {isa = PBXBuildFile; fileRef = 014B447B210069FF00E7AA6A /* Bookmark.swift */; };
5250
014B447E210069FF00E7AA6A /* BookmarkExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 014B447C210069FF00E7AA6A /* BookmarkExtension.swift */; };
51+
0155C3972CF481B9004A2042 /* DanmakuWebSocketHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0155C3952CF481B9004A2042 /* DanmakuWebSocketHandler.swift */; };
52+
0155C3982CF481B9004A2042 /* DanmakuWS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0155C38F2CF481B9004A2042 /* DanmakuWS.swift */; };
53+
0155C39B2CF481B9004A2042 /* HttpServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0155C3912CF481B9004A2042 /* HttpServer.swift */; };
54+
0155C39C2CF481B9004A2042 /* NIOHTTPServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0155C3932CF481B9004A2042 /* NIOHTTPServer.swift */; };
55+
0155C3A12CF493BC004A2042 /* HTTPHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0155C3A02CF493BC004A2042 /* HTTPHandler.swift */; };
5356
015C19DC218B0D4F003B2F3A /* VideoGetStructs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 015C19DB218B0D4F003B2F3A /* VideoGetStructs.swift */; };
5457
015C19F7218FC9A8003B2F3A /* Block-List-Plus.xml in Resources */ = {isa = PBXBuildFile; fileRef = 015C19F5218FC9A8003B2F3A /* Block-List-Plus.xml */; };
5558
015C19F8218FC9A8003B2F3A /* Block-List-Basic.xml in Resources */ = {isa = PBXBuildFile; fileRef = 015C19F6218FC9A8003B2F3A /* Block-List-Basic.xml */; };
@@ -130,6 +133,10 @@
130133
01DCD2F9259710D800D286C8 /* BilibiliDMMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01DCD2F8259710D800D286C8 /* BilibiliDMMessage.swift */; };
131134
01E40FEB22C304E800864118 /* ImageLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E40FEA22C304E800864118 /* ImageLoader.swift */; };
132135
01E40FF622C39E7100864118 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 01E40FF822C39E7100864118 /* Localizable.strings */; };
136+
01E668D02CEA322F008C51E7 /* NIOCore in Frameworks */ = {isa = PBXBuildFile; productRef = 01E668CF2CEA322F008C51E7 /* NIOCore */; };
137+
01E668D22CEA322F008C51E7 /* NIOFoundationCompat in Frameworks */ = {isa = PBXBuildFile; productRef = 01E668D12CEA322F008C51E7 /* NIOFoundationCompat */; };
138+
01E668D42CEA322F008C51E7 /* NIOHTTP1 in Frameworks */ = {isa = PBXBuildFile; productRef = 01E668D32CEA322F008C51E7 /* NIOHTTP1 */; };
139+
01E668D62CEA322F008C51E7 /* NIOWebSocket in Frameworks */ = {isa = PBXBuildFile; productRef = 01E668D52CEA322F008C51E7 /* NIOWebSocket */; };
133140
01E6A09C211AD62800C6EF98 /* VideoDurationFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E6A09B211AD62800C6EF98 /* VideoDurationFormatter.swift */; };
134141
01EDCCA72A791EB5001DC138 /* test.htm in Resources */ = {isa = PBXBuildFile; fileRef = 01EDCCA62A791EB5001DC138 /* test.htm */; };
135142
01EDCCA82A791EE0001DC138 /* test.htm in Copy Web Files */ = {isa = PBXBuildFile; fileRef = 01EDCCA62A791EB5001DC138 /* test.htm */; };
@@ -218,7 +225,6 @@
218225
013A05EE2BC8052900AD63DD /* MainWindowTableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainWindowTableView.swift; sourceTree = "<group>"; };
219226
013CE8DD2184459E000271FB /* Danmaku.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Danmaku.swift; sourceTree = "<group>"; };
220227
013CE8DF21854813000271FB /* VideoDecoder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoDecoder.swift; sourceTree = "<group>"; };
221-
013CE8F52185D992000271FB /* HttpServer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HttpServer.swift; sourceTree = "<group>"; };
222228
014327B622AF5BE100651064 /* OpenFilesWindow.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = OpenFilesWindow.storyboard; sourceTree = "<group>"; };
223229
014327B822AF5BED00651064 /* OpenFilesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenFilesViewController.swift; sourceTree = "<group>"; };
224230
014327BC22AF5C9D00651064 /* OpenFilesWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenFilesWindowController.swift; sourceTree = "<group>"; };
@@ -228,6 +234,11 @@
228234
014B447B210069FF00E7AA6A /* Bookmark.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bookmark.swift; sourceTree = "<group>"; };
229235
014B447C210069FF00E7AA6A /* BookmarkExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkExtension.swift; sourceTree = "<group>"; };
230236
014FD3A42115CB3000F05399 /* Bookmark v0.2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Bookmark v0.2.xcdatamodel"; sourceTree = "<group>"; };
237+
0155C38F2CF481B9004A2042 /* DanmakuWS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DanmakuWS.swift; sourceTree = "<group>"; };
238+
0155C3912CF481B9004A2042 /* HttpServer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HttpServer.swift; sourceTree = "<group>"; };
239+
0155C3932CF481B9004A2042 /* NIOHTTPServer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NIOHTTPServer.swift; sourceTree = "<group>"; };
240+
0155C3952CF481B9004A2042 /* DanmakuWebSocketHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DanmakuWebSocketHandler.swift; sourceTree = "<group>"; };
241+
0155C3A02CF493BC004A2042 /* HTTPHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTTPHandler.swift; sourceTree = "<group>"; };
231242
015C19DB218B0D4F003B2F3A /* VideoGetStructs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoGetStructs.swift; sourceTree = "<group>"; };
232243
015C19F5218FC9A8003B2F3A /* Block-List-Plus.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "Block-List-Plus.xml"; sourceTree = "<group>"; };
233244
015C19F6218FC9A8003B2F3A /* Block-List-Basic.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "Block-List-Basic.xml"; sourceTree = "<group>"; };
@@ -318,12 +329,15 @@
318329
01C0809127BC05A500E87A8C /* Gzip in Frameworks */,
319330
01C0809D27BC0BC400E87A8C /* SocketRocket in Frameworks */,
320331
01C0808827BC049500E87A8C /* CryptoSwift in Frameworks */,
332+
01E668D22CEA322F008C51E7 /* NIOFoundationCompat in Frameworks */,
321333
01C0809427BC06EC00E87A8C /* SwiftProtobuf in Frameworks */,
322334
01C248CD2CE480F30074A76F /* DequeModule in Frameworks */,
323-
013F9B4B2C2C0A060024020C /* Swifter in Frameworks */,
335+
01E668D62CEA322F008C51E7 /* NIOWebSocket in Frameworks */,
336+
01E668D42CEA322F008C51E7 /* NIOHTTP1 in Frameworks */,
324337
01C0807C27BC00EA00E87A8C /* Alamofire in Frameworks */,
325338
01C0809727BC074000E87A8C /* SDWebImage in Frameworks */,
326339
01C0808527BC03E300E87A8C /* SwiftSoup in Frameworks */,
340+
01E668D02CEA322F008C51E7 /* NIOCore in Frameworks */,
327341
01C0808B27BC04C500E87A8C /* Marshal in Frameworks */,
328342
);
329343
runOnlyForDeploymentPostprocessing = 0;
@@ -415,7 +429,7 @@
415429
01BAD2AD2B13960600A64D55 /* Extensions */,
416430
018F4F5F280D89BB0045B67C /* VideoDecoder */,
417431
01B090A6281CFF1B00E305B7 /* Danmaku */,
418-
013CE8F52185D992000271FB /* HttpServer.swift */,
432+
0155C3962CF481B9004A2042 /* HttpServer */,
419433
01260177211ABD3B00C9C639 /* VideoViewsFormatter.swift */,
420434
01E6A09B211AD62800C6EF98 /* VideoDurationFormatter.swift */,
421435
01AEC8BB20EDFFBD001406E8 /* YouGetJSON.swift */,
@@ -461,6 +475,18 @@
461475
name = Frameworks;
462476
sourceTree = "<group>";
463477
};
478+
0155C3962CF481B9004A2042 /* HttpServer */ = {
479+
isa = PBXGroup;
480+
children = (
481+
0155C3912CF481B9004A2042 /* HttpServer.swift */,
482+
0155C3932CF481B9004A2042 /* NIOHTTPServer.swift */,
483+
0155C3952CF481B9004A2042 /* DanmakuWebSocketHandler.swift */,
484+
0155C38F2CF481B9004A2042 /* DanmakuWS.swift */,
485+
0155C3A02CF493BC004A2042 /* HTTPHandler.swift */,
486+
);
487+
path = HttpServer;
488+
sourceTree = "<group>";
489+
};
464490
016792E8212BF89A003517A7 /* SelectVideoCollectionView */ = {
465491
isa = PBXGroup;
466492
children = (
@@ -670,8 +696,11 @@
670696
01C0809627BC074000E87A8C /* SDWebImage */,
671697
01C0809927BC079200E87A8C /* Sparkle */,
672698
01C0809C27BC0BC400E87A8C /* SocketRocket */,
673-
013F9B4A2C2C0A060024020C /* Swifter */,
674699
01C248CC2CE480F30074A76F /* DequeModule */,
700+
01E668CF2CEA322F008C51E7 /* NIOCore */,
701+
01E668D12CEA322F008C51E7 /* NIOFoundationCompat */,
702+
01E668D32CEA322F008C51E7 /* NIOHTTP1 */,
703+
01E668D52CEA322F008C51E7 /* NIOWebSocket */,
675704
);
676705
productName = "iina+";
677706
productReference = 01AEC8A720EDFD01001406E8 /* IINA+.app */;
@@ -726,8 +755,8 @@
726755
01C0809827BC079200E87A8C /* XCRemoteSwiftPackageReference "Sparkle" */,
727756
01C0809B27BC0BC400E87A8C /* XCRemoteSwiftPackageReference "SocketRocket" */,
728757
010CE8C72A911010002FA130 /* XCRemoteSwiftPackageReference "SwiftBrotli" */,
729-
013F9B492C2C0A060024020C /* XCRemoteSwiftPackageReference "swifter" */,
730758
01C248CB2CE480F30074A76F /* XCRemoteSwiftPackageReference "swift-collections" */,
759+
01E668CE2CEA322F008C51E7 /* XCRemoteSwiftPackageReference "swift-nio" */,
731760
);
732761
productRefGroup = 01AEC8A820EDFD01001406E8 /* Products */;
733762
projectDirPath = "";
@@ -796,7 +825,6 @@
796825
012738C12C731EEB0031E643 /* TaskExtension.swift in Sources */,
797826
010F0F1920FE4F0900F33553 /* DataModel.xcdatamodeld in Sources */,
798827
0120934227A40869002C7FD3 /* JSPlayerWindowController.swift in Sources */,
799-
013CE8F62185D992000271FB /* HttpServer.swift in Sources */,
800828
016792E6212BDEE5003517A7 /* SelectVideoCollectionViewItem.swift in Sources */,
801829
0101013921200DC5002F0F7F /* LiveUrlTableCellView.swift in Sources */,
802830
018F4F6A2812D95C0045B67C /* CC163.swift in Sources */,
@@ -809,6 +837,7 @@
809837
01942A3227C345060092FA5A /* DouYinDMResponse.pb.swift in Sources */,
810838
01010127211DCAE8002F0F7F /* SidebarViewController.swift in Sources */,
811839
01AEC8C220EFBCCF001406E8 /* MPVOption.swift in Sources */,
840+
0155C3A12CF493BC004A2042 /* HTTPHandler.swift in Sources */,
812841
014327BA22AF5BED00651064 /* OpenFilesViewController.swift in Sources */,
813842
016792EE212C421F003517A7 /* SelectVideoCollectionViewItemView.swift in Sources */,
814843
0189534F27A138310011BAAC /* JSPlayerViewController.swift in Sources */,
@@ -821,6 +850,10 @@
821850
0196CB6421214B4200BCD29E /* AdvancedViewController.swift in Sources */,
822851
0199489E2742852E00C71708 /* SupportSites.swift in Sources */,
823852
01AEC8AD20EDFD01001406E8 /* MainViewController.swift in Sources */,
853+
0155C3972CF481B9004A2042 /* DanmakuWebSocketHandler.swift in Sources */,
854+
0155C3982CF481B9004A2042 /* DanmakuWS.swift in Sources */,
855+
0155C39B2CF481B9004A2042 /* HttpServer.swift in Sources */,
856+
0155C39C2CF481B9004A2042 /* NIOHTTPServer.swift in Sources */,
824857
019948BF2743DF3600C71708 /* ObjMenuItem.swift in Sources */,
825858
01683DDB2118905D0016A886 /* Bilibili.swift in Sources */,
826859
0182F5DD295F108D00DB8BDD /* DouYinResponse.pb.swift in Sources */,
@@ -1068,7 +1101,7 @@
10681101
"@executable_path/../Frameworks",
10691102
);
10701103
MACOSX_DEPLOYMENT_TARGET = 11.5;
1071-
MARKETING_VERSION = 0.8.5;
1104+
MARKETING_VERSION = 0.8.6;
10721105
PRODUCT_BUNDLE_IDENTIFIER = "com.xjbeta.iina-plus";
10731106
PRODUCT_NAME = "$(TARGET_NAME)";
10741107
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1095,7 +1128,7 @@
10951128
"@executable_path/../Frameworks",
10961129
);
10971130
MACOSX_DEPLOYMENT_TARGET = 11.5;
1098-
MARKETING_VERSION = 0.8.5;
1131+
MARKETING_VERSION = 0.8.6;
10991132
PRODUCT_BUNDLE_IDENTIFIER = "com.xjbeta.iina-plus";
11001133
PRODUCT_NAME = "$(TARGET_NAME)";
11011134
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1137,14 +1170,6 @@
11371170
minimumVersion = 0.1.0;
11381171
};
11391172
};
1140-
013F9B492C2C0A060024020C /* XCRemoteSwiftPackageReference "swifter" */ = {
1141-
isa = XCRemoteSwiftPackageReference;
1142-
repositoryURL = "https://github.com/xjbeta/swifter";
1143-
requirement = {
1144-
branch = dev;
1145-
kind = branch;
1146-
};
1147-
};
11481173
01C0807A27BC00EA00E87A8C /* XCRemoteSwiftPackageReference "Alamofire" */ = {
11491174
isa = XCRemoteSwiftPackageReference;
11501175
repositoryURL = "https://github.com/Alamofire/Alamofire";
@@ -1225,14 +1250,17 @@
12251250
minimumVersion = 1.1.4;
12261251
};
12271252
};
1253+
01E668CE2CEA322F008C51E7 /* XCRemoteSwiftPackageReference "swift-nio" */ = {
1254+
isa = XCRemoteSwiftPackageReference;
1255+
repositoryURL = "https://github.com/apple/swift-nio.git";
1256+
requirement = {
1257+
kind = upToNextMajorVersion;
1258+
minimumVersion = 2.76.1;
1259+
};
1260+
};
12281261
/* End XCRemoteSwiftPackageReference section */
12291262

12301263
/* Begin XCSwiftPackageProductDependency section */
1231-
013F9B4A2C2C0A060024020C /* Swifter */ = {
1232-
isa = XCSwiftPackageProductDependency;
1233-
package = 013F9B492C2C0A060024020C /* XCRemoteSwiftPackageReference "swifter" */;
1234-
productName = Swifter;
1235-
};
12361264
01C0807B27BC00EA00E87A8C /* Alamofire */ = {
12371265
isa = XCSwiftPackageProductDependency;
12381266
package = 01C0807A27BC00EA00E87A8C /* XCRemoteSwiftPackageReference "Alamofire" */;
@@ -1283,6 +1311,26 @@
12831311
package = 01C248CB2CE480F30074A76F /* XCRemoteSwiftPackageReference "swift-collections" */;
12841312
productName = DequeModule;
12851313
};
1314+
01E668CF2CEA322F008C51E7 /* NIOCore */ = {
1315+
isa = XCSwiftPackageProductDependency;
1316+
package = 01E668CE2CEA322F008C51E7 /* XCRemoteSwiftPackageReference "swift-nio" */;
1317+
productName = NIOCore;
1318+
};
1319+
01E668D12CEA322F008C51E7 /* NIOFoundationCompat */ = {
1320+
isa = XCSwiftPackageProductDependency;
1321+
package = 01E668CE2CEA322F008C51E7 /* XCRemoteSwiftPackageReference "swift-nio" */;
1322+
productName = NIOFoundationCompat;
1323+
};
1324+
01E668D32CEA322F008C51E7 /* NIOHTTP1 */ = {
1325+
isa = XCSwiftPackageProductDependency;
1326+
package = 01E668CE2CEA322F008C51E7 /* XCRemoteSwiftPackageReference "swift-nio" */;
1327+
productName = NIOHTTP1;
1328+
};
1329+
01E668D52CEA322F008C51E7 /* NIOWebSocket */ = {
1330+
isa = XCSwiftPackageProductDependency;
1331+
package = 01E668CE2CEA322F008C51E7 /* XCRemoteSwiftPackageReference "swift-nio" */;
1332+
productName = NIOWebSocket;
1333+
};
12861334
/* End XCSwiftPackageProductDependency section */
12871335

12881336
/* Begin XCVersionGroup section */

‎IINA+.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 27 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎IINA+/AppDelegate.swift‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {
6363
// Insert code here to tear down your application
6464
}
6565

66+
func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
67+
return true
68+
}
69+
6670
func applicationShouldHandleReopen(_ sender: NSApplication, hasVisibleWindows flag: Bool) -> Bool {
6771
if !flag {
6872
for window in sender.windows {

0 commit comments

Comments
 (0)