Skip to content

Commit 1ee41af

Browse files
xjbetaxjbeta
committed
Merge develop into master.v0.3-build(ec64cfe).
2 parents b2b2ba1 + ec64cfe commit 1ee41af

File tree

13 files changed

+113
-78
lines changed

13 files changed

+113
-78
lines changed

‎Cartfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
github "utahiosmac/Marshal"
2-
github "daltoniam/SwiftHTTP"
2+
github "daltoniam/SwiftHTTP"
3+
github "DevMate/DevMateKit"

‎Cartfile.resolved‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
github "DevMate/DevMateKit" "v1.8.3"
12
github "daltoniam/SwiftHTTP" "3.0.1"
23
github "utahiosmac/Marshal" "1.2.7"

‎iina+.xcodeproj/project.pbxproj‎

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
01010137211EFA75002F0F7F /* SuggestionsTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01010136211EFA75002F0F7F /* SuggestionsTableView.swift */; };
1818
0101013921200DC5002F0F7F /* LiveUrlTableCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0101013821200DC5002F0F7F /* LiveUrlTableCellView.swift */; };
1919
010F0EF220F890DB00F33553 /* MainWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 010F0EF120F890DB00F33553 /* MainWindowController.swift */; };
20-
010F0F0A20FCC17F00F33553 /* Marshal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 010F0EFE20FCC16600F33553 /* Marshal.framework */; };
21-
010F0F0B20FCC17F00F33553 /* Marshal.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 010F0EFE20FCC16600F33553 /* Marshal.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
22-
010F0F0C20FCC17F00F33553 /* SwiftHTTP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 010F0F0020FCC16700F33553 /* SwiftHTTP.framework */; };
23-
010F0F0D20FCC17F00F33553 /* SwiftHTTP.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 010F0F0020FCC16700F33553 /* SwiftHTTP.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2420
010F0F1020FCC1EA00F33553 /* Marshal.framework.dSYM in CopyFiles */ = {isa = PBXBuildFile; fileRef = 010F0F0120FCC16700F33553 /* Marshal.framework.dSYM */; };
2521
010F0F1120FCC1EA00F33553 /* SwiftHTTP.framework.dSYM in CopyFiles */ = {isa = PBXBuildFile; fileRef = 010F0EFF20FCC16600F33553 /* SwiftHTTP.framework.dSYM */; };
2622
010F0F1320FE1DD100F33553 /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 010F0F1220FE1DD100F33553 /* Preferences.swift */; };
@@ -59,30 +55,37 @@
5955
01F46CA12102EF4600FE9DAD /* GereralViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F46CA02102EF4600FE9DAD /* GereralViewController.swift */; };
6056
01F5151A2109F002007C7153 /* LiveStatusTableCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F515192109F002007C7153 /* LiveStatusTableCellView.swift */; };
6157
01F51520210AE330007C7153 /* LiveInfoExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F5151F210AE330007C7153 /* LiveInfoExtension.swift */; };
58+
01F6C4E9213396560009672A /* DevMateKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01F6C4E5213396270009672A /* DevMateKit.framework */; };
59+
01F6C4EB213396560009672A /* DevMateKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 01F6C4E5213396270009672A /* DevMateKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
60+
01F6C4EC213396560009672A /* Marshal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 010F0EFE20FCC16600F33553 /* Marshal.framework */; };
61+
01F6C4ED213396560009672A /* Marshal.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 010F0EFE20FCC16600F33553 /* Marshal.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
62+
01F6C4F02133965E0009672A /* SwiftHTTP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 010F0F0020FCC16700F33553 /* SwiftHTTP.framework */; };
63+
01F6C4F12133965E0009672A /* SwiftHTTP.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 010F0F0020FCC16700F33553 /* SwiftHTTP.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
6264
/* End PBXBuildFile section */
6365

6466
/* Begin PBXCopyFilesBuildPhase section */
65-
010F0F0E20FCC18000F33553 /* Embed Frameworks */ = {
67+
010F0F0F20FCC1D200F33553 /* CopyFiles */ = {
6668
isa = PBXCopyFilesBuildPhase;
6769
buildActionMask = 2147483647;
6870
dstPath = "";
69-
dstSubfolderSpec = 10;
71+
dstSubfolderSpec = 16;
7072
files = (
71-
010F0F0D20FCC17F00F33553 /* SwiftHTTP.framework in Embed Frameworks */,
72-
010F0F0B20FCC17F00F33553 /* Marshal.framework in Embed Frameworks */,
73+
010F0F1020FCC1EA00F33553 /* Marshal.framework.dSYM in CopyFiles */,
74+
010F0F1120FCC1EA00F33553 /* SwiftHTTP.framework.dSYM in CopyFiles */,
7375
);
74-
name = "Embed Frameworks";
7576
runOnlyForDeploymentPostprocessing = 0;
7677
};
77-
010F0F0F20FCC1D200F33553 /* CopyFiles */ = {
78+
01F6C4EA213396560009672A /* Embed Frameworks */ = {
7879
isa = PBXCopyFilesBuildPhase;
7980
buildActionMask = 2147483647;
8081
dstPath = "";
81-
dstSubfolderSpec = 16;
82+
dstSubfolderSpec = 10;
8283
files = (
83-
010F0F1020FCC1EA00F33553 /* Marshal.framework.dSYM in CopyFiles */,
84-
010F0F1120FCC1EA00F33553 /* SwiftHTTP.framework.dSYM in CopyFiles */,
84+
01F6C4F12133965E0009672A /* SwiftHTTP.framework in Embed Frameworks */,
85+
01F6C4EB213396560009672A /* DevMateKit.framework in Embed Frameworks */,
86+
01F6C4ED213396560009672A /* Marshal.framework in Embed Frameworks */,
8587
);
88+
name = "Embed Frameworks";
8689
runOnlyForDeploymentPostprocessing = 0;
8790
};
8891
/* End PBXCopyFilesBuildPhase section */
@@ -142,15 +145,18 @@
142145
01F46CDC2108C55C00FE9DAD /* iina+.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "iina+.entitlements"; sourceTree = "<group>"; };
143146
01F515192109F002007C7153 /* LiveStatusTableCellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveStatusTableCellView.swift; sourceTree = "<group>"; };
144147
01F5151F210AE330007C7153 /* LiveInfoExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveInfoExtension.swift; sourceTree = "<group>"; };
148+
01F6C4E5213396270009672A /* DevMateKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DevMateKit.framework; path = Carthage/Build/Mac/DevMateKit.framework; sourceTree = SOURCE_ROOT; };
149+
01F6C4F2213396B20009672A /* iina+-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "iina+-Bridging-Header.h"; sourceTree = "<group>"; };
145150
/* End PBXFileReference section */
146151

147152
/* Begin PBXFrameworksBuildPhase section */
148153
01AEC8A420EDFD01001406E8 /* Frameworks */ = {
149154
isa = PBXFrameworksBuildPhase;
150155
buildActionMask = 2147483647;
151156
files = (
152-
010F0F0C20FCC17F00F33553 /* SwiftHTTP.framework in Frameworks */,
153-
010F0F0A20FCC17F00F33553 /* Marshal.framework in Frameworks */,
157+
01F6C4F02133965E0009672A /* SwiftHTTP.framework in Frameworks */,
158+
01F6C4E9213396560009672A /* DevMateKit.framework in Frameworks */,
159+
01F6C4EC213396560009672A /* Marshal.framework in Frameworks */,
154160
);
155161
runOnlyForDeploymentPostprocessing = 0;
156162
};
@@ -198,6 +204,7 @@
198204
010F0EFD20FCC15200F33553 /* Frameworks */ = {
199205
isa = PBXGroup;
200206
children = (
207+
01F6C4E5213396270009672A /* DevMateKit.framework */,
201208
010F0EFE20FCC16600F33553 /* Marshal.framework */,
202209
010F0F0020FCC16700F33553 /* SwiftHTTP.framework */,
203210
010F0F0120FCC16700F33553 /* Marshal.framework.dSYM */,
@@ -286,6 +293,7 @@
286293
01AEC8AA20EDFD01001406E8 /* AppDelegate.swift */,
287294
010F0F1220FE1DD100F33553 /* Preferences.swift */,
288295
01AEC8B320EDFD02001406E8 /* Info.plist */,
296+
01F6C4F2213396B20009672A /* iina+-Bridging-Header.h */,
289297
);
290298
path = "iina+";
291299
sourceTree = "<group>";
@@ -322,9 +330,9 @@
322330
01AEC8A320EDFD01001406E8 /* Sources */,
323331
01AEC8A420EDFD01001406E8 /* Frameworks */,
324332
01AEC8A520EDFD01001406E8 /* Resources */,
325-
010F0F0E20FCC18000F33553 /* Embed Frameworks */,
326333
010F0F0F20FCC1D200F33553 /* CopyFiles */,
327334
019BFF5D212485B900E715CC /* ShellScript */,
335+
01F6C4EA213396560009672A /* Embed Frameworks */,
328336
);
329337
buildRules = (
330338
);
@@ -609,9 +617,11 @@
609617
"@executable_path/../Frameworks",
610618
);
611619
MACOSX_DEPLOYMENT_TARGET = 10.12;
612-
PRODUCT_BUNDLE_IDENTIFIER = "com.xjbeta.iina-";
620+
PRODUCT_BUNDLE_IDENTIFIER = "com.xjbeta.iina-plus";
613621
PRODUCT_NAME = "$(TARGET_NAME)";
614622
PROVISIONING_PROFILE_SPECIFIER = "";
623+
SWIFT_OBJC_BRIDGING_HEADER = "iina+/iina+-Bridging-Header.h";
624+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
615625
SWIFT_VERSION = 4.2;
616626
};
617627
name = Debug;
@@ -634,9 +644,10 @@
634644
"@executable_path/../Frameworks",
635645
);
636646
MACOSX_DEPLOYMENT_TARGET = 10.12;
637-
PRODUCT_BUNDLE_IDENTIFIER = "com.xjbeta.iina-";
647+
PRODUCT_BUNDLE_IDENTIFIER = "com.xjbeta.iina-plus";
638648
PRODUCT_NAME = "$(TARGET_NAME)";
639649
PROVISIONING_PROFILE_SPECIFIER = "";
650+
SWIFT_OBJC_BRIDGING_HEADER = "iina+/iina+-Bridging-Header.h";
640651
SWIFT_VERSION = 4.2;
641652
};
642653
name = Release;

‎iina+/AppDelegate.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
2424
req.allHTTPHeaderFields = ["User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.1.2 Safari/605.1.15"]
2525
}
2626

27+
DevMateKit.sendTrackingReport(nil, delegate: nil)
28+
2729
}
2830

2931
func applicationWillTerminate(_ aNotification: Notification) {

‎iina+/Utils/YouGetJSON.swift‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,16 @@ struct Stream: Unmarshaling {
3434
var sig: String = ""
3535
var type: String = ""
3636
var url: String?
37-
var size: String = ""
37+
var videoProfile: String?
38+
var size: Double?
3839
var src: [String] = []
3940

4041
init(object: MarshaledObject) throws {
4142
container = try object.value(for: "container")
4243
let srcArray: [String]? = try? object.value(for: "src")
4344
src = srcArray ?? []
4445
url = try? object.value(for: "url")
46+
videoProfile = try? object.value(for: "video_profile")
47+
size = try? object.value(for: "size")
4548
}
4649
}

‎iina+/Views/Base.lproj/Main.storyboard‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@
2222
<action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>
2323
</connections>
2424
</menuItem>
25+
<menuItem title="Check For Update" id="T8d-hC-pea">
26+
<modifierMask key="keyEquivalentModifierMask"/>
27+
<connections>
28+
<action selector="checkForUpdates:" target="dO5-7Y-WGR" id="txt-bu-6Lt"/>
29+
</connections>
30+
</menuItem>
2531
<menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
2632
<menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW">
2733
<connections>
@@ -235,6 +241,7 @@
235241
</connections>
236242
</application>
237243
<customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="iina_" customModuleProvider="target"/>
244+
<customObject id="dO5-7Y-WGR" customClass="SUUpdater"/>
238245
<customObject id="YLy-65-1bz" customClass="NSFontManager"/>
239246
<customObject id="XfU-aw-sKA" customClass="MainMenu" customModule="iina_" customModuleProvider="target"/>
240247
<customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
@@ -867,7 +874,7 @@
867874
<rect key="frame" x="0.0" y="0.0" width="400" height="649"/>
868875
<font key="font" metaFont="system"/>
869876
<tabViewItems>
870-
<tabViewItem label="Bookmarks" identifier="Bookmarks" id="fmm-kw-xbx" userLabel="Bookmarks">
877+
<tabViewItem label="bookmarks" identifier="bookmarks" id="fmm-kw-xbx" userLabel="Bookmarks">
871878
<view key="view" id="qi8-ue-hZX">
872879
<rect key="frame" x="0.0" y="0.0" width="400" height="649"/>
873880
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -1026,7 +1033,7 @@
10261033
</constraints>
10271034
</view>
10281035
</tabViewItem>
1029-
<tabViewItem label="Bilibili" identifier="Bilibili" id="tzg-rU-KII">
1036+
<tabViewItem label="bilibili" identifier="bilibili" id="tzg-rU-KII">
10301037
<view key="view" id="n1W-9O-2h1">
10311038
<rect key="frame" x="0.0" y="0.0" width="400" height="649"/>
10321039
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -1035,7 +1042,7 @@
10351042
<rect key="frame" x="0.0" y="0.0" width="400" height="649"/>
10361043
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="cNc-cP-Jc0">
10371044
<rect key="frame" x="0.0" y="0.0" width="400" height="649"/>
1038-
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1045+
<autoresizingMask key="autoresizingMask"/>
10391046
<subviews>
10401047
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="none" columnReordering="NO" columnSelection="YES" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="110" rowSizeStyle="automatic" viewBased="YES" id="H7N-WI-EUW">
10411048
<rect key="frame" x="0.0" y="0.0" width="400" height="641"/>
@@ -1202,7 +1209,7 @@
12021209
</constraints>
12031210
</view>
12041211
</tabViewItem>
1205-
<tabViewItem label="Search" identifier="Search" id="b8j-z5-B7Q" userLabel="Search">
1212+
<tabViewItem label="search" identifier="search" id="b8j-z5-B7Q" userLabel="Search">
12061213
<view key="view" id="izq-M8-HsP">
12071214
<rect key="frame" x="0.0" y="0.0" width="400" height="649"/>
12081215
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -1222,7 +1229,7 @@
12221229
<rect key="frame" x="20" y="20" width="360" height="570"/>
12231230
<clipView key="contentView" drawsBackground="NO" id="UI5-GE-yfn">
12241231
<rect key="frame" x="0.0" y="0.0" width="360" height="570"/>
1225-
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1232+
<autoresizingMask key="autoresizingMask"/>
12261233
<subviews>
12271234
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="none" columnReordering="NO" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="30" rowSizeStyle="automatic" viewBased="YES" id="XaB-Al-kaU" customClass="SuggestionsTableView" customModule="iina_" customModuleProvider="target">
12281235
<rect key="frame" x="0.0" y="0.0" width="360" height="570"/>
@@ -1330,7 +1337,7 @@
13301337
</constraints>
13311338
</view>
13321339
</tabViewItem>
1333-
<tabViewItem label="SelectVideos" identifier="SelectVideos" id="gnN-wP-ZUv">
1340+
<tabViewItem label="selectVideos" identifier="selectVideos" id="gnN-wP-ZUv">
13341341
<view key="view" id="cz5-5j-ukf">
13351342
<rect key="frame" x="0.0" y="0.0" width="400" height="649"/>
13361343
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>

‎iina+/Views/Identifiers.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ extension NSUserInterfaceItemIdentifier {
3232
extension Notification.Name {
3333
static let reloadMainWindowTableView = Notification.Name("com.xjbeta.iina+.ReloadMainWindowTableView")
3434
static let sideBarSelectionChanged = Notification.Name("com.xjbeta.iina+.SideBarSelectionChanged")
35-
static let startSearch = Notification.Name("com.xjbeta.iina+.StartSearch")
35+
static let updateSideBarSelection = Notification.Name("com.xjbeta.iina+.updateSideBarSelection")
3636
static let progressStatusChanged = Notification.Name("com.xjbeta.iina+.ProgressStatusChanged")
3737
static let biliStatusChanged = Notification.Name("com.xjbeta.iina+.BiliStatusChanged")
3838
}

‎iina+/Views/MainMenu.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,5 @@ class MainMenu: NSObject, NSMenuItemValidation {
6666
NSWorkspace.shared.open(url)
6767
}
6868
}
69-
69+
7070
}

0 commit comments

Comments
 (0)