Skip to content

Commit 8051d27

Browse files
committed
Simplify query run title logic
1 parent 080df6e commit 8051d27

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

Sources/trailer/Actions/Actions-Update.swift

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ extension Actions {
529529
return item
530530
}
531531

532-
private static func run(_ query: Query, shouldRetry: Int = 5, asSubQuery: Bool = false) async throws {
532+
private static func run(_ query: Query, shouldRetry: Int = 5) async throws {
533533
func retryOrFail(_ message: String) async throws {
534534
if shouldRetry > 1 {
535535
log(level: .verbose, "[*\(query.name)*] \(message)")
@@ -548,10 +548,6 @@ extension Actions {
548548
return nil
549549
}
550550

551-
if shouldRetry == 5, !asSubQuery {
552-
log("[*\(query.name)*] Fetching")
553-
}
554-
555551
let info: Data
556552
do {
557553
let Q = query.queryText
@@ -601,11 +597,20 @@ extension Actions {
601597
try await run(extraQueries, asSubQueries: true)
602598
}
603599

604-
private static func run(_ queries: Lista<Query>, asSubQueries: Bool = false) async throws {
600+
private static var lastRunTitle = ""
601+
private static func run(_ queries: Lista<Query>, asSubQueries _: Bool = false) async throws {
602+
guard let firstQuery = queries.first else {
603+
return
604+
}
605+
let title = "[*\(firstQuery.name)*] Fetching"
606+
if lastRunTitle != title {
607+
lastRunTitle = title
608+
log(title)
609+
}
605610
try await withThrowingTaskGroup(of: Void.self) { group in
606611
for query in queries {
607612
group.addTask {
608-
try await run(query, asSubQuery: asSubQueries)
613+
try await run(query)
609614
}
610615
}
611616
try await group.waitForAll()

0 commit comments

Comments
 (0)