From 7476a11a3606c23a39f98553eea7b95feb9158f2 Mon Sep 17 00:00:00 2001 From: acvigue Date: Sun, 1 Aug 2021 16:28:02 +0000 Subject: [PATCH] [create-pull-request] automated change --- JellyfinPlayer tvOS/MainTabView.swift | 2 +- JellyfinPlayer tvOS/SettingsView.swift | 2 +- .../VideoPlayer/VideoPlayerViewController.swift | 6 +++--- JellyfinPlayer/JellyfinPlayerApp.swift | 2 +- JellyfinPlayer/SettingsView.swift | 8 ++++---- JellyfinPlayer/VideoPlayer.swift | 12 ++++++------ Shared/Extensions/DeviceProfileBuilder.swift | 4 ++-- Shared/Extensions/ImageView.swift | 2 +- Shared/Singleton/SessionManager.swift | 12 ++++++------ Shared/ViewModels/LibraryFilterViewModel.swift | 4 ++-- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/JellyfinPlayer tvOS/MainTabView.swift b/JellyfinPlayer tvOS/MainTabView.swift index e4eb8c95..b6922b99 100644 --- a/JellyfinPlayer tvOS/MainTabView.swift +++ b/JellyfinPlayer tvOS/MainTabView.swift @@ -53,7 +53,7 @@ struct MainTabView: View { Image(systemName: "folder") } .tag(Tab.allMedia) - + SettingsView(viewModel: SettingsViewModel()) .offset(y: -1) // don't remove this. it breaks tabview on 4K displays. .tabItem { diff --git a/JellyfinPlayer tvOS/SettingsView.swift b/JellyfinPlayer tvOS/SettingsView.swift index 9db18f91..5676cbde 100644 --- a/JellyfinPlayer tvOS/SettingsView.swift +++ b/JellyfinPlayer tvOS/SettingsView.swift @@ -78,7 +78,7 @@ struct SettingsView: View { } Button { DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { - SessionManager.current.logout(); + SessionManager.current.logout() let nc = NotificationCenter.default nc.post(name: Notification.Name("didSignOut"), object: nil) } diff --git a/JellyfinPlayer tvOS/VideoPlayer/VideoPlayerViewController.swift b/JellyfinPlayer tvOS/VideoPlayer/VideoPlayerViewController.swift index 1050f03a..f318460a 100644 --- a/JellyfinPlayer tvOS/VideoPlayer/VideoPlayerViewController.swift +++ b/JellyfinPlayer tvOS/VideoPlayer/VideoPlayerViewController.swift @@ -582,11 +582,11 @@ class VideoPlayerViewController: UIViewController, VideoPlayerSettingsDelegate, updateNowPlayingCenter(time: nil, playing: mediaPlayer.state == .playing) if (eventName == "timeupdate" && mediaPlayer.state == .playing) || eventName != "timeupdate" { - var ticks: Int64 = Int64(mediaPlayer.position * Float(manifest.runTimeTicks!)); - if(ticks == 0) { + var ticks: Int64 = Int64(mediaPlayer.position * Float(manifest.runTimeTicks!)) + if ticks == 0 { ticks = manifest.userData?.playbackPositionTicks ?? 0 } - + let progressInfo = PlaybackProgressInfo(canSeek: true, item: manifest, itemId: manifest.id, sessionId: playSessionId, mediaSourceId: manifest.id, audioStreamIndex: Int(selectedAudioTrack), subtitleStreamIndex: Int(selectedCaptionTrack), isPaused: (!playing), isMuted: false, positionTicks: ticks, playbackStartTimeTicks: Int64(startTime), volumeLevel: 100, brightness: 100, aspectRatio: nil, playMethod: playbackItem.videoType, liveStreamId: nil, playSessionId: playSessionId, repeatMode: .repeatNone, nowPlayingQueue: [], playlistItemId: "playlistItem0") PlaystateAPI.reportPlaybackProgress(playbackProgressInfo: progressInfo) diff --git a/JellyfinPlayer/JellyfinPlayerApp.swift b/JellyfinPlayer/JellyfinPlayerApp.swift index 2f73a7c9..fd5bcf3e 100644 --- a/JellyfinPlayer/JellyfinPlayerApp.swift +++ b/JellyfinPlayer/JellyfinPlayerApp.swift @@ -192,7 +192,7 @@ class EmailHelper: NSObject, MFMailComposeViewControllerDelegate { let data = fileManager.contents(atPath: logURL.path) picker.setSubject("[DEV-BUG] SwiftFin") - picker.setMessageBody("Please don't edit this email.\n Please don't change the subject. \nUDID: \(UIDevice.current.identifierForVendor?.uuidString ?? "NIL")\n", isHTML: false); + picker.setMessageBody("Please don't edit this email.\n Please don't change the subject. \nUDID: \(UIDevice.current.identifierForVendor?.uuidString ?? "NIL")\n", isHTML: false) picker.setToRecipients(["SwiftFin Bug Reports "]) picker.addAttachmentData(data!, mimeType: "text/plain", fileName: logURL.lastPathComponent) picker.mailComposeDelegate = self diff --git a/JellyfinPlayer/SettingsView.swift b/JellyfinPlayer/SettingsView.swift index e95480ad..a3ac4103 100644 --- a/JellyfinPlayer/SettingsView.swift +++ b/JellyfinPlayer/SettingsView.swift @@ -77,8 +77,8 @@ struct SettingsView: View { Text("Signed in as \(username)").foregroundColor(.primary) Spacer() Button { - print("logging out"); - close = false; + print("logging out") + close = false DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { let nc = NotificationCenter.default nc.post(name: Notification.Name("didSignOut"), object: nil) @@ -88,9 +88,9 @@ struct SettingsView: View { } } Button { - close = false; + close = false DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { - SessionManager.current.logout(); + SessionManager.current.logout() let nc = NotificationCenter.default nc.post(name: Notification.Name("didSignOut"), object: nil) } diff --git a/JellyfinPlayer/VideoPlayer.swift b/JellyfinPlayer/VideoPlayer.swift index 013430c1..4e12cd40 100644 --- a/JellyfinPlayer/VideoPlayer.swift +++ b/JellyfinPlayer/VideoPlayer.swift @@ -653,8 +653,8 @@ class PlayerViewController: UIViewController, GCKDiscoveryManagerListener, GCKRe if fetchCaptions { mediaPlayer.pause() subtitleTrackArray.forEach { sub in - //stupid fxcking jeff decides to re-encode these when added. - //only add playback streams when codec not supported by VLC. + // stupid fxcking jeff decides to re-encode these when added. + // only add playback streams when codec not supported by VLC. if sub.id != -1 && sub.delivery == .external && sub.codec != "subrip" { mediaPlayer.addPlaybackSlave(sub.url!, type: .subtitle, enforce: false) } @@ -1014,7 +1014,7 @@ struct VLCPlayerWithControls: UIViewControllerRepresentable { func showLoadingView(_ viewController: PlayerViewController) { self.loadBinding.wrappedValue = true } - + func exitPlayer(_ viewController: PlayerViewController) { self.pBinding.wrappedValue = false } @@ -1041,11 +1041,11 @@ struct VLCPlayerWithControls: UIViewControllerRepresentable { extension PlayerViewController { func sendProgressReport(eventName: String) { if (eventName == "timeupdate" && mediaPlayer.state == .playing) || eventName != "timeupdate" { - var ticks: Int64 = Int64(mediaPlayer.position * Float(manifest.runTimeTicks!)); - if(ticks == 0) { + var ticks: Int64 = Int64(mediaPlayer.position * Float(manifest.runTimeTicks!)) + if ticks == 0 { ticks = manifest.userData?.playbackPositionTicks ?? 0 } - + let progressInfo = PlaybackProgressInfo(canSeek: true, item: manifest, itemId: manifest.id, sessionId: playSessionId, mediaSourceId: manifest.id, audioStreamIndex: Int(selectedAudioTrack), subtitleStreamIndex: Int(selectedCaptionTrack), isPaused: (mediaPlayer.state == .paused), isMuted: false, positionTicks: ticks, playbackStartTimeTicks: Int64(startTime), volumeLevel: 100, brightness: 100, aspectRatio: nil, playMethod: playbackItem.videoType, liveStreamId: nil, playSessionId: playSessionId, repeatMode: .repeatNone, nowPlayingQueue: [], playlistItemId: "playlistItem0") PlaystateAPI.reportPlaybackProgress(playbackProgressInfo: progressInfo) diff --git a/Shared/Extensions/DeviceProfileBuilder.swift b/Shared/Extensions/DeviceProfileBuilder.swift index 9c9999ec..66c6f889 100644 --- a/Shared/Extensions/DeviceProfileBuilder.swift +++ b/Shared/Extensions/DeviceProfileBuilder.swift @@ -112,8 +112,8 @@ class DeviceProfileBuilder { subtitleProfiles.append(SubtitleProfile(format: "subrip", method: .embed)) subtitleProfiles.append(SubtitleProfile(format: "sub", method: .embed)) subtitleProfiles.append(SubtitleProfile(format: "pgssub", method: .embed)) - - //These need to be filtered. Most subrips are embedded. I hate subtitles. + + // These need to be filtered. Most subrips are embedded. I hate subtitles. subtitleProfiles.append(SubtitleProfile(format: "subrip", method: .external)) subtitleProfiles.append(SubtitleProfile(format: "sub", method: .external)) subtitleProfiles.append(SubtitleProfile(format: "ass", method: .external)) diff --git a/Shared/Extensions/ImageView.swift b/Shared/Extensions/ImageView.swift index 1818e316..e1e45141 100644 --- a/Shared/Extensions/ImageView.swift +++ b/Shared/Extensions/ImageView.swift @@ -26,7 +26,7 @@ struct ImageView: View { var body: some View { LazyImage(source: source) .placeholder { - Image(uiImage: UIImage(blurHash: blurhash, size: CGSize(width: 8, height: 8)) ?? UIImage(blurHash: "001fC^", size: CGSize(width:8,height:8))!) + Image(uiImage: UIImage(blurHash: blurhash, size: CGSize(width: 8, height: 8)) ?? UIImage(blurHash: "001fC^", size: CGSize(width: 8, height: 8))!) .resizable() } .failure { diff --git a/Shared/Singleton/SessionManager.swift b/Shared/Singleton/SessionManager.swift index 05ea8cc8..9a69bc28 100644 --- a/Shared/Singleton/SessionManager.swift +++ b/Shared/Singleton/SessionManager.swift @@ -23,7 +23,7 @@ final class SessionManager { fileprivate(set) var user: SignedInUser! fileprivate(set) var deviceID: String = "" fileprivate(set) var accessToken: String = "" - + #if os(tvOS) let tvUserManager = TVUserManager() #endif @@ -41,10 +41,10 @@ final class SessionManager { } } #else - if(lastUsedUserID != nil) { + if lastUsedUserID != nil { savedUsers?.forEach { savedUser in - if(savedUser.user_id ?? "" == lastUsedUserID!) { - user = savedUser; + if savedUser.user_id ?? "" == lastUsedUserID! { + user = savedUser } } } else { @@ -146,7 +146,7 @@ final class SessionManager { #if os(tvOS) let descriptor: TVAppProfileDescriptor = TVAppProfileDescriptor(name: user.username!) self.tvUserManager.shouldStorePreferenceForCurrentUser(to: descriptor) { should in - if(should) { + if should { user.appletv_id = self.tvUserManager.currentUserIdentifier ?? "" } } @@ -178,7 +178,7 @@ final class SessionManager { keychain.accessGroup = "9R8RREG67J.me.vigue.jellyfin.sharedKeychain" keychain.delete("AccessToken_\(user?.user_id ?? "")") generateAuthHeader(with: nil, deviceID: nil) - if(user != nil) { + if user != nil { let deleteRequest = NSBatchDeleteRequest(objectIDs: [user.objectID]) user = nil _ = try? PersistenceController.shared.container.viewContext.execute(deleteRequest) diff --git a/Shared/ViewModels/LibraryFilterViewModel.swift b/Shared/ViewModels/LibraryFilterViewModel.swift index 342c083a..83f336d4 100644 --- a/Shared/ViewModels/LibraryFilterViewModel.swift +++ b/Shared/ViewModels/LibraryFilterViewModel.swift @@ -54,8 +54,8 @@ final class LibraryFilterViewModel: ViewModel { init(filters: LibraryFilters? = nil, enabledFilterType: [FilterType] = [.tag, .genre, .sortBy, .sortOrder, .filter], parentId: String) { self.enabledFilterType = enabledFilterType - self.selectedSortBy = filters?.sortBy.first ?? .name; - self.selectedSortOrder = filters?.sortOrder.first ?? .descending; + self.selectedSortBy = filters?.sortBy.first ?? .name + self.selectedSortOrder = filters?.sortOrder.first ?? .descending self.parentId = parentId super.init()