ashikk
/
jellyflood
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

swiftlint autocorrect

This commit is contained in:
PangMo5 2021-11-08 03:53:42 +09:00
parent 6307ae4e26
commit 923af3f013
80 changed files with 396 additions and 404 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
JellyfinPlayer/App/AppDelegate.swift
View File

@ -16,7 +16,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
// Lazily initialize datastack // Lazily initialize datastack
let _ = SwiftfinStore.dataStack _ = SwiftfinStore.dataStack
return true return true
} }

3
JellyfinPlayer/AppURLHandler/AppURLHandler.swift
View File

@ -77,8 +77,7 @@ extension AppURLHandler {
// /Users/{UserID}/Items/{ItemID} // /Users/{UserID}/Items/{ItemID}
if url.pathComponents[safe: 2]?.lowercased() == "items", if url.pathComponents[safe: 2]?.lowercased() == "items",
let userID = url.pathComponents[safe: 1], let userID = url.pathComponents[safe: 1],
let itemID = url.pathComponents[safe: 3] let itemID = url.pathComponents[safe: 3] {
{
// It would be nice if the ItemViewModel could be initialized to id later. // It would be nice if the ItemViewModel could be initialized to id later.
getItem(userID: userID, itemID: itemID) { item in getItem(userID: userID, itemID: itemID) { item in
guard let item = item else { return } guard let item = item else { return }

2
JellyfinPlayer/Views/ItemView/ItemView.swift
View File

@ -28,7 +28,7 @@ struct ItemNavigationView: View {
} }
} }
fileprivate struct ItemView: View { private struct ItemView: View {
@EnvironmentObject var itemRouter: ItemCoordinator.Router @EnvironmentObject var itemRouter: ItemCoordinator.Router
@State private var videoIsLoading: Bool = false // This variable is only changed by the underlying VLC view. @State private var videoIsLoading: Bool = false // This variable is only changed by the underlying VLC view.

16
JellyfinPlayer/Views/VideoPlayer/VideoPlayer.swift
View File

@ -153,7 +153,7 @@ class PlayerViewController: UIViewController, GCKDiscoveryManagerListener, GCKRe
sendProgressReport(eventName: "unpause") sendProgressReport(eventName: "unpause")
} else { } else {
sendJellyfinCommand(command: "Seek", options: [ sendJellyfinCommand(command: "Seek", options: [
"position": Int(secondsScrubbedTo), "position": Int(secondsScrubbedTo)
]) ])
} }
} }
@ -664,8 +664,7 @@ class PlayerViewController: UIViewController, GCKDiscoveryManagerListener, GCKRe
subtitleTrackArray.forEach { subtitle in subtitleTrackArray.forEach { subtitle in
if Defaults[.isAutoSelectSubtitles] { if Defaults[.isAutoSelectSubtitles] {
if Defaults[.autoSelectSubtitlesLangCode] == "Auto", if Defaults[.autoSelectSubtitlesLangCode] == "Auto",
subtitle.languageCode.contains(Locale.current.languageCode ?? "") subtitle.languageCode.contains(Locale.current.languageCode ?? "") {
{
selectedCaptionTrack = subtitle.id selectedCaptionTrack = subtitle.id
mediaPlayer.currentVideoSubTitleIndex = subtitle.id mediaPlayer.currentVideoSubTitleIndex = subtitle.id
} else if subtitle.languageCode.contains(Defaults[.autoSelectSubtitlesLangCode]) { } else if subtitle.languageCode.contains(Defaults[.autoSelectSubtitlesLangCode]) {
@ -854,7 +853,7 @@ extension PlayerViewController: GCKGenericChannelDelegate {
if hasSentRemoteSeek == false { if hasSentRemoteSeek == false {
hasSentRemoteSeek = true hasSentRemoteSeek = true
sendJellyfinCommand(command: "Seek", options: [ sendJellyfinCommand(command: "Seek", options: [
"position": Int(Float(manifest.runTimeTicks! / 10_000_000) * mediaPlayer.position), "position": Int(Float(manifest.runTimeTicks! / 10_000_000) * mediaPlayer.position)
]) ])
} }
} }
@ -880,7 +879,7 @@ extension PlayerViewController: GCKGenericChannelDelegate {
"serverId": SessionManager.main.currentLogin.server.id, "serverId": SessionManager.main.currentLogin.server.id,
"serverVersion": "10.8.0", "serverVersion": "10.8.0",
"receiverName": castSessionManager.currentCastSession!.device.friendlyName!, "receiverName": castSessionManager.currentCastSession!.device.friendlyName!,
"subtitleBurnIn": false, "subtitleBurnIn": false
] ]
let jsonData = JSON(payload) let jsonData = JSON(payload)
@ -935,8 +934,8 @@ extension PlayerViewController: GCKSessionManagerListener {
"Name": manifest.name!, "Name": manifest.name!,
"Type": manifest.type!, "Type": manifest.type!,
"MediaType": manifest.mediaType!, "MediaType": manifest.mediaType!,
"IsFolder": manifest.isFolder!, "IsFolder": manifest.isFolder!
]], ]]
] ]
sendJellyfinCommand(command: "PlayNow", options: playNowOptions) sendJellyfinCommand(command: "PlayNow", options: playNowOptions)
} }
@ -1104,8 +1103,7 @@ struct VLCPlayerWithControls: UIViewControllerRepresentable {
typealias UIViewControllerType = PlayerViewController typealias UIViewControllerType = PlayerViewController
func makeUIViewController(context: UIViewControllerRepresentableContext<VLCPlayerWithControls>) -> VLCPlayerWithControls func makeUIViewController(context: UIViewControllerRepresentableContext<VLCPlayerWithControls>) -> VLCPlayerWithControls
.UIViewControllerType .UIViewControllerType {
{
let storyboard = UIStoryboard(name: "VideoPlayer", bundle: nil) let storyboard = UIStoryboard(name: "VideoPlayer", bundle: nil)
let customViewController = storyboard.instantiateViewController(withIdentifier: "VideoPlayer") as! PlayerViewController let customViewController = storyboard.instantiateViewController(withIdentifier: "VideoPlayer") as! PlayerViewController
customViewController.manifest = item customViewController.manifest = item

1
Shared/Extensions/JellyfinAPIExtensions/BaseItemPersonExtensions.swift
View File

@ -29,7 +29,6 @@ extension BaseItemPerson {
return imageBlurHashes?.primary?[imgTag] ?? "001fC^" return imageBlurHashes?.primary?[imgTag] ?? "001fC^"
} }
// MARK: First Role // MARK: First Role
// Jellyfin will grab all roles the person played in the show which makes the role // Jellyfin will grab all roles the person played in the show which makes the role

3
Shared/Objects/DetailItem.swift
View File

@ -22,7 +22,4 @@ struct DetailItem {
let baseItem: BaseItemDto let baseItem: BaseItemDto
let type: DetailItemType let type: DetailItemType
} }

1
Shared/ViewModels/LibraryViewModel.swift
View File

@ -64,7 +64,6 @@ final class LibraryViewModel: ViewModel {
self.columns = columns self.columns = columns
super.init() super.init()
$filters $filters
.sink(receiveValue: requestItems(with:)) .sink(receiveValue: requestItems(with:))
.store(in: &cancellables) .store(in: &cancellables)

12
WidgetExtension/NextUpWidget.swift
View File

@ -365,7 +365,7 @@ struct NextUpWidget_Previews: PreviewProvider {
(.init(name: "Name0", indexNumber: 10, parentIndexNumber: 0, seriesName: "Series0"), (.init(name: "Name0", indexNumber: 10, parentIndexNumber: 0, seriesName: "Series0"),
UIImage(named: "WidgetHeaderSymbol")), UIImage(named: "WidgetHeaderSymbol")),
(.init(name: "Name1", indexNumber: 10, parentIndexNumber: 0, seriesName: "Series1"), (.init(name: "Name1", indexNumber: 10, parentIndexNumber: 0, seriesName: "Series1"),
UIImage(named: "WidgetHeaderSymbol")), UIImage(named: "WidgetHeaderSymbol"))
], ],
error: nil)) error: nil))
.previewContext(WidgetPreviewContext(family: .systemMedium)) .previewContext(WidgetPreviewContext(family: .systemMedium))
@ -376,7 +376,7 @@ struct NextUpWidget_Previews: PreviewProvider {
(.init(name: "Name1", indexNumber: 10, parentIndexNumber: 0, seriesName: "Series1"), (.init(name: "Name1", indexNumber: 10, parentIndexNumber: 0, seriesName: "Series1"),
UIImage(named: "WidgetHeaderSymbol")), UIImage(named: "WidgetHeaderSymbol")),
(.init(name: "Name2", indexNumber: 10, parentIndexNumber: 0, seriesName: "Series2"), (.init(name: "Name2", indexNumber: 10, parentIndexNumber: 0, seriesName: "Series2"),
UIImage(named: "WidgetHeaderSymbol")), UIImage(named: "WidgetHeaderSymbol"))
], ],
error: nil)) error: nil))
.previewContext(WidgetPreviewContext(family: .systemLarge)) .previewContext(WidgetPreviewContext(family: .systemLarge))
@ -391,7 +391,7 @@ struct NextUpWidget_Previews: PreviewProvider {
(.init(name: "Name0", indexNumber: 10, parentIndexNumber: 0, seriesName: "Series0"), (.init(name: "Name0", indexNumber: 10, parentIndexNumber: 0, seriesName: "Series0"),
UIImage(named: "WidgetHeaderSymbol")), UIImage(named: "WidgetHeaderSymbol")),
(.init(name: "Name1", indexNumber: 10, parentIndexNumber: 0, seriesName: "Series1"), (.init(name: "Name1", indexNumber: 10, parentIndexNumber: 0, seriesName: "Series1"),
UIImage(named: "WidgetHeaderSymbol")), UIImage(named: "WidgetHeaderSymbol"))
], ],
error: nil)) error: nil))
.previewContext(WidgetPreviewContext(family: .systemMedium)) .previewContext(WidgetPreviewContext(family: .systemMedium))
@ -403,7 +403,7 @@ struct NextUpWidget_Previews: PreviewProvider {
(.init(name: "Name1", indexNumber: 10, parentIndexNumber: 0, seriesName: "Series1"), (.init(name: "Name1", indexNumber: 10, parentIndexNumber: 0, seriesName: "Series1"),
UIImage(named: "WidgetHeaderSymbol")), UIImage(named: "WidgetHeaderSymbol")),
(.init(name: "Name2", indexNumber: 10, parentIndexNumber: 0, seriesName: "Series2"), (.init(name: "Name2", indexNumber: 10, parentIndexNumber: 0, seriesName: "Series2"),
UIImage(named: "WidgetHeaderSymbol")), UIImage(named: "WidgetHeaderSymbol"))
], ],
error: nil)) error: nil))
.previewContext(WidgetPreviewContext(family: .systemLarge)) .previewContext(WidgetPreviewContext(family: .systemLarge))
@ -416,7 +416,7 @@ struct NextUpWidget_Previews: PreviewProvider {
NextUpEntryView(entry: .init(date: Date(), NextUpEntryView(entry: .init(date: Date(),
items: [ items: [
(.init(name: "Name0", indexNumber: 10, parentIndexNumber: 0, seriesName: "Series0"), (.init(name: "Name0", indexNumber: 10, parentIndexNumber: 0, seriesName: "Series0"),
UIImage(named: "WidgetHeaderSymbol")), UIImage(named: "WidgetHeaderSymbol"))
], ],
error: nil)) error: nil))
.previewContext(WidgetPreviewContext(family: .systemMedium)) .previewContext(WidgetPreviewContext(family: .systemMedium))
@ -426,7 +426,7 @@ struct NextUpWidget_Previews: PreviewProvider {
(.init(name: "Name0", indexNumber: 10, parentIndexNumber: 0, seriesName: "Series0"), (.init(name: "Name0", indexNumber: 10, parentIndexNumber: 0, seriesName: "Series0"),
UIImage(named: "WidgetHeaderSymbol")), UIImage(named: "WidgetHeaderSymbol")),
(.init(name: "Name1", indexNumber: 10, parentIndexNumber: 0, seriesName: "Series1"), (.init(name: "Name1", indexNumber: 10, parentIndexNumber: 0, seriesName: "Series1"),
UIImage(named: "WidgetHeaderSymbol")), UIImage(named: "WidgetHeaderSymbol"))
], ],
error: nil)) error: nil))
.previewContext(WidgetPreviewContext(family: .systemLarge)) .previewContext(WidgetPreviewContext(family: .systemLarge))