Format all sources using swift-format

mbernson · Jan 26, 2025 · 4916528 · 4916528
1 parent 51472fd
commit 4916528
Show file tree

Hide file tree

Showing 30 changed files with 306 additions and 193 deletions.
diff --git a/.swift-format b/.swift-format
@@ -0,0 +1,7 @@
+{
+  "indentation" : {
+    "spaces" : 4
+  },
+  "tabWidth" : 4,
+  "version" : 1
+}
diff --git a/.swiftformat b/.swiftformat
diff --git a/.swiftlint.yml b/.swiftlint.yml
diff --git a/CCCApi/Package.swift b/CCCApi/Package.swift
@@ -11,7 +11,7 @@ let package = Package(
         .library(
             name: "CCCApi",
             targets: ["CCCApi"]
-        ),
+        )
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
@@ -23,6 +23,6 @@ let package = Package(
         .target(
             name: "CCCApi",
             dependencies: []
-        ),
+        )
     ]
 )
diff --git a/CCCApi/Sources/CCCApi/ApiService.swift b/CCCApi/Sources/CCCApi/ApiService.swift
@@ -32,7 +32,8 @@ public class ApiService {
             if let date = self.iso8601Formatter.date(from: dateString) {
                 return date
             } else {
-                throw DecodingError.dataCorruptedError(in: container, debugDescription: "Unable to parse ISO 8601 date")
+                throw DecodingError.dataCorruptedError(
+                    in: container, debugDescription: "Unable to parse ISO 8601 date")
             }
         }
     }
@@ -46,14 +47,16 @@ public class ApiService {
     }
 
     public func conference(acronym: String) async throws -> Conference {
-        let (data, _) = try await session.data(from: baseURL.appendingPathComponent("conferences").appendingPathComponent(acronym))
+        let (data, _) = try await session.data(
+            from: baseURL.appendingPathComponent("conferences").appendingPathComponent(acronym))
         return try decoder.decode(Conference.self, from: data)
     }
 
     // MARK: Talks
 
     public func talk(id: String) async throws -> Talk {
-        let (data, _) = try await session.data(from: baseURL.appendingPathComponent("events").appendingPathComponent(id))
+        let (data, _) = try await session.data(
+            from: baseURL.appendingPathComponent("events").appendingPathComponent(id))
         let response = try decoder.decode(Talk.self, from: data)
         return response
     }
@@ -65,7 +68,8 @@ public class ApiService {
     }
 
     public func recentTalks() async throws -> [Talk] {
-        let (data, _) = try await session.data(from: baseURL.appendingPathComponent("events").appendingPathComponent("recent"))
+        let (data, _) = try await session.data(
+            from: baseURL.appendingPathComponent("events").appendingPathComponent("recent"))
         let response = try decoder.decode(EventsResponse.self, from: data)
         return response.events
     }
@@ -91,12 +95,14 @@ public class ApiService {
     // MARK: Recordings
 
     public func recordings(for talk: Talk) async throws -> [Recording] {
-        let (data, _) = try await session.data(from: baseURL.appendingPathComponent("events").appendingPathComponent(talk.guid))
+        let (data, _) = try await session.data(
+            from: baseURL.appendingPathComponent("events").appendingPathComponent(talk.guid))
         let response = try decoder.decode(TalkExtended.self, from: data)
         guard let recordings = response.recordings else {
             return []
         }
-        return recordings
+        return
+            recordings
             // Remove formats Apple doesn't support
             .filter { !$0.mimeType.contains("opus") }
             .filter { !$0.mimeType.contains("webm") }

diff --git a/CCCApi/Sources/CCCApi/Models/Conference.swift b/CCCApi/Sources/CCCApi/Models/Conference.swift
@@ -30,7 +30,12 @@ public struct Conference: Decodable, Identifiable, Sendable {
 
     public var id: String { slug }
 
-    init(acronym: String, slug: String, title: String, updatedAt: Date, eventLastReleasedAt: Date? = nil, events: [Talk]? = nil, link: URL? = nil, description: String? = nil, aspectRatio: AspectRatio? = nil, webgenLocation: String, url: URL, logoURL: URL, imagesURL: URL? = nil, recordingsURL: URL? = nil) {
+    init(
+        acronym: String, slug: String, title: String, updatedAt: Date,
+        eventLastReleasedAt: Date? = nil, events: [Talk]? = nil, link: URL? = nil,
+        description: String? = nil, aspectRatio: AspectRatio? = nil, webgenLocation: String,
+        url: URL, logoURL: URL, imagesURL: URL? = nil, recordingsURL: URL? = nil
+    ) {
         self.acronym = acronym
         self.slug = slug
         self.title = title
@@ -101,7 +106,8 @@ public struct AspectRatio: Decodable, Sendable {
         let parts = string.components(separatedBy: ":")
             .compactMap(Double.init)
         if parts.count != 2 {
-            throw DecodingError.dataCorruptedError(in: container, debugDescription: "Invalid aspect ratio")
+            throw DecodingError.dataCorruptedError(
+                in: container, debugDescription: "Invalid aspect ratio")
         } else {
             width = parts[0]
             height = parts[1]

diff --git a/CCCApi/Sources/CCCApi/Models/Examples.swift b/CCCApi/Sources/CCCApi/Models/Examples.swift
@@ -9,15 +9,16 @@ import Foundation
 
 // swiftlint:disable force_try
 
-public extension Conference {
-    static let example = Conference(
+extension Conference {
+    public static let example = Conference(
         acronym: "MCH2022",
         slug: "conferences/camp-NL/mch2022",
         title: "May Contain Hackers 2022",
         updatedAt: try! Date("2022-07-29T20:45:05Z", strategy: .iso8601),
         eventLastReleasedAt: try! Date("2022-07-26T00:00:00Z", strategy: .iso8601),
         link: URL(string: "https://mch2022.org/")!,
-        description: "MCH2022 was a nonprofit outdoor hacker camp taking place in Zeewolde, the Netherlands, July 22 to 26 2022. The event is organized for and by volunteers from and around all facets of the worldwide hacker community.\r\n\r\nKnowledge sharing, technological advancement, experimentation, connecting with your hacker peers and hacking are some of the core values of this event.\r\n\r\nMCH2022 is the successor of a string of similar events happening every four years since 1989. These are GHP, HEU, HIP, HAL, WTH, HAR, OHM and SHA.",
+        description:
+            "MCH2022 was a nonprofit outdoor hacker camp taking place in Zeewolde, the Netherlands, July 22 to 26 2022. The event is organized for and by volunteers from and around all facets of the worldwide hacker community.\r\n\r\nKnowledge sharing, technological advancement, experimentation, connecting with your hacker peers and hacking are some of the core values of this event.\r\n\r\nMCH2022 is the successor of a string of similar events happening every four years since 1989. These are GHP, HEU, HIP, HAL, WTH, HAR, OHM and SHA.",
         aspectRatio: AspectRatio(width: 16, height: 9),
         webgenLocation: "conferences/camp-NL/mch2022",
         url: URL(string: "https://static.media.ccc.de/media/events/MCH2022/logo.png")!,
@@ -27,8 +28,8 @@ public extension Conference {
     )
 }
 
-public extension Talk {
-    static let example = Talk(
+extension Talk {
+    public static let example = Talk(
         guid: "cf4dc17c-aab4-5868-9b57-100a55a1c2fb",
         title: "⚠️ May Contain Hackers 2022 Closing",
         subtitle: nil,
@@ -37,7 +38,7 @@ public extension Talk {
         description: "It's over before you know it...",
         originalLanguage: "eng",
         persons: [
-            "Elger \"Stitch\" Jonker",
+            "Elger \"Stitch\" Jonker"
         ],
         tags: [
             "mch2022",
@@ -54,18 +55,32 @@ public extension Talk {
         duration: 1066,
         conferenceTitle: "May Contain Hackers 2022",
         conferenceURL: URL(string: "https://api.media.ccc.de/public/conferences/MCH2022")!,
-        thumbURL: URL(string: "https://static.media.ccc.de/media/events/MCH2022/110-cf4dc17c-aab4-5868-9b57-100a55a1c2fb.jpg")!,
-        posterURL: URL(string: "https://static.media.ccc.de/media/events/MCH2022/110-cf4dc17c-aab4-5868-9b57-100a55a1c2fb_preview.jpg")!,
-        timelineURL: URL(string: "https://static.media.ccc.de/media/events/MCH2022/110-cf4dc17c-aab4-5868-9b57-100a55a1c2fb.timeline.jpg")!,
-        thumbnailsURL: URL(string: "https://static.media.ccc.de/media/events/MCH2022/110-cf4dc17c-aab4-5868-9b57-100a55a1c2fb.thumbnails.vtt")!,
-        frontendLink: URL(string: "https://media.ccc.de/v/mch2022-110--may-contain-hackers-2022-closing")!,
-        url: URL(string: "https://api.media.ccc.de/public/events/cf4dc17c-aab4-5868-9b57-100a55a1c2fb")!,
+        thumbURL: URL(
+            string:
+                "https://static.media.ccc.de/media/events/MCH2022/110-cf4dc17c-aab4-5868-9b57-100a55a1c2fb.jpg"
+        )!,
+        posterURL: URL(
+            string:
+                "https://static.media.ccc.de/media/events/MCH2022/110-cf4dc17c-aab4-5868-9b57-100a55a1c2fb_preview.jpg"
+        )!,
+        timelineURL: URL(
+            string:
+                "https://static.media.ccc.de/media/events/MCH2022/110-cf4dc17c-aab4-5868-9b57-100a55a1c2fb.timeline.jpg"
+        )!,
+        thumbnailsURL: URL(
+            string:
+                "https://static.media.ccc.de/media/events/MCH2022/110-cf4dc17c-aab4-5868-9b57-100a55a1c2fb.thumbnails.vtt"
+        )!,
+        frontendLink: URL(
+            string: "https://media.ccc.de/v/mch2022-110--may-contain-hackers-2022-closing")!,
+        url: URL(
+            string: "https://api.media.ccc.de/public/events/cf4dc17c-aab4-5868-9b57-100a55a1c2fb")!,
         related: []
     )
 }
 
-public extension Recording {
-    static let example = Recording(
+extension Recording {
+    public static let example = Recording(
         size: 461,
         length: 1066,
         mimeType: "video/mp4",
@@ -77,14 +92,18 @@ public extension Recording {
         width: 1920,
         height: 1080,
         updatedAt: try! Date("2022-07-26T17:41:57Z", strategy: .iso8601),
-        recordingURL: URL(string: "https://cdn.media.ccc.de/events/MCH2022/h264-hd/mch2022-110-eng-May_Contain_Hackers_2022_Closing_hd.mp4")!, url: URL(string: "https://api.media.ccc.de/public/recordings/60586")!,
-        eventURL: URL(string: "https://api.media.ccc.de/public/events/cf4dc17c-aab4-5868-9b57-100a55a1c2fb")!,
+        recordingURL: URL(
+            string:
+                "https://cdn.media.ccc.de/events/MCH2022/h264-hd/mch2022-110-eng-May_Contain_Hackers_2022_Closing_hd.mp4"
+        )!, url: URL(string: "https://api.media.ccc.de/public/recordings/60586")!,
+        eventURL: URL(
+            string: "https://api.media.ccc.de/public/events/cf4dc17c-aab4-5868-9b57-100a55a1c2fb")!,
         conferenceURL: URL(string: "https://api.media.ccc.de/public/conferences/MCH2022")!
     )
 }
 
-public extension Array where Element == RelatedTalk {
-    static let example: [RelatedTalk] = [
+extension Array where Element == RelatedTalk {
+    public static let example: [RelatedTalk] = [
         RelatedTalk(
             eventID: 2291,
             eventGUID: "2f68e356-6c3f-4034-9640-c06d717ed96b",
@@ -113,8 +132,8 @@ public extension Array where Element == RelatedTalk {
     ]
 }
 
-public extension Array where Element == Recording {
-    static let example: [Recording] = [
+extension Array where Element == Recording {
+    public static let example: [Recording] = [
         Recording(
             size: 16,
             length: 1066,
@@ -127,9 +146,14 @@ public extension Array where Element == Recording {
             width: 0,
             height: 0,
             updatedAt: try! Date("2022-07-26T23:32:01Z", strategy: .iso8601),
-            recordingURL: URL(string: "https://cdn.media.ccc.de/events/MCH2022/mp3/mch2022-110-eng-May_Contain_Hackers_2022_Closing_mp3.mp3")!,
+            recordingURL: URL(
+                string:
+                    "https://cdn.media.ccc.de/events/MCH2022/mp3/mch2022-110-eng-May_Contain_Hackers_2022_Closing_mp3.mp3"
+            )!,
             url: URL(string: "https://api.media.ccc.de/public/recordings/60723")!,
-            eventURL: URL(string: "https://api.media.ccc.de/public/events/cf4dc17c-aab4-5868-9b57-100a55a1c2fb")!,
+            eventURL: URL(
+                string:
+                    "https://api.media.ccc.de/public/events/cf4dc17c-aab4-5868-9b57-100a55a1c2fb")!,
             conferenceURL: URL(string: "https://api.media.ccc.de/public/conferences/MCH2022")!
         ),
         Recording(
@@ -144,9 +168,14 @@ public extension Array where Element == Recording {
             width: 720,
             height: 576,
             updatedAt: try! Date("2022-07-26T23:30:43Z", strategy: .iso8601),
-            recordingURL: URL(string: "https://cdn.media.ccc.de/events/MCH2022/h264-sd/mch2022-110-eng-May_Contain_Hackers_2022_Closing_sd.mp4")!,
+            recordingURL: URL(
+                string:
+                    "https://cdn.media.ccc.de/events/MCH2022/h264-sd/mch2022-110-eng-May_Contain_Hackers_2022_Closing_sd.mp4"
+            )!,
             url: URL(string: "https://api.media.ccc.de/public/recordings/60722")!,
-            eventURL: URL(string: "https://api.media.ccc.de/public/events/cf4dc17c-aab4-5868-9b57-100a55a1c2fb")!,
+            eventURL: URL(
+                string:
+                    "https://api.media.ccc.de/public/events/cf4dc17c-aab4-5868-9b57-100a55a1c2fb")!,
             conferenceURL: URL(string: "https://api.media.ccc.de/public/conferences/MCH2022")!
         ),
         Recording(
@@ -161,9 +190,14 @@ public extension Array where Element == Recording {
             width: 1920,
             height: 1080,
             updatedAt: try! Date("2022-07-26T17:41:57Z", strategy: .iso8601),
-            recordingURL: URL(string: "https://cdn.media.ccc.de/events/MCH2022/h264-hd/mch2022-110-eng-May_Contain_Hackers_2022_Closing_hd.mp4")!,
+            recordingURL: URL(
+                string:
+                    "https://cdn.media.ccc.de/events/MCH2022/h264-hd/mch2022-110-eng-May_Contain_Hackers_2022_Closing_hd.mp4"
+            )!,
             url: URL(string: "https://api.media.ccc.de/public/recordings/60586")!,
-            eventURL: URL(string: "https://api.media.ccc.de/public/events/cf4dc17c-aab4-5868-9b57-100a55a1c2fb")!,
+            eventURL: URL(
+                string:
+                    "https://api.media.ccc.de/public/events/cf4dc17c-aab4-5868-9b57-100a55a1c2fb")!,
             conferenceURL: URL(string: "https://api.media.ccc.de/public/conferences/MCH2022")!
         ),
     ]

diff --git a/CCCApi/Sources/CCCApi/Models/Recording.swift b/CCCApi/Sources/CCCApi/Models/Recording.swift
@@ -38,7 +38,11 @@ public struct Recording: Decodable, Identifiable, Equatable, Sendable {
         mimeType.starts(with: "video")
     }
 
-    init(size: Int?, length: TimeInterval?, mimeType: String, language: String, filename: String, state: String, folder: String, isHighQuality: Bool, width: Int?, height: Int?, updatedAt: Date, recordingURL: URL, url: URL, eventURL: URL, conferenceURL: URL) {
+    init(
+        size: Int?, length: TimeInterval?, mimeType: String, language: String, filename: String,
+        state: String, folder: String, isHighQuality: Bool, width: Int?, height: Int?,
+        updatedAt: Date, recordingURL: URL, url: URL, eventURL: URL, conferenceURL: URL
+    ) {
         self.size = size
         self.length = length
         self.mimeType = mimeType

diff --git a/CCCApi/Sources/CCCApi/Models/Talk.swift b/CCCApi/Sources/CCCApi/Models/Talk.swift
@@ -44,7 +44,14 @@ public struct Talk: Decodable, Identifiable, Equatable, Sendable {
     public let url: URL
     public let related: [RelatedTalk]
 
-    init(guid: String, title: String, subtitle: String?, slug: String, link: URL?, description: String?, originalLanguage: String?, persons: [String], tags: [String], viewCount: Int, isPromoted: Bool, date: Date?, releaseDate: Date, updatedAt: Date, length: TimeInterval, duration: TimeInterval, conferenceTitle: String, conferenceURL: URL, thumbURL: URL?, posterURL: URL, timelineURL: URL, thumbnailsURL: URL, frontendLink: URL, url: URL, related: [RelatedTalk]) {
+    init(
+        guid: String, title: String, subtitle: String?, slug: String, link: URL?,
+        description: String?, originalLanguage: String?, persons: [String], tags: [String],
+        viewCount: Int, isPromoted: Bool, date: Date?, releaseDate: Date, updatedAt: Date,
+        length: TimeInterval, duration: TimeInterval, conferenceTitle: String, conferenceURL: URL,
+        thumbURL: URL?, posterURL: URL, timelineURL: URL, thumbnailsURL: URL, frontendLink: URL,
+        url: URL, related: [RelatedTalk]
+    ) {
         self.guid = guid
         self.title = title
         self.subtitle = subtitle
@@ -139,7 +146,8 @@ struct TalkExtended: Decodable {
             return []
         }
 
-        return recordings
+        return
+            recordings
             .filter { $0.mimeType == "video/mp4" }
     }
 }

diff --git a/CCCTube/ContentView.swift b/CCCTube/ContentView.swift
@@ -75,7 +75,9 @@ struct ContentView: View {
             case let .playTalk(id):
                 let talk = try await api.talk(id: id)
                 let recordings = try await api.recordings(for: talk)
-                let recording = recordings.first(where: { $0.isHighQuality }) ?? recordings.first(where: { $0.isVideo })
+                let recording =
+                    recordings.first(where: { $0.isHighQuality })
+                    ?? recordings.first(where: { $0.isVideo })
                 self.talk = TalkToPlay(talk: talk, recordingToPlay: recording)
             }
         } catch {

diff --git a/CCCTube/Extensions/Alert+Error.swift b/CCCTube/Extensions/Alert+Error.swift
@@ -10,7 +10,10 @@ import SwiftUI
 
 extension View {
     /// Presents an alert when an error is present.
-    func alert<E: Error>(_ titleKey: LocalizedStringKey, error: Binding<E?>, buttonTitleKey: LocalizedStringKey = "Ok") -> some View {
+    func alert<E: Error>(
+        _ titleKey: LocalizedStringKey, error: Binding<E?>,
+        buttonTitleKey: LocalizedStringKey = "Ok"
+    ) -> some View {
         modifier(ErrorAlert(error: error, titleKey: titleKey, buttonTitleKey: buttonTitleKey))
     }
 }
@@ -42,5 +45,7 @@ private struct ErrorAlert<E: Error>: ViewModifier {
 
 #Preview("Error alert") {
     Text(verbatim: "Preview text")
-        .alert("Preview error title", error: .constant(CCCTubeError(message: "Failed to load all the things")))
+        .alert(
+            "Preview error title",
+            error: .constant(CCCTubeError(message: "Failed to load all the things")))
 }
diff --git a/CCCTube/Features/Browse/BrowseView.swift b/CCCTube/Features/Browse/BrowseView.swift
@@ -33,20 +33,20 @@ struct BrowseView: View {
         NavigationStack {
             ScrollView {
                 #if os(tvOS)
-                if query == .popular {
-                    YearPicker(year: $year)
-                }
+                    if query == .popular {
+                        YearPicker(year: $year)
+                    }
                 #endif
 
                 TalksGrid(talks: talks)
             }
             .toolbar {
                 #if !os(tvOS)
-                if query == .popular {
-                    ToolbarItem(placement: .topBarTrailing) {
-                        YearPicker(year: $year)
+                    if query == .popular {
+                        ToolbarItem(placement: .topBarTrailing) {
+                            YearPicker(year: $year)
+                        }
                     }
-                }
                 #endif
             }
             .overlay {
@@ -57,7 +57,7 @@ struct BrowseView: View {
                 }
             }
             #if !os(tvOS)
-            .navigationTitle(query.localizedTitle)
+                .navigationTitle(query.localizedTitle)
             #endif
             .task(id: year) {
                 await refresh()

diff --git a/CCCTube/Features/Conferences/ConferenceCell.swift b/CCCTube/Features/Conferences/ConferenceCell.swift
@@ -5,8 +5,8 @@
 //  Created by Mathijs Bernson on 26/01/2025.
 //
 
-import SwiftUI
 import CCCApi
+import SwiftUI
 
 struct ConferenceCell: View {
     let conference: Conference