♻️ refactor: swift-format

sun-yryr · Jan 1, 2022 · 3aa5e72 · 3aa5e72
1 parent 8f0630d
commit 3aa5e72
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 22 deletions.
diff --git a/Sources/App/Commands/ScrapingAgqrCommand.swift b/Sources/App/Commands/ScrapingAgqrCommand.swift
@@ -18,15 +18,15 @@ struct ScrapingAgqr: Command {
         defer {
             context.console.info("End Process")
         }
-        
+
         let promise = context.application.eventLoopGroup.next().makePromise(of: Void.self)
         promise.completeWithTask {
             await self.asyncRun(using: context, signature: signature)
         }
-        
+
         try promise.futureResult.wait()
     }
-    
+
     func asyncRun(using context: CommandContext, signature: Signature) async {
         let response = await client.execute(app: context.application, url: signature.url)
         guard let response = response else {

diff --git a/Sources/App/Jobs/ImportProgramGuideJob.swift b/Sources/App/Jobs/ImportProgramGuideJob.swift
@@ -18,10 +18,9 @@ struct ImportProgramGuideJob: ScheduledJob {
             await self.asyncRun(context: context)
         }
         return promise.futureResult
-
     }
-    
-    func asyncRun(context: QueueContext) async -> Void {
+
+    func asyncRun(context: QueueContext) async {
         let responses = await client.fetchWeekly(app: context.application)
         for response in responses {
             guard let response = response else {

diff --git a/Sources/App/Repositories/ProgramGuideRepository.swift b/Sources/App/Repositories/ProgramGuideRepository.swift
@@ -2,11 +2,11 @@ import Fluent
 import Vapor
 
 protocol ProgramGuideSaving {
-    func save(_ items: [ProgramGuide], app: Application) async -> Void
+    func save(_ items: [ProgramGuide], app: Application) async
 }
 
 struct ProgramGuideRepository: ProgramGuideSaving {
-    func save(_ items: [ProgramGuide], app: Application) async -> Void {
+    func save(_ items: [ProgramGuide], app: Application) async {
         for programGuide in items {
             do {
                 let insertedProgram = try await upsertProgram(programGuide.program, app.db)
@@ -16,7 +16,8 @@ struct ProgramGuideRepository: ProgramGuideSaving {
                     insertedPersonalities.append(p)
                 }
                 for personality in insertedPersonalities {
-                    let isAttached = try? await insertedProgram.$personalities.isAttached(to: personality, on: app.db)
+                    let isAttached = try? await insertedProgram.$personalities.isAttached(
+                        to: personality, on: app.db)
                     if isAttached == false {
                         try await insertedProgram.$personalities.attach(personality, on: app.db)
                     }
@@ -38,18 +39,19 @@ struct ProgramGuideRepository: ProgramGuideSaving {
         program.id = targetProgram?.id
         // idを挿入するだけだとうまくupdateできなかったため、判定要素を上書きする
         program._$id.exists = targetProgram != nil
-        
+
         try await program.save(on: db)
         return program
     }
 
     /// 名前を基準に(unique)insert or updateを行う.
     func upsertPersonality(_ personality: Personality, _ db: Database) async throws -> Personality {
-        let targetPersonality = try? await Personality
+        let targetPersonality =
+            try? await Personality
             .query(on: db)
             .filter(\.$name == personality.name)
             .first()
-        
+
         personality.id = targetPersonality?.id
         // idを挿入するだけだとうまくupdateできなかったため、判定要素を上書きする
         personality._$id.exists = targetPersonality != nil

diff --git a/Sources/App/Services/DownloadAgqrProgramGuide.swift b/Sources/App/Services/DownloadAgqrProgramGuide.swift
@@ -26,7 +26,7 @@ struct DownloadAgqrProgramGuide {
                     return await self.execute(app: app, url: url)
                 }
             }
-            
+
             for await response in group {
                 responses.append(response)
             }

diff --git a/Sources/App/configure.swift b/Sources/App/configure.swift
@@ -46,7 +46,7 @@ public func configure(_ app: Application) throws {
         allowedOrigin: .all,
         allowedMethods: [.GET, .OPTIONS, .HEAD],
         allowedHeaders: [
-            .accept, .contentType, .origin, .xRequestedWith, .userAgent, .accessControlAllowOrigin
+            .accept, .contentType, .origin, .xRequestedWith, .userAgent, .accessControlAllowOrigin,
         ]
     )
     app.middleware.use(CORSMiddleware(configuration: corsConfiguration))

diff --git a/tools/Package.resolved b/tools/Package.resolved
@@ -6,16 +6,16 @@
         "repositoryURL": "https://github.com/apple/swift-argument-parser.git",
         "state": {
           "branch": null,
-          "revision": "83b23d940471b313427da226196661856f6ba3e0",
-          "version": "0.4.4"
+          "revision": "e1465042f195f374b94f915ba8ca49de24300a0d",
+          "version": "1.0.2"
         }
       },
       {
         "package": "swift-format",
         "repositoryURL": "https://github.com/apple/swift-format",
         "state": {
-          "branch": "swift-5.4-branch",
-          "revision": "9c15831b798d767c9af0927a931de5d557004936",
+          "branch": "swift-5.5-branch",
+          "revision": "f872223e16742fd97fabd319fbf4a939230cc796",
           "version": null
         }
       },
@@ -24,8 +24,8 @@
         "repositoryURL": "https://github.com/apple/swift-syntax",
         "state": {
           "branch": null,
-          "revision": "2fff9fc25cdc059379b6bd309377cfab45d8520c",
-          "version": "0.50400.0"
+          "revision": "75e60475d9d8fd5bbc16a12e0eaa2cb01b0c322e",
+          "version": "0.50500.0"
         }
       }
     ]

diff --git a/tools/Package.swift b/tools/Package.swift
@@ -1,10 +1,10 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.5
 import PackageDescription
 
 let package = Package(
     name: "Tools",
     dependencies: [
-        .package(url: "https://github.com/apple/swift-format", .branch("swift-5.4-branch")),
+        .package(url: "https://github.com/apple/swift-format", .branch("swift-5.5-branch")),
         // .package(url: "https://github.com/realm/SwiftLint.git", .upToNextMajor(from: "0.43.1"))
     ]
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ struct DownloadAgqrProgramGuide { @@
                         return await self.execute(app: app, url: url)
                     }
                 }
                 for await response in group {
                     responses.append(response)
                 }
@@ Expand Down @@