π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Add SwiftLint through SwiftPM for Cast
Manav Rathieb507576ff3b
diff --git a/apple/.swiftlint.yml b/apple/.swiftlint.ymlnew file mode 100644index 0000000000..30c85abcbd--- /dev/null+++ b/apple/.swiftlint.yml@@ -0,0 +1,18 @@+only_rules:+ - unowned_variable_capture+ - weak_delegate+ - class_delegate_protocol+ - discarded_notification_center_observer+ - unhandled_throwing_task+ - private_swiftui_state+ - identical_operands+ - duplicate_conditions+ - unused_setter_value+ - blanket_disable_command+ - superfluous_disable_command++excluded:+ - apps/cast/Cast/Generated/cast.swift++allow_zero_lintable_files: false+strict: truediff --git a/apple/apps/cast/Cast/ViewModels/SlideshowService.swift b/apple/apps/cast/Cast/ViewModels/SlideshowService.swiftindex f8fcab1ab9..40976fc08a 100644--- a/apple/apps/cast/Cast/ViewModels/SlideshowService.swift+++ b/apple/apps/cast/Cast/ViewModels/SlideshowService.swift@@ -39,6 +39,7 @@ class RealSlideshowService: ObservableObject {private var slideTimer: Timer?private var prefetchCache: [Int: Data] = [:]private var videoTempFiles: [Int: URL] = [:]+ private var videoEndObserver: NSObjectProtocol?private let slideshowConfiguration = SlideConfiguration.tvOptimizedprivate var slideTimeRemaining: TimeInterval = 0private var slidePauseTime: Date?@@ -186,6 +187,7 @@ class RealSlideshowService: ObservableObject {func stop() async {ScreenSaverManager.allowScreenSaver()+ removeVideoEndObserver()await MainActor.run {isStopping = true@@ -215,6 +217,7 @@ class RealSlideshowService: ObservableObject {func clearExpiredTokenState() async {ScreenSaverManager.allowScreenSaver()+ removeVideoEndObserver()await MainActor.run {// A late timer callback would surface a false empty state.@@ -756,8 +759,9 @@ class RealSlideshowService: ObservableObject {}private func prepareVideoPlayer(url: URL) {+ removeVideoEndObserver()let playerItem = AVPlayerItem(url: url)- NotificationCenter.default.addObserver(+ videoEndObserver = NotificationCenter.default.addObserver(forName: .AVPlayerItemDidPlayToEndTime,object: playerItem,queue: .main,@@ -780,6 +784,13 @@ class RealSlideshowService: ObservableObject {startVideoProgressUpdates()}+ private func removeVideoEndObserver() {+ if let videoEndObserver {+ NotificationCenter.default.removeObserver(videoEndObserver)+ }+ videoEndObserver = nil+ }+private func startVideoProgressUpdates() {videoPlayer?.addPeriodicTimeObserver(forInterval: CMTime(seconds: 0.5, preferredTimescale: 600),diff --git a/apple/apps/cast/Cast/Views/VideoPlayerView.swift b/apple/apps/cast/Cast/Views/VideoPlayerView.swiftindex 6f79ae0373..00002f8569 100644--- a/apple/apps/cast/Cast/Views/VideoPlayerView.swift+++ b/apple/apps/cast/Cast/Views/VideoPlayerView.swift@@ -12,6 +12,7 @@ struct VideoPlayerView: View {@State private var showToast = false@State private var toastMessage = ""@State private var toastIcon = ""+ @State private var playerObservers: [NSObjectProtocol] = []init(videoData: Data, suggestedFilename: String? = nil) {self.videoData = videoData@@ -70,30 +71,22 @@ struct VideoPlayerView: View {suggestedExtension: suggestedExtension,)- await MainActor.run {- let asset = AVURLAsset(url: tempURL)-- Task {- let isPlayable = try await asset.load(.isPlayable)- let hasVideoTracks = try await !asset.loadTracks(withMediaType: .video)- .isEmpty+ let asset = AVURLAsset(url: tempURL)+ let isPlayable = try await asset.load(.isPlayable)+ let hasVideoTracks = try await !asset.loadTracks(withMediaType: .video).isEmpty- await MainActor.run {- if isPlayable, hasVideoTracks {- let playerItem = AVPlayerItem(url: tempURL)- let player = AVPlayer(playerItem: playerItem)+ if isPlayable, hasVideoTracks {+ let playerItem = AVPlayerItem(url: tempURL)+ let player = AVPlayer(playerItem: playerItem)- monitorPlayerItemStatus(playerItem)+ monitorPlayerItemStatus(playerItem)- self.playerItem = playerItem- self.player = player+ self.playerItem = playerItem+ self.player = player- setupPlayer()- } else {- tryVideoFallback(originalURL: tempURL)- }- }- }+ setupPlayer()+ } else {+ tryVideoFallback(originalURL: tempURL)}} catch {print("Failed to setup video player: \(error)")@@ -171,8 +164,9 @@ struct VideoPlayerView: View {private func setupPlayerObservers() {guard let player, let currentItem = player.currentItem else { return }+ removePlayerObservers()- NotificationCenter.default.addObserver(+ let playbackEnded = NotificationCenter.default.addObserver(forName: .AVPlayerItemDidPlayToEndTime,object: currentItem,queue: .main,@@ -181,7 +175,7 @@ struct VideoPlayerView: View {player.play()}- NotificationCenter.default.addObserver(+ let playbackFailed = NotificationCenter.default.addObserver(forName: .AVPlayerItemFailedToPlayToEndTime,object: currentItem,queue: .main,@@ -193,7 +187,7 @@ struct VideoPlayerView: View {}}- NotificationCenter.default.addObserver(+ let willResignActive = NotificationCenter.default.addObserver(forName: UIApplication.willResignActiveNotification,object: nil,queue: .main,@@ -201,7 +195,7 @@ struct VideoPlayerView: View {player.pause()}- NotificationCenter.default.addObserver(+ let didBecomeActive = NotificationCenter.default.addObserver(forName: UIApplication.didBecomeActiveNotification,object: nil,queue: .main,@@ -212,6 +206,7 @@ struct VideoPlayerView: View {}}}+ playerObservers = [playbackEnded, playbackFailed, willResignActive, didBecomeActive]}private func createTemporaryVideoFile(@@ -286,29 +281,16 @@ struct VideoPlayerView: View {return "mp4"}+ private func removePlayerObservers() {+ for observer in playerObservers {+ NotificationCenter.default.removeObserver(observer)+ }+ playerObservers.removeAll()+ }+private func cleanup() {player?.pause()-- NotificationCenter.default.removeObserver(- self,- name: .AVPlayerItemDidPlayToEndTime,- object: nil,- )- NotificationCenter.default.removeObserver(- self,- name: .AVPlayerItemFailedToPlayToEndTime,- object: nil,- )- NotificationCenter.default.removeObserver(- self,- name: UIApplication.willResignActiveNotification,- object: nil,- )- NotificationCenter.default.removeObserver(- self,- name: UIApplication.didBecomeActiveNotification,- object: nil,- )+ removePlayerObservers()do {try AVAudioSession.sharedInstance().setActive(diff --git a/apple/scripts/Package.resolved b/apple/scripts/Package.resolvednew file mode 100644index 0000000000..5437668d4f--- /dev/null+++ b/apple/scripts/Package.resolved@@ -0,0 +1,15 @@+{+ "originHash" : "d1d204652027eeb1460aac27d093169591a13363256a44008dfa2a0b6069a9c3",+ "pins" : [+ {+ "identity" : "swiftlintplugins",+ "kind" : "remoteSourceControl",+ "location" : "https://github.com/SimplyDanny/SwiftLintPlugins",+ "state" : {+ "revision" : "ef7d692fc6706e8f5628e26bcafaefa445c58a97",+ "version" : "0.65.1"+ }+ }+ ],+ "version" : 3+}diff --git a/apple/scripts/Package.swift b/apple/scripts/Package.swiftnew file mode 100644index 0000000000..ab9c420612--- /dev/null+++ b/apple/scripts/Package.swift@@ -0,0 +1,10 @@+// swift-tools-version: 6.0++import PackageDescription++let package = Package(+ name: "AppleScripts",+ dependencies: [+ .package(url: "https://github.com/SimplyDanny/SwiftLintPlugins", exact: "0.65.1")+ ]+)