Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Add native Swift formatting and lint rules for Cast

Manav Rathiced492484ab1
diff --git a/apple/.swift-format b/apple/.swift-format
new file mode 100644
index 0000000000..998c4a1651
--- /dev/null
+++ b/apple/.swift-format
@@ -0,0 +1,8 @@
+{
+ "indentation": { "spaces": 4 },
+ "rules": {
+ "NeverForceUnwrap": true,
+ "NeverUseForceTry": true,
+ "NeverUseImplicitlyUnwrappedOptionals": true
+ }
+}
diff --git a/apple/apps/cast/Cast/CastApp.swift b/apple/apps/cast/Cast/CastApp.swift
index ca5e6261c3..81dee513b5 100644
--- a/apple/apps/cast/Cast/CastApp.swift
+++ b/apple/apps/cast/Cast/CastApp.swift
@@ -15,11 +15,12 @@ struct CastApp: App {
private final class CastRustLogSink: RustLogSink, @unchecked Sendable {
func log(level: RustLogLevel, target: String, message: String) {
- let levelName = switch level {
- case .error: "error"
- case .warn: "warn"
- case .info: "info"
- }
+ let levelName =
+ switch level {
+ case .error: "error"
+ case .warn: "warn"
+ case .info: "info"
+ }
print("[\(levelName)][rust][\(target)] \(message)")
}
}
diff --git a/apple/apps/cast/Cast/Models/CastModels.swift b/apple/apps/cast/Cast/Models/CastModels.swift
index 180395f633..ea0859cdf7 100644
--- a/apple/apps/cast/Cast/Models/CastModels.swift
+++ b/apple/apps/cast/Cast/Models/CastModels.swift
@@ -75,7 +75,7 @@ struct CastFile: Codable, Equatable {
let encryptedKey: String
let keyDecryptionNonce: String
let fileDecryptionHeader: String
- let hash: String? // BLAKE2b hash for file content verification
+ let hash: String? // BLAKE2b hash for file content verification
var isImage: Bool {
!isVideo && !isLivePhoto
@@ -83,11 +83,11 @@ struct CastFile: Codable, Equatable {
}
struct FileMetadata {
- let fileType: Int // 0 = image, 1 = video, 2 = livePhoto
- let title: String // filename with extension
- let creationTime: Int64 // microseconds since epoch
+ let fileType: Int // 0 = image, 1 = video, 2 = livePhoto
+ let title: String // filename with extension
+ let creationTime: Int64 // microseconds since epoch
let modificationTime: Int64
- let hash: String? // BLAKE2b hash for file content verification
+ let hash: String? // BLAKE2b hash for file content verification
var isImage: Bool {
fileType == 0
diff --git a/apple/apps/cast/Cast/Services/APIEndpoint.swift b/apple/apps/cast/Cast/Services/APIEndpoint.swift
index 98dd5dfa84..82a8489995 100644
--- a/apple/apps/cast/Cast/Services/APIEndpoint.swift
+++ b/apple/apps/cast/Cast/Services/APIEndpoint.swift
@@ -1,6 +1,8 @@
import Foundation
enum APIEndpoint {
+ // Fixed, valid URL literal.
+ // swift-format-ignore: NeverForceUnwrap
static let production = URL(string: "https://api.ente.com")!
static var current: URL {
@@ -18,12 +20,12 @@ enum APIEndpoint {
static func update(_ value: String) async throws {
let value = value.trimmingCharacters(in: .whitespacesAndNewlines)
guard var components = URLComponents(string: value),
- components.scheme?.lowercased() == "https",
- components.host != nil,
- components.user == nil,
- components.query == nil,
- components.fragment == nil,
- components.path.isEmpty || components.path == "/"
+ components.scheme?.lowercased() == "https",
+ components.host != nil,
+ components.user == nil,
+ components.query == nil,
+ components.fragment == nil,
+ components.path.isEmpty || components.path == "/"
else { throw EndpointError.invalidURL }
components.scheme = "https"
components.path = ""
@@ -33,7 +35,7 @@ enum APIEndpoint {
request.timeoutInterval = 10
let (data, response) = try await URLSession.shared.data(for: request)
guard (response as? HTTPURLResponse)?.statusCode == 200,
- (try? JSONDecoder().decode(Ping.self, from: data).message) == "pong"
+ (try? JSONDecoder().decode(Ping.self, from: data).message) == "pong"
else { throw EndpointError.invalidServer }
url == production ? reset() : UserDefaults.standard.set(url, forKey: "endpoint")
diff --git a/apple/apps/cast/Cast/Services/CastPairingService.swift b/apple/apps/cast/Cast/Services/CastPairingService.swift
index c04d1cfd67..e02bae7a64 100644
--- a/apple/apps/cast/Cast/Services/CastPairingService.swift
+++ b/apple/apps/cast/Cast/Services/CastPairingService.swift
@@ -36,7 +36,7 @@ class CastSession: ObservableObject {
@MainActor
class RealCastPairingService {
- private let baseURL = APIEndpoint.current.absoluteString
+ private let baseURL = APIEndpoint.current
private var pollingTimer: Timer?
private var isPolling: Bool = false
private var isFetchingPayload: Bool = false
@@ -50,11 +50,11 @@ class RealCastPairingService {
private func getCurrentPollingInterval() -> TimeInterval {
guard let startTime = pollingStartTime else { return initialPollingInterval }
let elapsed = Date().timeIntervalSince(startTime)
- let newInterval = elapsed >= pollingIntervalSwitchTime ? extendedPollingInterval :
- initialPollingInterval
+ let newInterval =
+ elapsed >= pollingIntervalSwitchTime ? extendedPollingInterval : initialPollingInterval
if elapsed >= pollingIntervalSwitchTime, newInterval == extendedPollingInterval,
- !hasLoggedIntervalSwitch
+ !hasLoggedIntervalSwitch
{
print(
"Switched to extended polling interval (\(extendedPollingInterval)s) after \(Int(elapsed))s",
@@ -70,7 +70,7 @@ class RealCastPairingService {
print("POST \(baseURL)/cast/device-info")
- let url = URL(string: "\(baseURL)/cast/device-info")!
+ let url = baseURL.appendingPathComponent("cast/device-info")
var request = URLRequest(url: url)
request.httpMethod = "POST"
request.setValue("application/json", forHTTPHeaderField: "Content-Type")
@@ -127,7 +127,8 @@ class RealCastPairingService {
guard isPolling, !hasDeliveredPayload else { return }
let currentInterval = getCurrentPollingInterval()
- pollingTimer = Timer
+ pollingTimer =
+ Timer
.scheduledTimer(withTimeInterval: currentInterval, repeats: false) { [weak self] _ in
Task { @MainActor in
await self?.checkForPayload(
@@ -159,7 +160,7 @@ class RealCastPairingService {
isFetchingPayload = true
defer { isFetchingPayload = false }
do {
- let url = URL(string: "\(baseURL)/cast/cast-data/\(device.deviceCode)")!
+ let url = baseURL.appendingPathComponent("cast/cast-data/\(device.deviceCode)")
print("GET \(url.absoluteString)")
let (data, response) = try await URLSession.shared.data(from: url)
diff --git a/apple/apps/cast/Cast/Services/FileCache.swift b/apple/apps/cast/Cast/Services/FileCache.swift
index 42be579cb9..2d446d33d7 100644
--- a/apple/apps/cast/Cast/Services/FileCache.swift
+++ b/apple/apps/cast/Cast/Services/FileCache.swift
@@ -13,9 +13,7 @@ actor ThreadSafeFileCache {
self.maxBytes = maxBytes
self.shrinkTargetBytes = shrinkTargetBytes
- let documentsPath = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask)
- .first!
- cacheDirectory = documentsPath.appendingPathComponent("EnteFileCache")
+ cacheDirectory = URL.cachesDirectory.appendingPathComponent("EnteFileCache")
metadataURL = cacheDirectory.appendingPathComponent("cache_metadata.json")
try? FileManager.default.createDirectory(
@@ -24,7 +22,7 @@ actor ThreadSafeFileCache {
)
guard let metadataData = try? Data(contentsOf: metadataURL),
- let metadata = try? JSONDecoder().decode(CacheMetadata.self, from: metadataData)
+ let metadata = try? JSONDecoder().decode(CacheMetadata.self, from: metadataData)
else {
return
}
@@ -38,7 +36,7 @@ actor ThreadSafeFileCache {
let fileURL = cacheDirectory.appendingPathComponent("\(fileID).cache")
if FileManager.default.fileExists(atPath: fileURL.path) {
if let attributes = try? FileManager.default.attributesOfItem(atPath: fileURL.path),
- let fileSize = attributes[.size] as? Int
+ let fileSize = attributes[.size] as? Int
{
loadedBytes += fileSize
validFileIDs.append(fileID)
diff --git a/apple/apps/cast/Cast/ViewModels/CastViewModel.swift b/apple/apps/cast/Cast/ViewModels/CastViewModel.swift
index 8707d46e56..7ad2f2e237 100644
--- a/apple/apps/cast/Cast/ViewModels/CastViewModel.swift
+++ b/apple/apps/cast/Cast/ViewModels/CastViewModel.swift
@@ -212,10 +212,8 @@ class CastViewModel: ObservableObject {
await MainActor.run {
guard sessionID == self.sessionID else { return }
- let hasError = slideshowService.error != nil && !slideshowService.error!.isEmpty
-
- if hasError {
- handleSlideshowError(slideshowService.error!)
+ if let error = slideshowService.error, !error.isEmpty {
+ handleSlideshowError(error)
} else {
currentView = .slideshow
statusMessage = ""
@@ -276,10 +274,9 @@ class CastViewModel: ObservableObject {
private func handleSlideshowError(_ error: String) {
// Ignore stale slideshow errors while a new connection is starting.
// Empty-state errors may belong to the new connection.
- let isEmptyStateError = error.contains("No media files") ||
- error.contains("available in this album") ||
- error.contains("available in this collection") ||
- error.contains("Empty file list")
+ let isEmptyStateError =
+ error.contains("No media files") || error.contains("available in this album")
+ || error.contains("available in this collection") || error.contains("Empty file list")
if currentView == .pairing || currentView == .connecting, !isEmptyStateError {
return
diff --git a/apple/apps/cast/Cast/ViewModels/SlideshowService.swift b/apple/apps/cast/Cast/ViewModels/SlideshowService.swift
index a25bbbcceb..f8fcab1ab9 100644
--- a/apple/apps/cast/Cast/ViewModels/SlideshowService.swift
+++ b/apple/apps/cast/Cast/ViewModels/SlideshowService.swift
@@ -51,8 +51,10 @@ class RealSlideshowService: ObservableObject {
private var didDisplayFirstFile: Bool = false
- private var baseURL = APIEndpoint.current.absoluteString
- private let castDownloadURL = "https://cast-albums.ente.com/download"
+ private var baseURL = APIEndpoint.current
+ // Fixed, valid URL literal.
+ // swift-format-ignore: NeverForceUnwrap
+ private let castDownloadURL = URL(string: "https://cast-albums.ente.com/download/")!
private let verboseFileLogging = false
private let verboseDecryptionLogging = false
@@ -140,7 +142,7 @@ class RealSlideshowService: ObservableObject {
ScreenSaverManager.preventScreenSaver()
await clearExpiredTokenState()
- baseURL = APIEndpoint.current.absoluteString
+ baseURL = APIEndpoint.current
storedCastPayload = castPayload
if error != nil {
error = nil
@@ -295,12 +297,16 @@ class RealSlideshowService: ObservableObject {
startPeriodicDiffPolling()
}
- private func fetchFilesBatch(castPayload: CastPayload,
- sinceTime: Int64) async throws
+ private func fetchFilesBatch(
+ castPayload: CastPayload,
+ sinceTime: Int64
+ ) async throws
-> (files: [[String: Any]], hasMore: Bool, latestUpdateTime: Int64)
{
guard storedCastPayload == castPayload else { throw CancellationError() }
- let url = URL(string: "\(baseURL)/cast/diff?sinceTime=\(sinceTime)")!
+ let url = baseURL.appendingPathComponent("cast/diff").appending(queryItems: [
+ URLQueryItem(name: "sinceTime", value: String(sinceTime))
+ ])
var request = URLRequest(url: url)
request.setValue(castPayload.castToken, forHTTPHeaderField: "X-Cast-Access-Token")
@@ -327,7 +333,7 @@ class RealSlideshowService: ObservableObject {
}
guard let json = try JSONSerialization.jsonObject(with: data) as? [String: Any],
- let diff = json["diff"] as? [[String: Any]]
+ let diff = json["diff"] as? [[String: Any]]
else {
throw CastError.networkError("Invalid JSON response")
}
@@ -348,8 +354,10 @@ class RealSlideshowService: ObservableObject {
private func processDiffBatch(_ items: [[String: Any]], castPayload: CastPayload) async {
let wasEmpty = allFiles.isEmpty
var currentFileChanged = false
- let originalCurrentFile = currentFileIndex < allFiles
- .count ? allFiles[currentFileIndex] : nil
+ let originalCurrentFile =
+ currentFileIndex
+ < allFiles
+ .count ? allFiles[currentFileIndex] : nil
for item in items {
guard storedCastPayload == castPayload else { return }
@@ -376,7 +384,7 @@ class RealSlideshowService: ObservableObject {
if index < currentFileIndex, currentFileIndex > 0 {
currentFileIndex -= 1
} else if index == currentFileIndex, currentFileIndex >= allFiles.count,
- !allFiles.isEmpty
+ !allFiles.isEmpty
{
currentFileIndex = 0
}
@@ -487,7 +495,8 @@ class RealSlideshowService: ObservableObject {
private func displaySlideAtCurrentIndex() async {
guard currentFileIndex >= 0, currentFileIndex < allFiles.count,
- let payload = storedCastPayload else { return }
+ let payload = storedCastPayload
+ else { return }
await MainActor.run {
currentSlideIndex = currentFileIndex
@@ -590,7 +599,8 @@ class RealSlideshowService: ObservableObject {
if let existing = videoTempFiles[file.id] {
url = existing
} else {
- let fileExtension = file.title.components(separatedBy: ".").last?
+ let fileExtension =
+ file.title.components(separatedBy: ".").last?
.lowercased() ?? "mp4"
let tmpURL = FileManager.default.temporaryDirectory
.appendingPathComponent(
@@ -636,7 +646,8 @@ class RealSlideshowService: ObservableObject {
slideStartTime = Date()
slideTimeRemaining = duration
- slideTimer = Timer
+ slideTimer =
+ Timer
.scheduledTimer(withTimeInterval: duration, repeats: false) { [weak self] _ in
Task { @MainActor in
guard let self, self.isPlaying, !self.isPaused else { return }
@@ -697,7 +708,8 @@ class RealSlideshowService: ObservableObject {
}
await MainActor.run {
- self.error = "Unable to load any slides. All files may be corrupted or have decryption issues."
+ self.error =
+ "Unable to load any slides. All files may be corrupted or have decryption issues."
}
}
@@ -705,7 +717,7 @@ class RealSlideshowService: ObservableObject {
guard let payload = storedCastPayload else { return }
Task {
let prefetchCount = min(3, allFiles.count)
- for i in 1 ... prefetchCount {
+ for i in 1...prefetchCount {
guard storedCastPayload == payload else { return }
let prefetchIndex = (currentFileIndex + i) % allFiles.count
@@ -723,8 +735,9 @@ class RealSlideshowService: ObservableObject {
prefetchCache[prefetchIndex] = data
if prefetchCache.count > 5 {
- let oldKeys = Array(prefetchCache.keys.sorted()
- .prefix(prefetchCache.count - 5))
+ let oldKeys = Array(
+ prefetchCache.keys.sorted()
+ .prefix(prefetchCache.count - 5))
for key in oldKeys {
prefetchCache.removeValue(forKey: key)
}
@@ -776,7 +789,7 @@ class RealSlideshowService: ObservableObject {
guard let self else { return }
self.videoCurrentTime = CMTimeGetSeconds(time)
if let duration = self.videoPlayer?.currentItem?.duration.seconds,
- duration.isFinite
+ duration.isFinite
{
self.videoDuration = duration
}
@@ -851,7 +864,7 @@ class RealSlideshowService: ObservableObject {
} catch {
if let castError = error as? CastError,
- case .serverError(401, _) = castError
+ case .serverError(401, _) = castError
{
// fetchFilesBatch already handled this error.
} else {
@@ -886,10 +899,13 @@ class RealSlideshowService: ObservableObject {
private func downloadEncryptedFile(castPayload: CastPayload, fileID: Int) async throws -> Data {
guard storedCastPayload == castPayload else { throw CancellationError() }
- let isProduction = baseURL == APIEndpoint.production.absoluteString
- let url = isProduction
- ? URL(string: "\(castDownloadURL)/?fileID=\(fileID)")!
- : URL(string: baseURL)!.appendingPathComponent("cast/files/download/v3/\(fileID)")
+ let isProduction = baseURL.absoluteString == APIEndpoint.production.absoluteString
+ let url =
+ isProduction
+ ? castDownloadURL.appending(queryItems: [
+ URLQueryItem(name: "fileID", value: String(fileID))
+ ])
+ : baseURL.appendingPathComponent("cast/files/download/v3/\(fileID)")
var request = URLRequest(url: url)
request.setValue(castPayload.castToken, forHTTPHeaderField: "X-Cast-Access-Token")
@@ -904,9 +920,10 @@ class RealSlideshowService: ObservableObject {
)
}
- private func download(_ request: URLRequest, castPayload: CastPayload,
- fileID: Int) async throws -> Data
- {
+ private func download(
+ _ request: URLRequest, castPayload: CastPayload,
+ fileID: Int
+ ) async throws -> Data {
let (data, response) = try await URLSession.shared.data(for: request)
guard storedCastPayload == castPayload else { throw CancellationError() }
@@ -918,7 +935,7 @@ class RealSlideshowService: ObservableObject {
let snippet = (String(data: data, encoding: .utf8) ?? "").prefix(160)
print("Download error [\(httpResponse.statusCode)] fileID=\(fileID): \(snippet)")
if httpResponse.statusCode == 401,
- request.value(forHTTPHeaderField: "X-Cast-Access-Token") != nil
+ request.value(forHTTPHeaderField: "X-Cast-Access-Token") != nil
{
await handleUnauthorizedError()
throw CastError.serverError(
@@ -937,9 +954,10 @@ class RealSlideshowService: ObservableObject {
private struct FileURL: Decodable { let url: URL }
- private func downloadAndDecryptFileContent(castPayload: CastPayload,
- file: CastFile) async throws -> Data
- {
+ private func downloadAndDecryptFileContent(
+ castPayload: CastPayload,
+ file: CastFile
+ ) async throws -> Data {
let stopping = await MainActor.run { isStopping }
if stopping {
throw CastError.networkError("Service is stopping")
@@ -983,17 +1001,18 @@ class RealSlideshowService: ObservableObject {
return decryptedData
}
- private func decryptFileMetadata(item: [String: Any],
- collectionKey: String) async throws -> CastFile?
- {
+ private func decryptFileMetadata(
+ item: [String: Any],
+ collectionKey: String
+ ) async throws -> CastFile? {
guard let id = item["id"] as? Int,
- let encryptedKey = item["encryptedKey"] as? String,
- let keyDecryptionNonce = item["keyDecryptionNonce"] as? String,
- let metadataDict = item["metadata"] as? [String: Any],
- let encryptedMetadata = metadataDict["encryptedData"] as? String,
- let metadataHeader = metadataDict["decryptionHeader"] as? String,
- let fileDict = item["file"] as? [String: Any],
- let fileDecryptionHeader = fileDict["decryptionHeader"] as? String
+ let encryptedKey = item["encryptedKey"] as? String,
+ let keyDecryptionNonce = item["keyDecryptionNonce"] as? String,
+ let metadataDict = item["metadata"] as? [String: Any],
+ let encryptedMetadata = metadataDict["encryptedData"] as? String,
+ let metadataHeader = metadataDict["decryptionHeader"] as? String,
+ let fileDict = item["file"] as? [String: Any],
+ let fileDecryptionHeader = fileDict["decryptionHeader"] as? String
else {
print("Missing required fields for file \(item["id"] ?? "unknown")")
return nil
@@ -1036,12 +1055,13 @@ class RealSlideshowService: ObservableObject {
}
}
- private func decryptFileKey(encryptedKey: String, nonce: String,
- collectionKey: String) throws -> Data
- {
+ private func decryptFileKey(
+ encryptedKey: String, nonce: String,
+ collectionKey: String
+ ) throws -> Data {
guard let encryptedKeyData = Data(base64Encoded: encryptedKey),
- let nonceData = Data(base64Encoded: nonce),
- let collectionKeyData = Data(base64Encoded: collectionKey)
+ let nonceData = Data(base64Encoded: nonce),
+ let collectionKeyData = Data(base64Encoded: collectionKey)
else {
throw CastError.decryptionError("Invalid base64 in file key decryption")
}
@@ -1057,11 +1077,12 @@ class RealSlideshowService: ObservableObject {
}
}
- private func decryptMetadata(encryptedData: String, decryptionHeader: String,
- fileKey: Data) throws -> Data
- {
+ private func decryptMetadata(
+ encryptedData: String, decryptionHeader: String,
+ fileKey: Data
+ ) throws -> Data {
guard let encryptedBytes = Data(base64Encoded: encryptedData),
- let headerBytes = Data(base64Encoded: decryptionHeader)
+ let headerBytes = Data(base64Encoded: decryptionHeader)
else {
throw CastError.decryptionError("Invalid base64 in metadata decryption")
}
@@ -1079,14 +1100,16 @@ class RealSlideshowService: ObservableObject {
print("Metadata decrypted using Rust crypto: \(decryptedData.count) bytes")
return decryptedData
} catch {
- throw CastError
+ throw
+ CastError
.decryptionError("XChaCha20-Poly1305 decryption failed for metadata: \(error)")
}
}
- private func decryptFileContent(encryptedData: Data, fileKey: Data,
- decryptionHeader: String) throws -> Data
- {
+ private func decryptFileContent(
+ encryptedData: Data, fileKey: Data,
+ decryptionHeader: String
+ ) throws -> Data {
guard let headerBytes = Data(base64Encoded: decryptionHeader) else {
throw CastError.decryptionError("Invalid base64 in file decryption header")
}
@@ -1184,7 +1207,8 @@ func extractZipUsingFoundation(zipURL: URL, to destinationURL: URL) throws {
func extractLivePhotoComponents(from zipData: Data) throws -> LivePhotoComponents {
let tempDirectory = FileManager.default.temporaryDirectory
let zipURL = tempDirectory.appendingPathComponent("livephoto_\(UUID().uuidString).zip")
- let extractDirectory = tempDirectory
+ let extractDirectory =
+ tempDirectory
.appendingPathComponent("livephoto_extract_\(UUID().uuidString)")
defer {
@@ -1221,9 +1245,7 @@ func extractLivePhotoComponents(from zipData: Data) throws -> LivePhotoComponent
}
while let fileURL = enumerator?.nextObject() as? URL {
- if (try? fileURL.resourceValues(forKeys: Set(resourceKeys)).isDirectory) ==
- true
- {
+ if (try? fileURL.resourceValues(forKeys: Set(resourceKeys)).isDirectory) == true {
continue
}
let filename = fileURL.lastPathComponent
@@ -1253,22 +1275,19 @@ func extractLivePhotoComponents(from zipData: Data) throws -> LivePhotoComponent
if let guessImage = contents.first(where: { $0.pathExtension.isEmpty }) {
imageData = try? Data(contentsOf: guessImage)
imagePath = guessImage
- if imageData !=
- nil
- {
+ if imageData != nil {
print("Heuristic image pick: \(guessImage.lastPathComponent)")
}
}
}
if videoData == nil {
- if let guessVideo = contents
+ if let guessVideo =
+ contents
.first(where: { ["bin", "dat"].contains($0.pathExtension.lowercased()) })
{
videoData = try? Data(contentsOf: guessVideo)
videoPath = guessVideo
- if videoData !=
- nil
- {
+ if videoData != nil {
print("Heuristic video pick: \(guessVideo.lastPathComponent)")
}
}
@@ -1276,7 +1295,8 @@ func extractLivePhotoComponents(from zipData: Data) throws -> LivePhotoComponent
}
if imageData == nil, videoData == nil {
- throw CastError
+ throw
+ CastError
.decryptionError("No valid image or video components found in live photo zip")
}
diff --git a/apple/apps/cast/Cast/Views/APIEndpointView.swift b/apple/apps/cast/Cast/Views/APIEndpointView.swift
index 6257048f37..a33646e00c 100644
--- a/apple/apps/cast/Cast/Views/APIEndpointView.swift
+++ b/apple/apps/cast/Cast/Views/APIEndpointView.swift
@@ -34,11 +34,17 @@ struct APIEndpointView: View {
APIEndpoint.reset()
onSave()
dismiss()
- } label: { buttonLabel("Use Ente") }
- .disabled(isSaving)
- }
- Button(role: .cancel) { dismiss() } label: { buttonLabel("Cancel") }
+ } label: {
+ buttonLabel("Use Ente")
+ }
.disabled(isSaving)
+ }
+ Button(role: .cancel) {
+ dismiss()
+ } label: {
+ buttonLabel("Cancel")
+ }
+ .disabled(isSaving)
}
if isSaving {
diff --git a/apple/apps/cast/Cast/Views/PairingView.swift b/apple/apps/cast/Cast/Views/PairingView.swift
index e7d91d5a23..4d169262f9 100644
--- a/apple/apps/cast/Cast/Views/PairingView.swift
+++ b/apple/apps/cast/Cast/Views/PairingView.swift
@@ -23,13 +23,17 @@ struct PairingView: View {
VStack(spacing: 0) {
VStack(spacing: -5) {
Text("Ready to")
- .font(FontUtils
- .montserratExtraBold(size: geometry.size.width * 0.035))
+ .font(
+ FontUtils
+ .montserratExtraBold(size: geometry.size.width * 0.035)
+ )
.foregroundColor(.white)
Text("Connect?")
- .font(FontUtils
- .montserratExtraBold(size: geometry.size.width * 0.065))
+ .font(
+ FontUtils
+ .montserratExtraBold(size: geometry.size.width * 0.065)
+ )
.foregroundColor(.white)
}
.padding(.top, geometry.size.height * 0.06)
@@ -40,11 +44,13 @@ struct PairingView: View {
ZStack {
// Reserve six characters so the box does not resize.
Text(deviceCode.isEmpty ? "000000" : deviceCode)
- .font(.system(
- size: geometry.size.width * 0.09,
- weight: .heavy,
- design: .monospaced,
- ))
+ .font(
+ .system(
+ size: geometry.size.width * 0.09,
+ weight: .heavy,
+ design: .monospaced,
+ )
+ )
.tracking(geometry.size.width * 0.015)
.opacity(0)
@@ -55,11 +61,13 @@ struct PairingView: View {
.scaleEffect(1.8)
} else {
Text(deviceCode)
- .font(.system(
- size: geometry.size.width * 0.09,
- weight: .heavy,
- design: .monospaced,
- ))
+ .font(
+ .system(
+ size: geometry.size.width * 0.09,
+ weight: .heavy,
+ design: .monospaced,
+ )
+ )
.tracking(geometry.size.width * 0.015)
.foregroundColor(.white)
.scaleEffect(pulseScale)
@@ -116,15 +124,19 @@ struct PairingView: View {
Image("ducky_camera")
.resizable()
.aspectRatio(contentMode: .fit)
- .frame(width: geometry.size.width * 0.27,
- height: geometry.size.width * 0.27)
- .offset(x: geometry.size.width * 0.18,
- y: geometry.size.height * 0.18)
+ .frame(
+ width: geometry.size.width * 0.27,
+ height: geometry.size.width * 0.27
+ )
+ .offset(
+ x: geometry.size.width * 0.18,
+ y: geometry.size.height * 0.18)
}
}
}
- .frame(width: geometry.size.width * 0.8,
- height: geometry.size.height * 0.85)
+ .frame(
+ width: geometry.size.width * 0.8,
+ height: geometry.size.height * 0.85)
Spacer()
.frame(width: geometry.size.width * 0.15)
@@ -167,8 +179,9 @@ struct InstructionStep: View {
ZStack {
Circle()
.fill(Color(red: 0 / 255, green: 150 / 255, blue: 51 / 255))
- .frame(width: geometry.size.width * 0.035,
- height: geometry.size.width * 0.035)
+ .frame(
+ width: geometry.size.width * 0.035,
+ height: geometry.size.width * 0.035)
Image(systemName: icon)
.font(.system(size: geometry.size.width * 0.015, weight: .medium))
diff --git a/apple/apps/cast/Cast/Views/SlideshowView.swift b/apple/apps/cast/Cast/Views/SlideshowView.swift
index f6e6d677aa..79b5efb8b4 100644
--- a/apple/apps/cast/Cast/Views/SlideshowView.swift
+++ b/apple/apps/cast/Cast/Views/SlideshowView.swift
@@ -69,21 +69,23 @@ struct SlideshowView: View {
videoData: videoData,
suggestedFilename: slideshowService.currentFile?.title,
)
- .transition(.asymmetric(
- insertion: .scale(scale: 1.1).combined(with: .opacity),
- removal: .scale(scale: 0.9).combined(with: .opacity),
- ))
+ .transition(
+ .asymmetric(
+ insertion: .scale(scale: 1.1).combined(with: .opacity),
+ removal: .scale(scale: 0.9).combined(with: .opacity),
+ ))
} else if isLivePhoto, isPlayingLivePhotoVideo,
- let liveVideoData = slideshowService.livePhotoVideoData
+ let liveVideoData = slideshowService.livePhotoVideoData
{
VideoPlayerView(
videoData: liveVideoData,
suggestedFilename: slideshowService.currentFile?.title,
)
- .transition(.asymmetric(
- insertion: .scale(scale: 1.1).combined(with: .opacity),
- removal: .scale(scale: 0.9).combined(with: .opacity),
- ))
+ .transition(
+ .asymmetric(
+ insertion: .scale(scale: 1.1).combined(with: .opacity),
+ removal: .scale(scale: 0.9).combined(with: .opacity),
+ ))
} else if let uiImage = mainUIImage {
ZStack {
if let prevImage = previousUIImage {
@@ -114,8 +116,9 @@ struct SlideshowView: View {
} else {
if let error = slideshowService.error,
- error.contains("No media files available") || error
- .contains("Empty file list")
+ error.contains("No media files available")
+ || error
+ .contains("Empty file list")
{
EmptyState()
} else if slideshowService.totalSlides == 0, !slideshowService.isPlaying {
@@ -212,10 +215,11 @@ struct SlideshowView: View {
isPlaying: slideshowService.isPlaying,
isPaused: slideshowService.isPaused,
)
- .transition(.asymmetric(
- insertion: .opacity.combined(with: .move(edge: .bottom)),
- removal: .opacity,
- ))
+ .transition(
+ .asymmetric(
+ insertion: .opacity.combined(with: .move(edge: .bottom)),
+ removal: .opacity,
+ ))
}
}
@@ -589,10 +593,11 @@ struct ActionFeedbackView: View {
.background(
RoundedRectangle(cornerRadius: 16)
.fill(Color.black.opacity(0.7))
- .overlay(RoundedRectangle(cornerRadius: 16).stroke(
- Color.white.opacity(0.2),
- lineWidth: 1,
- )),
+ .overlay(
+ RoundedRectangle(cornerRadius: 16).stroke(
+ Color.white.opacity(0.2),
+ lineWidth: 1,
+ )),
)
.transition(.scale.combined(with: .opacity))
}
@@ -626,38 +631,14 @@ struct AppleStyleToast: View {
}
}
-class MockSlideshowService: ObservableObject {
- @Published var currentFile: (title: String, isLivePhoto: Bool)? = (
- title: "Sample Image",
- isLivePhoto: false,
- )
- @Published var isPlaying: Bool = true
- @Published var isPaused: Bool = false
- @Published var livePhotoVideoData: Data? = nil
-
- func togglePlayPause() {
- isPaused.toggle()
- }
-
- func nextSlide() async {}
- func previousSlide() async {}
- func pause() {
- isPaused = true
- }
-
- func resume() {
- isPaused = false
- }
-}
-
#Preview {
struct PreviewWrapper: View {
- @StateObject private var slideshowService = MockSlideshowService()
+ @StateObject private var slideshowService = RealSlideshowService()
var body: some View {
SlideshowView(
imageData: nil,
- slideshowService: slideshowService as! RealSlideshowService,
+ slideshowService: slideshowService,
)
}
}
diff --git a/apple/apps/cast/Cast/Views/VideoPlayerView.swift b/apple/apps/cast/Cast/Views/VideoPlayerView.swift
index d634d02ab1..6f79ae0373 100644
--- a/apple/apps/cast/Cast/Views/VideoPlayerView.swift
+++ b/apple/apps/cast/Cast/Views/VideoPlayerView.swift
@@ -35,11 +35,14 @@ struct VideoPlayerView: View {
} else {
VStack(spacing: 24) {
ProgressView()
- .progressViewStyle(CircularProgressViewStyle(tint: Color(
- red: 29 / 255,
- green: 185 / 255,
- blue: 84 / 255,
- )))
+ .progressViewStyle(
+ CircularProgressViewStyle(
+ tint: Color(
+ red: 29 / 255,
+ green: 185 / 255,
+ blue: 84 / 255,
+ ))
+ )
.scaleEffect(2.0)
Text("Loading video...")
@@ -211,12 +214,14 @@ struct VideoPlayerView: View {
}
}
- private func createTemporaryVideoFile(from data: Data,
- suggestedExtension: String? = nil) async throws -> URL
- {
+ private func createTemporaryVideoFile(
+ from data: Data,
+ suggestedExtension: String? = nil
+ ) async throws -> URL {
let tempDirectory = FileManager.default.temporaryDirectory
let fileExtension = detectVideoExtension(from: data) ?? suggestedExtension ?? "mp4"
- let tempURL = tempDirectory
+ let tempURL =
+ tempDirectory
.appendingPathComponent("cast_video_\(UUID().uuidString).\(fileExtension)")
try data.write(to: tempURL)
@@ -237,11 +242,11 @@ struct VideoPlayerView: View {
// MP4/MOV formats (most compatible with AVPlayer)
if headerBytes.count >= 12 {
- let ftyp = headerBytes.subdata(in: 4 ..< 8)
+ let ftyp = headerBytes.subdata(in: 4..<8)
if ftyp == Data("ftyp".utf8) {
- let brand = headerBytes.subdata(in: 8 ..< 12)
- if brand == Data("mp41".utf8) || brand == Data("mp42".utf8) ||
- brand == Data("isom".utf8) || brand == Data("M4V ".utf8)
+ let brand = headerBytes.subdata(in: 8..<12)
+ if brand == Data("mp41".utf8) || brand == Data("mp42".utf8)
+ || brand == Data("isom".utf8) || brand == Data("M4V ".utf8)
{
return "mp4"
} else if brand == Data("qt ".utf8) {
@@ -253,7 +258,7 @@ struct VideoPlayerView: View {
// Check for H.264 NAL units (common in MP4)
if headerBytes.count >= 4 {
if signature[0] == 0x00, signature[1] == 0x00, signature[2] == 0x00,
- signature[3] == 0x01
+ signature[3] == 0x01
{
return "mp4"
}
@@ -261,7 +266,7 @@ struct VideoPlayerView: View {
// AVI format (less compatible with tvOS)
if signature == Data("RIFF".utf8), headerBytes.count >= 12 {
- let aviSignature = headerBytes.subdata(in: 8 ..< 12)
+ let aviSignature = headerBytes.subdata(in: 8..<12)
if aviSignature == Data("AVI ".utf8) {
return "avi"
}