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

swiftformat

This commit is contained in:
jhays 2022-01-20 09:28:35 -06:00
parent dd7ac40aaf
commit bf79902b42
9 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shared/Coordinators/LiveTVChannelsCoordinator.swift
View File

@ -26,7 +26,7 @@ final class LiveTVChannelsCoordinator: NavigationCoordinatable {
} }
func makeVideoPlayer(viewModel: VideoPlayerViewModel) -> NavigationViewCoordinator<VideoPlayerCoordinator> { func makeVideoPlayer(viewModel: VideoPlayerViewModel) -> NavigationViewCoordinator<VideoPlayerCoordinator> {
NavigationViewCoordinator(VideoPlayerCoordinator(viewModel: viewModel)) NavigationViewCoordinator(VideoPlayerCoordinator(viewModel: viewModel))
} }
@ViewBuilder @ViewBuilder

2
Shared/Coordinators/LiveTVProgramsCoordinator.swift
View File

@ -21,7 +21,7 @@ final class LiveTVProgramsCoordinator: NavigationCoordinatable {
var videoPlayer = makeVideoPlayer var videoPlayer = makeVideoPlayer
func makeVideoPlayer(viewModel: VideoPlayerViewModel) -> NavigationViewCoordinator<VideoPlayerCoordinator> { func makeVideoPlayer(viewModel: VideoPlayerViewModel) -> NavigationViewCoordinator<VideoPlayerCoordinator> {
NavigationViewCoordinator(VideoPlayerCoordinator(viewModel: viewModel)) NavigationViewCoordinator(VideoPlayerCoordinator(viewModel: viewModel))
} }
@ViewBuilder @ViewBuilder

24
Shared/ViewModels/LiveTVChannelsViewModel.swift
View File

@ -189,18 +189,18 @@ final class LiveTVChannelsViewModel: ViewModel {
func stopScheduleCheckTimer() { func stopScheduleCheckTimer() {
timer?.invalidate() timer?.invalidate()
} }
func fetchVideoPlayerViewModel(item: BaseItemDto, completion: @escaping (VideoPlayerViewModel)->Void) { func fetchVideoPlayerViewModel(item: BaseItemDto, completion: @escaping (VideoPlayerViewModel) -> Void) {
item.createVideoPlayerViewModel() item.createVideoPlayerViewModel()
.sink { completion in .sink { completion in
self.handleAPIRequestError(completion: completion) self.handleAPIRequestError(completion: completion)
} receiveValue: { videoPlayerViewModels in } receiveValue: { videoPlayerViewModels in
if let viewModel = videoPlayerViewModels.first { if let viewModel = videoPlayerViewModels.first {
completion(viewModel) completion(viewModel)
} }
} }
.store(in: &self.cancellables) .store(in: &self.cancellables)
} }
} }
extension Array { extension Array {

24
Shared/ViewModels/LiveTVProgramsViewModel.swift
View File

@ -197,16 +197,16 @@ final class LiveTVProgramsViewModel: ViewModel {
}) })
.store(in: &cancellables) .store(in: &cancellables)
} }
func fetchVideoPlayerViewModel(item: BaseItemDto, completion: @escaping (VideoPlayerViewModel)->Void) { func fetchVideoPlayerViewModel(item: BaseItemDto, completion: @escaping (VideoPlayerViewModel) -> Void) {
item.createVideoPlayerViewModel() item.createVideoPlayerViewModel()
.sink { completion in .sink { completion in
self.handleAPIRequestError(completion: completion) self.handleAPIRequestError(completion: completion)
} receiveValue: { videoPlayerViewModels in } receiveValue: { videoPlayerViewModels in
if let viewModel = videoPlayerViewModels.first { if let viewModel = videoPlayerViewModels.first {
completion(viewModel) completion(viewModel)
} }
} }
.store(in: &self.cancellables) .store(in: &self.cancellables)
} }
} }

4
Shared/ViewModels/VideoPlayerViewModel/VideoPlayerViewModel.swift
View File

@ -140,7 +140,7 @@ final class VideoPlayerViewModel: ViewModel {
// MARK: Current Time // MARK: Current Time
var currentSeconds: Double { var currentSeconds: Double {
let runTimeTicks = item.runTimeTicks ?? 0 let runTimeTicks = item.runTimeTicks ?? 0
let videoDuration = Double(runTimeTicks / 10_000_000) let videoDuration = Double(runTimeTicks / 10_000_000)
return round(sliderPercentage * videoDuration) return round(sliderPercentage * videoDuration)
} }
@ -257,7 +257,7 @@ final class VideoPlayerViewModel: ViewModel {
} }
private func sliderPercentageChanged(newValue: Double) { private func sliderPercentageChanged(newValue: Double) {
let runTimeTicks = item.runTimeTicks ?? 0 let runTimeTicks = item.runTimeTicks ?? 0
let videoDuration = Double(runTimeTicks / 10_000_000) let videoDuration = Double(runTimeTicks / 10_000_000)
let secondsScrubbedRemaining = videoDuration - currentSeconds let secondsScrubbedRemaining = videoDuration - currentSeconds

6
Swiftfin tvOS/Views/LiveTVChannelsView.swift
View File

@ -55,9 +55,9 @@ struct LiveTVChannelsView: View {
let channel = item.channel let channel = item.channel
if channel.type != "Folder" { if channel.type != "Folder" {
Button { Button {
self.viewModel.fetchVideoPlayerViewModel(item: channel) { playerViewModel in self.viewModel.fetchVideoPlayerViewModel(item: channel) { playerViewModel in
self.router.route(to: \.videoPlayer, playerViewModel) self.router.route(to: \.videoPlayer, playerViewModel)
} }
} label: { } label: {
LiveTVChannelItemElement(channel: channel, LiveTVChannelItemElement(channel: channel,
program: item.program, program: item.program,

36
Swiftfin tvOS/Views/LiveTVProgramsView.swift
View File

@ -33,9 +33,9 @@ struct LiveTVProgramsView: View {
if let chanId = item.channelId, if let chanId = item.channelId,
let chan = viewModel.findChannel(id: chanId) let chan = viewModel.findChannel(id: chanId)
{ {
self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in
self.programsRouter.route(to: \.videoPlayer, playerViewModel) self.programsRouter.route(to: \.videoPlayer, playerViewModel)
} }
} }
} label: { } label: {
LandscapeItemElement(item: item) LandscapeItemElement(item: item)
@ -61,9 +61,9 @@ struct LiveTVProgramsView: View {
if let chanId = item.channelId, if let chanId = item.channelId,
let chan = viewModel.findChannel(id: chanId) let chan = viewModel.findChannel(id: chanId)
{ {
self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in
self.programsRouter.route(to: \.videoPlayer, playerViewModel) self.programsRouter.route(to: \.videoPlayer, playerViewModel)
} }
} }
} label: { } label: {
LandscapeItemElement(item: item) LandscapeItemElement(item: item)
@ -89,9 +89,9 @@ struct LiveTVProgramsView: View {
if let chanId = item.channelId, if let chanId = item.channelId,
let chan = viewModel.findChannel(id: chanId) let chan = viewModel.findChannel(id: chanId)
{ {
self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in
self.programsRouter.route(to: \.videoPlayer, playerViewModel) self.programsRouter.route(to: \.videoPlayer, playerViewModel)
} }
} }
} label: { } label: {
LandscapeItemElement(item: item) LandscapeItemElement(item: item)
@ -117,9 +117,9 @@ struct LiveTVProgramsView: View {
if let chanId = item.channelId, if let chanId = item.channelId,
let chan = viewModel.findChannel(id: chanId) let chan = viewModel.findChannel(id: chanId)
{ {
self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in
self.programsRouter.route(to: \.videoPlayer, playerViewModel) self.programsRouter.route(to: \.videoPlayer, playerViewModel)
} }
} }
} label: { } label: {
LandscapeItemElement(item: item) LandscapeItemElement(item: item)
@ -145,9 +145,9 @@ struct LiveTVProgramsView: View {
if let chanId = item.channelId, if let chanId = item.channelId,
let chan = viewModel.findChannel(id: chanId) let chan = viewModel.findChannel(id: chanId)
{ {
self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in
self.programsRouter.route(to: \.videoPlayer, playerViewModel) self.programsRouter.route(to: \.videoPlayer, playerViewModel)
} }
} }
} label: { } label: {
LandscapeItemElement(item: item) LandscapeItemElement(item: item)
@ -173,9 +173,9 @@ struct LiveTVProgramsView: View {
if let chanId = item.channelId, if let chanId = item.channelId,
let chan = viewModel.findChannel(id: chanId) let chan = viewModel.findChannel(id: chanId)
{ {
self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in
self.programsRouter.route(to: \.videoPlayer, playerViewModel) self.programsRouter.route(to: \.videoPlayer, playerViewModel)
} }
} }
} label: { } label: {
LandscapeItemElement(item: item) LandscapeItemElement(item: item)

4
Swiftfin tvOS/Views/VideoPlayer/VLCPlayerViewController.swift
View File

@ -450,7 +450,7 @@ extension VLCPlayerViewController {
if startPercentage > 0 { if startPercentage > 0 {
if viewModel.resumeOffset { if viewModel.resumeOffset {
let runTimeTicks = viewModel.item.runTimeTicks ?? 0 let runTimeTicks = viewModel.item.runTimeTicks ?? 0
let videoDurationSeconds = Double(runTimeTicks / 10_000_000) let videoDurationSeconds = Double(runTimeTicks / 10_000_000)
var startSeconds = round((startPercentage / 100) * videoDurationSeconds) var startSeconds = round((startPercentage / 100) * videoDurationSeconds)
startSeconds = startSeconds.subtract(5, floor: 0) startSeconds = startSeconds.subtract(5, floor: 0)
@ -523,7 +523,7 @@ extension VLCPlayerViewController {
// Necessary math as VLCMediaPlayer doesn't work well // Necessary math as VLCMediaPlayer doesn't work well
// by just setting the position // by just setting the position
let videoPosition = Double(vlcMediaPlayer.time.intValue / 1000) 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 videoDuration = Double(runTimeTicks / 10_000_000)
let secondsScrubbedTo = round(viewModel.sliderPercentage * videoDuration) let secondsScrubbedTo = round(viewModel.sliderPercentage * videoDuration)
let newPositionOffset = secondsScrubbedTo - videoPosition let newPositionOffset = secondsScrubbedTo - videoPosition

4
Swiftfin/Views/VideoPlayer/VLCPlayerViewController.swift
View File

@ -410,7 +410,7 @@ extension VLCPlayerViewController {
if startPercentage > 0 { if startPercentage > 0 {
if viewModel.resumeOffset { if viewModel.resumeOffset {
let runTimeTicks = item.runTimeTicks ?? 0 let runTimeTicks = item.runTimeTicks ?? 0
let videoDurationSeconds = Double(runTimeTicks / 10_000_000) let videoDurationSeconds = Double(runTimeTicks / 10_000_000)
var startSeconds = round((startPercentage / 100) * videoDurationSeconds) var startSeconds = round((startPercentage / 100) * videoDurationSeconds)
startSeconds = startSeconds.subtract(5, floor: 0) startSeconds = startSeconds.subtract(5, floor: 0)
@ -491,7 +491,7 @@ extension VLCPlayerViewController {
func setMediaPlayerTimeAtCurrentSlider() { func setMediaPlayerTimeAtCurrentSlider() {
// Necessary math as VLCMediaPlayer doesn't work well // Necessary math as VLCMediaPlayer doesn't work well
// by just setting the position // by just setting the position
let runTimeTicks = item.runTimeTicks ?? 0 let runTimeTicks = item.runTimeTicks ?? 0
let videoPosition = Double(vlcMediaPlayer.time.intValue / 1000) let videoPosition = Double(vlcMediaPlayer.time.intValue / 1000)
let videoDuration = Double(runTimeTicks / 10_000_000) let videoDuration = Double(runTimeTicks / 10_000_000)
let secondsScrubbedTo = round(viewModel.sliderPercentage * videoDuration) let secondsScrubbedTo = round(viewModel.sliderPercentage * videoDuration)