swiftformat

Author: alexito4

.swiftformat

@@ -0,0 +1,44 @@
+--swiftversion 5.5
+
+--allman false
+--assetliterals visual-width
+--closingparen balanced
+--commas always
+--conflictmarkers reject
+--elseposition same-line
+--emptybraces no-space
+--exponentcase lowercase
+--extensionacl on-extension
+# --fragment false
+--funcattributes preserve
+--guardelse auto
+--header strip
+--hexliteralcase uppercase
+--ifdef indent
+--importgrouping alpha
+--indent 4
+--linebreaks lf
+--maxwidth none
+--modifierorder 
+--nevertrailing 
+--nospaceoperators ...,..<
+--nowrapoperators 
+--operatorfunc spaced
+--patternlet hoist
+--ranges spaced
+--redundanttype inferred
+--self remove
+--semicolons never
+--shortoptionals always
+--stripunusedargs always
+--trailingclosures 
+--trimwhitespace always
+--typeattributes preserve
+--varattributes preserve
+--voidtype void
+--wraparguments before-first
+--wrapcollections before-first
+--wrapconditions preserve
+--wrapparameters before-first
+--wrapreturntype preserve
+--yodaswap always

Package.swift

@@ -13,10 +13,10 @@ let package = Package(
         .library(
             name: "RuneterraWallpapersDownloader",
             targets: ["RuneterraWallpapersDownloader"]
-        )
+        ),
     ],
     dependencies: [
-//        .package(url: "https://github.com/marmelroy/Zip", from: "2.1.1"),
+        //        .package(url: "https://github.com/marmelroy/Zip", from: "2.1.1"),
         // https://github.com/marmelroy/Zip/pull/221
         .package(url: "https://github.com/maparoni/Zip.git", .revisionItem("059e7346082d02de16220cd79df7db18ddeba8c3")),
         .package(url: "https://github.com/apple/swift-argument-parser", from: "1.0.1"),

Sources/CLI/App.swift

@@ -4,19 +4,19 @@ import RuneterraWallpapersDownloader
 
 struct Download: AsyncParsableCommand {
     static var configuration = CommandConfiguration(commandName: "runeterraWallpaper")
-    
+
     @Argument(help: "Directory to save the wallpapers.", transform: URL.init(fileURLWithPath:))
     var destination: URL
-    
+
     @Option(name: .customLong("set"), help: "Specify all the Card Sets you want download. Use the set reference. By default all sets will be downloaded. Ex: --set 1 --set 2.")
     var sets: [Int] = []
-            
+
     @Flag(help: "If true it reads the destination folder to find the zips instead of downloading them again.")
     var skipDownload: Bool = false
-    
+
     @Flag(help: "If true downloaded zips won't be removed. Useful if you want to use `skipDownload` later.")
     var keepZips: Bool = false
-        
+
     mutating func runAsync() async throws {
         print("Fetching card sets information...")
         let fetchedSets = try await CardSets().fetchSets()
@@ -28,7 +28,7 @@ struct Download: AsyncParsableCommand {
         } else {
             setsToDownload = fetchedSets
                 .filter { sets.contains($0.number) }
-            
+
             // Inform user of sets that couldn't be found.
             if setsToDownload.count != sets.count {
                 let missingSets = sets
@@ -37,24 +37,24 @@ struct Download: AsyncParsableCommand {
                     print(">> Set \(set) not found.")
                 }
             }
-            
+
             guard setsToDownload.isEmpty == false else {
                 print("Nothing to download.")
                 return
             }
-            
+
             let formatter = ListFormatter()
             formatter.locale = .init(identifier: "en_US_POSIX")
             let names = setsToDownload.map(\.name)
             let stringList = formatter.string(from: names) ?? names.joined(separator: ",")
-            print("Downloading \(setsToDownload.count) requested \(setsToDownload.count > 1 ? "sets": "set"): \(stringList).")
+            print("Downloading \(setsToDownload.count) requested \(setsToDownload.count > 1 ? "sets" : "set"): \(stringList).")
         }
         print("")
-        
+
         try await withThrowingTaskGroup(of: Void.self) { group in
             let progressBar = ProgressBar()
 
-            for `set` in setsToDownload {
+            for set in setsToDownload {
                 let ifNeeded = !skipDownload
                 let destination = destination
                 let keepZips = keepZips
@@ -88,7 +88,7 @@ private func download(
         let zipUrl = destination
             .appendingPathComponent(set.ref)
             .appendingPathExtension("zip")
-        
+
         let exists = FileManager.default.fileExists(atPath: zipUrl.path)
         if !exists {
             print("\(zipUrl.lastPathComponent) not found. Skipping this set.")
@@ -107,7 +107,7 @@ private func download(
         progressBar.update(progress, for: set)
     }
 }
-        
+
 // MARK: Extraction
 
 private func extract(_ url: URL, destination: URL, keepZips: Bool) async {
@@ -125,15 +125,15 @@ private func extract(_ url: URL, destination: URL, keepZips: Bool) async {
 func log(sets: [CardSet], destination: URL) {
     let imagesCount = try! FileManager.default
         .contentsOfDirectory(atPath: destination.path)
-        .filter({ URL(fileURLWithPath: $0).pathExtension == "png" })
+        .filter { URL(fileURLWithPath: $0).pathExtension == "png" }
         .count
-    
+
     let log = Log(
         date: Date(),
         sets: sets,
         numberOfWallpapers: imagesCount
     )
-    
+
     let logLineString = log.lineString() + "\n"
     guard let logLine = logLineString.data(using: .utf8) else {
         print("Error creating log line.")
@@ -142,7 +142,7 @@ func log(sets: [CardSet], destination: URL) {
     let logFile = destination
         .appendingPathComponent("log")
         .appendingPathExtension("csv")
-    
+
     if FileManager.default.fileExists(atPath: logFile.path) {
         if let fileHandle = try? FileHandle(forWritingTo: logFile) {
             fileHandle.seekToEndOfFile()
@@ -155,9 +155,8 @@ func log(sets: [CardSet], destination: URL) {
 }
 
 @main
-struct App {
+enum App {
     static func main() async {
         await Download.main()
     }
 }
-

Sources/CLI/Helpers.swift

@@ -1,9 +1,8 @@
 import Foundation
 
-
 extension String {
     func leftpad(_ n: Int) -> String {
-        let padding = (0..<max(0, n-self.count)).map { _ in " " }.joined()
+        let padding = (0..<max(0, n - count)).map { _ in " " }.joined()
         return "\(padding)\(self)"
     }
 }

Sources/CLI/Log.swift

@@ -10,13 +10,13 @@ struct Log {
 extension Log {
     func lineString() -> String {
         let dateFormatter = DateFormatter()
-        dateFormatter.dateFormat = "yyyy/MM/dd" 
+        dateFormatter.dateFormat = "yyyy/MM/dd"
         let dateString = dateFormatter.string(from: date)
-        
+
         let setsString = sets
             .map(\.ref)
             .joined(separator: "-")
-        
+
         return "\(dateString),\(setsString),\(numberOfWallpapers)"
     }
 }

Sources/CLI/ProgressBar.swift

@@ -2,18 +2,18 @@ import Foundation
 import RuneterraWallpapersDownloader
 
 final class ProgressBar {
-    var progressDict = Dictionary<CardSet, Progress>()
+    var progressDict = [CardSet: Progress]()
     var lastTime = Date()
-    
+
     func update(_ progress: Progress, for cardset: CardSet) {
         progressDict[cardset] = progress
         guard Date().timeIntervalSince(lastTime) > 1 else { return }
         printProgress(progressDict: progressDict)
         lastTime = Date()
     }
-    
+
     private func printProgress(
-        progressDict: Dictionary<CardSet, Progress>
+        progressDict: [CardSet: Progress]
     ) {
         let maxNameLength = progressDict.keys.map(\.name.count).max() ?? 0
         let maxDescriptionLength = max(
@@ -24,13 +24,13 @@ final class ProgressBar {
         var printed = 0
         for (set, progress) in progressDict.sorted(by: { $0.0.ref < $1.0.ref }) {
             let bar = progressBar(fraction: progress.fractionCompleted, length: 20)
-            let percentage = "\(String(format: "%.2f", progress.fractionCompleted*100).leftpad(6))%"
-            
+            let percentage = "\(String(format: "%.2f", progress.fractionCompleted * 100).leftpad(6))%"
+
             print("\(set.name.leftpad(maxNameLength)): \(progress.localizedAdditionalDescription?.leftpad(maxDescriptionLength) ?? "") \(bar) \(percentage)")
-            
+
             printed += 1
         }
-        
+
         eraseLines(printed)
     }
 }

Sources/RuneterraWallpapersDownloader/AssetsDownloader.swift

@@ -2,16 +2,16 @@ import Foundation
 
 public final class AssetDownloader {
     private var downloadDirectory: URL?
-    
+
     public init(downloadDirectory: URL?) {
         self.downloadDirectory = downloadDirectory
     }
-    
+
     public func download(
-        sets: Array<CardSet>,
+        sets: [CardSet],
         cardsetProgress: @escaping (CardSet, Progress) -> Void
     ) async throws -> [URL] {
-        return try await withThrowingTaskGroup(of: URL.self, returning: [URL].self, body: { group in
+        try await withThrowingTaskGroup(of: URL.self, returning: [URL].self, body: { group in
             for set in sets {
                 _ = group.addTaskUnlessCancelled {
                     try await self.downloadSet(
@@ -21,12 +21,12 @@ public final class AssetDownloader {
                 }
             }
 
-            let folders = try await group.reduce(into: [], { $0.append($1) })
+            let folders = try await group.reduce(into: []) { $0.append($1) }
             assert(folders.count == sets.count)
             return folders
         })
     }
-    
+
     public func downloadSet(
         _ set: CardSet,
         onProgress: @escaping (CardSet, Progress) -> Void
@@ -36,7 +36,7 @@ public final class AssetDownloader {
             onProgress: { onProgress(set, $0) }
         )
         let zipURL: URL
-        if let downloadURL = self.downloadDirectory {
+        if let downloadURL = downloadDirectory {
             zipURL = downloadURL.appendingPathComponent(set.ref).appendingPathExtension("zip")
         } else {
             zipURL = localURL.appendingPathExtension("zip")

Sources/RuneterraWallpapersDownloader/CardSets.swift

@@ -5,7 +5,7 @@ public struct CardSet: Hashable {
     public let ref: String
     public let name: String
     public let url: URL
-    
+
     public var number: Int {
         Int(String(ref.last!))!
     }
@@ -16,9 +16,8 @@ extension CardSet: CustomStringConvertible {
 }
 
 public final class CardSets {
-    
     public init() {}
-    
+
     // https://dd.b.pvp.net/latest/core-en_us.zip
     // en_us/data/globals-en_us.json["sets"]
     public func fetchSets() async throws -> [CardSet] {
@@ -33,12 +32,12 @@ public final class CardSets {
             .appendingPathComponent(UUID().uuidString)
             .appendingPathExtension("zip")
         try FileManager.default.moveItem(at: localURL, to: zipURL)
-        
+
         // Unzip
         let destination = URL(fileURLWithPath: NSTemporaryDirectory())
             .appendingPathComponent("sets_\(UUID().uuidString)")
         try Zip.unzipFile(zipURL, destination: destination, overwrite: true, password: nil)
-        
+
         // Read globals file
         let globalsURL = destination
             .appendingPathComponent("en_us")
@@ -47,7 +46,7 @@ public final class CardSets {
             .appendingPathExtension("json")
         let data = try Data(contentsOf: globalsURL)
         let globals = try JSONDecoder().decode(Globals.self, from: data)
-        
+
         let cardSets = globals.sets
             .filter {
                 // Ignore the Events set. Is an only in game set,
@@ -61,15 +60,15 @@ public final class CardSets {
             }
             .map(CardSet.init(set:))
             .sorted(by: { $0.ref < $1.ref })
-        
+
         return cardSets
     }
 }
 
 /// Decoder for globals json file
 private struct Globals: Decodable {
     let sets: [Set]
-    
+
     struct Set: Decodable {
         public let name: String
         public let nameRef: String

Sources/RuneterraWallpapersDownloader/URLSessionAsync.swift

@@ -5,14 +5,14 @@ private final class Box<T> {
     init(_ value: T) { self.value = value }
 }
 
-extension URLSession {
+public extension URLSession {
     /// Convenience method to download using an URLRequest, creates and resumes an URLSessionDownloadTask internally.
     ///
     /// - Parameter request: The URLRequest for which to download.
     /// - Parameter onProgress: Closure to call when the progress of the task is updated.
     /// - Parameter delegate: Task-specific delegate.
     /// - Returns: Downloaded file URL and response. The file will not be removed automatically.
-    public func download(
+    func download(
         for request: URLRequest,
         onProgress: @escaping (Progress) -> Void,
         delegate: URLSessionTaskDelegate? = nil
@@ -46,7 +46,7 @@ extension URLSession {
                 observation.value = task.progress.observe(\.fractionCompleted) { progress, _ in
                     onProgress(progress)
                 }
-                
+
                 task.resume()
             }
         } onCancel: {