From 8051d27074e27c0c5deb671a7e8875870c901454 Mon Sep 17 00:00:00 2001 From: Paul Tsochantaris Date: Mon, 26 Feb 2024 22:30:59 +0000 Subject: [PATCH] Simplify query run title logic --- Sources/trailer/Actions/Actions-Update.swift | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Sources/trailer/Actions/Actions-Update.swift b/Sources/trailer/Actions/Actions-Update.swift index 3f70b21..2c397c8 100644 --- a/Sources/trailer/Actions/Actions-Update.swift +++ b/Sources/trailer/Actions/Actions-Update.swift @@ -529,7 +529,7 @@ extension Actions { return item } - private static func run(_ query: Query, shouldRetry: Int = 5, asSubQuery: Bool = false) async throws { + private static func run(_ query: Query, shouldRetry: Int = 5) async throws { func retryOrFail(_ message: String) async throws { if shouldRetry > 1 { log(level: .verbose, "[*\(query.name)*] \(message)") @@ -548,10 +548,6 @@ extension Actions { return nil } - if shouldRetry == 5, !asSubQuery { - log("[*\(query.name)*] Fetching") - } - let info: Data do { let Q = query.queryText @@ -601,11 +597,20 @@ extension Actions { try await run(extraQueries, asSubQueries: true) } - private static func run(_ queries: Lista, asSubQueries: Bool = false) async throws { + private static var lastRunTitle = "" + private static func run(_ queries: Lista, asSubQueries _: Bool = false) async throws { + guard let firstQuery = queries.first else { + return + } + let title = "[*\(firstQuery.name)*] Fetching" + if lastRunTitle != title { + lastRunTitle = title + log(title) + } try await withThrowingTaskGroup(of: Void.self) { group in for query in queries { group.addTask { - try await run(query, asSubQuery: asSubQueries) + try await run(query) } } try await group.waitForAll()