From bf79902b42c928fac81db5da61e875fa6b7e477d Mon Sep 17 00:00:00 2001 From: jhays Date: Thu, 20 Jan 2022 09:28:35 -0600 Subject: [PATCH] swiftformat --- .../LiveTVChannelsCoordinator.swift | 2 +- .../LiveTVProgramsCoordinator.swift | 2 +- .../ViewModels/LiveTVChannelsViewModel.swift | 24 ++++++------- .../ViewModels/LiveTVProgramsViewModel.swift | 24 ++++++------- .../VideoPlayerViewModel.swift | 4 +-- Swiftfin tvOS/Views/LiveTVChannelsView.swift | 6 ++-- Swiftfin tvOS/Views/LiveTVProgramsView.swift | 36 +++++++++---------- .../VideoPlayer/VLCPlayerViewController.swift | 4 +-- .../VideoPlayer/VLCPlayerViewController.swift | 4 +-- 9 files changed, 53 insertions(+), 53 deletions(-) diff --git a/Shared/Coordinators/LiveTVChannelsCoordinator.swift b/Shared/Coordinators/LiveTVChannelsCoordinator.swift index 57b22475..2f390c9c 100644 --- a/Shared/Coordinators/LiveTVChannelsCoordinator.swift +++ b/Shared/Coordinators/LiveTVChannelsCoordinator.swift @@ -26,7 +26,7 @@ final class LiveTVChannelsCoordinator: NavigationCoordinatable { } func makeVideoPlayer(viewModel: VideoPlayerViewModel) -> NavigationViewCoordinator { - NavigationViewCoordinator(VideoPlayerCoordinator(viewModel: viewModel)) + NavigationViewCoordinator(VideoPlayerCoordinator(viewModel: viewModel)) } @ViewBuilder diff --git a/Shared/Coordinators/LiveTVProgramsCoordinator.swift b/Shared/Coordinators/LiveTVProgramsCoordinator.swift index b52cfead..9c08a7ca 100644 --- a/Shared/Coordinators/LiveTVProgramsCoordinator.swift +++ b/Shared/Coordinators/LiveTVProgramsCoordinator.swift @@ -21,7 +21,7 @@ final class LiveTVProgramsCoordinator: NavigationCoordinatable { var videoPlayer = makeVideoPlayer func makeVideoPlayer(viewModel: VideoPlayerViewModel) -> NavigationViewCoordinator { - NavigationViewCoordinator(VideoPlayerCoordinator(viewModel: viewModel)) + NavigationViewCoordinator(VideoPlayerCoordinator(viewModel: viewModel)) } @ViewBuilder diff --git a/Shared/ViewModels/LiveTVChannelsViewModel.swift b/Shared/ViewModels/LiveTVChannelsViewModel.swift index 032b5f6d..70b95066 100644 --- a/Shared/ViewModels/LiveTVChannelsViewModel.swift +++ b/Shared/ViewModels/LiveTVChannelsViewModel.swift @@ -189,18 +189,18 @@ final class LiveTVChannelsViewModel: ViewModel { func stopScheduleCheckTimer() { timer?.invalidate() } - - func fetchVideoPlayerViewModel(item: BaseItemDto, completion: @escaping (VideoPlayerViewModel)->Void) { - item.createVideoPlayerViewModel() - .sink { completion in - self.handleAPIRequestError(completion: completion) - } receiveValue: { videoPlayerViewModels in - if let viewModel = videoPlayerViewModels.first { - completion(viewModel) - } - } - .store(in: &self.cancellables) - } + + func fetchVideoPlayerViewModel(item: BaseItemDto, completion: @escaping (VideoPlayerViewModel) -> Void) { + item.createVideoPlayerViewModel() + .sink { completion in + self.handleAPIRequestError(completion: completion) + } receiveValue: { videoPlayerViewModels in + if let viewModel = videoPlayerViewModels.first { + completion(viewModel) + } + } + .store(in: &self.cancellables) + } } extension Array { diff --git a/Shared/ViewModels/LiveTVProgramsViewModel.swift b/Shared/ViewModels/LiveTVProgramsViewModel.swift index e2f027c9..51be71cc 100644 --- a/Shared/ViewModels/LiveTVProgramsViewModel.swift +++ b/Shared/ViewModels/LiveTVProgramsViewModel.swift @@ -197,16 +197,16 @@ final class LiveTVProgramsViewModel: ViewModel { }) .store(in: &cancellables) } - - func fetchVideoPlayerViewModel(item: BaseItemDto, completion: @escaping (VideoPlayerViewModel)->Void) { - item.createVideoPlayerViewModel() - .sink { completion in - self.handleAPIRequestError(completion: completion) - } receiveValue: { videoPlayerViewModels in - if let viewModel = videoPlayerViewModels.first { - completion(viewModel) - } - } - .store(in: &self.cancellables) - } + + func fetchVideoPlayerViewModel(item: BaseItemDto, completion: @escaping (VideoPlayerViewModel) -> Void) { + item.createVideoPlayerViewModel() + .sink { completion in + self.handleAPIRequestError(completion: completion) + } receiveValue: { videoPlayerViewModels in + if let viewModel = videoPlayerViewModels.first { + completion(viewModel) + } + } + .store(in: &self.cancellables) + } } diff --git a/Shared/ViewModels/VideoPlayerViewModel/VideoPlayerViewModel.swift b/Shared/ViewModels/VideoPlayerViewModel/VideoPlayerViewModel.swift index c1daadb7..a7988db8 100644 --- a/Shared/ViewModels/VideoPlayerViewModel/VideoPlayerViewModel.swift +++ b/Shared/ViewModels/VideoPlayerViewModel/VideoPlayerViewModel.swift @@ -140,7 +140,7 @@ final class VideoPlayerViewModel: ViewModel { // MARK: Current Time var currentSeconds: Double { - let runTimeTicks = item.runTimeTicks ?? 0 + let runTimeTicks = item.runTimeTicks ?? 0 let videoDuration = Double(runTimeTicks / 10_000_000) return round(sliderPercentage * videoDuration) } @@ -257,7 +257,7 @@ final class VideoPlayerViewModel: ViewModel { } private func sliderPercentageChanged(newValue: Double) { - let runTimeTicks = item.runTimeTicks ?? 0 + let runTimeTicks = item.runTimeTicks ?? 0 let videoDuration = Double(runTimeTicks / 10_000_000) let secondsScrubbedRemaining = videoDuration - currentSeconds diff --git a/Swiftfin tvOS/Views/LiveTVChannelsView.swift b/Swiftfin tvOS/Views/LiveTVChannelsView.swift index 29730670..fd778587 100644 --- a/Swiftfin tvOS/Views/LiveTVChannelsView.swift +++ b/Swiftfin tvOS/Views/LiveTVChannelsView.swift @@ -55,9 +55,9 @@ struct LiveTVChannelsView: View { let channel = item.channel if channel.type != "Folder" { Button { - self.viewModel.fetchVideoPlayerViewModel(item: channel) { playerViewModel in - self.router.route(to: \.videoPlayer, playerViewModel) - } + self.viewModel.fetchVideoPlayerViewModel(item: channel) { playerViewModel in + self.router.route(to: \.videoPlayer, playerViewModel) + } } label: { LiveTVChannelItemElement(channel: channel, program: item.program, diff --git a/Swiftfin tvOS/Views/LiveTVProgramsView.swift b/Swiftfin tvOS/Views/LiveTVProgramsView.swift index ca41bb47..3a926316 100644 --- a/Swiftfin tvOS/Views/LiveTVProgramsView.swift +++ b/Swiftfin tvOS/Views/LiveTVProgramsView.swift @@ -33,9 +33,9 @@ struct LiveTVProgramsView: View { if let chanId = item.channelId, let chan = viewModel.findChannel(id: chanId) { - self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in - self.programsRouter.route(to: \.videoPlayer, playerViewModel) - } + self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in + self.programsRouter.route(to: \.videoPlayer, playerViewModel) + } } } label: { LandscapeItemElement(item: item) @@ -61,9 +61,9 @@ struct LiveTVProgramsView: View { if let chanId = item.channelId, let chan = viewModel.findChannel(id: chanId) { - self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in - self.programsRouter.route(to: \.videoPlayer, playerViewModel) - } + self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in + self.programsRouter.route(to: \.videoPlayer, playerViewModel) + } } } label: { LandscapeItemElement(item: item) @@ -89,9 +89,9 @@ struct LiveTVProgramsView: View { if let chanId = item.channelId, let chan = viewModel.findChannel(id: chanId) { - self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in - self.programsRouter.route(to: \.videoPlayer, playerViewModel) - } + self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in + self.programsRouter.route(to: \.videoPlayer, playerViewModel) + } } } label: { LandscapeItemElement(item: item) @@ -117,9 +117,9 @@ struct LiveTVProgramsView: View { if let chanId = item.channelId, let chan = viewModel.findChannel(id: chanId) { - self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in - self.programsRouter.route(to: \.videoPlayer, playerViewModel) - } + self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in + self.programsRouter.route(to: \.videoPlayer, playerViewModel) + } } } label: { LandscapeItemElement(item: item) @@ -145,9 +145,9 @@ struct LiveTVProgramsView: View { if let chanId = item.channelId, let chan = viewModel.findChannel(id: chanId) { - self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in - self.programsRouter.route(to: \.videoPlayer, playerViewModel) - } + self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in + self.programsRouter.route(to: \.videoPlayer, playerViewModel) + } } } label: { LandscapeItemElement(item: item) @@ -173,9 +173,9 @@ struct LiveTVProgramsView: View { if let chanId = item.channelId, let chan = viewModel.findChannel(id: chanId) { - self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in - self.programsRouter.route(to: \.videoPlayer, playerViewModel) - } + self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in + self.programsRouter.route(to: \.videoPlayer, playerViewModel) + } } } label: { LandscapeItemElement(item: item) diff --git a/Swiftfin tvOS/Views/VideoPlayer/VLCPlayerViewController.swift b/Swiftfin tvOS/Views/VideoPlayer/VLCPlayerViewController.swift index 72a55a1b..058bd4a9 100644 --- a/Swiftfin tvOS/Views/VideoPlayer/VLCPlayerViewController.swift +++ b/Swiftfin tvOS/Views/VideoPlayer/VLCPlayerViewController.swift @@ -450,7 +450,7 @@ extension VLCPlayerViewController { if startPercentage > 0 { if viewModel.resumeOffset { - let runTimeTicks = viewModel.item.runTimeTicks ?? 0 + let runTimeTicks = viewModel.item.runTimeTicks ?? 0 let videoDurationSeconds = Double(runTimeTicks / 10_000_000) var startSeconds = round((startPercentage / 100) * videoDurationSeconds) startSeconds = startSeconds.subtract(5, floor: 0) @@ -523,7 +523,7 @@ extension VLCPlayerViewController { // Necessary math as VLCMediaPlayer doesn't work well // by just setting the position let videoPosition = Double(vlcMediaPlayer.time.intValue / 1000) - let runTimeTicks = viewModel.item.runTimeTicks ?? 0 + let runTimeTicks = viewModel.item.runTimeTicks ?? 0 let videoDuration = Double(runTimeTicks / 10_000_000) let secondsScrubbedTo = round(viewModel.sliderPercentage * videoDuration) let newPositionOffset = secondsScrubbedTo - videoPosition diff --git a/Swiftfin/Views/VideoPlayer/VLCPlayerViewController.swift b/Swiftfin/Views/VideoPlayer/VLCPlayerViewController.swift index 6af96917..1849e9b7 100644 --- a/Swiftfin/Views/VideoPlayer/VLCPlayerViewController.swift +++ b/Swiftfin/Views/VideoPlayer/VLCPlayerViewController.swift @@ -410,7 +410,7 @@ extension VLCPlayerViewController { if startPercentage > 0 { if viewModel.resumeOffset { - let runTimeTicks = item.runTimeTicks ?? 0 + let runTimeTicks = item.runTimeTicks ?? 0 let videoDurationSeconds = Double(runTimeTicks / 10_000_000) var startSeconds = round((startPercentage / 100) * videoDurationSeconds) startSeconds = startSeconds.subtract(5, floor: 0) @@ -491,7 +491,7 @@ extension VLCPlayerViewController { func setMediaPlayerTimeAtCurrentSlider() { // Necessary math as VLCMediaPlayer doesn't work well // by just setting the position - let runTimeTicks = item.runTimeTicks ?? 0 + let runTimeTicks = item.runTimeTicks ?? 0 let videoPosition = Double(vlcMediaPlayer.time.intValue / 1000) let videoDuration = Double(runTimeTicks / 10_000_000) let secondsScrubbedTo = round(viewModel.sliderPercentage * videoDuration)