Skip to content

Commit 1716b38

Browse files
authored
fix: resolve compiler warnings across 6 files (#469)
1 parent 557487d commit 1716b38

6 files changed

Lines changed: 16 additions & 18 deletions

File tree

TablePro/Core/SSH/Auth/KeyboardInteractiveAuthenticator.swift

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,8 @@ private let kbdintCallback: @convention(c) (
5454
let prompt = prompts[i]
5555
let promptText: String
5656
if let textPtr = prompt.text, prompt.length > 0 {
57-
promptText = String(
58-
bytesNoCopy: UnsafeMutableRawPointer(mutating: textPtr),
59-
length: Int(prompt.length),
60-
encoding: .utf8,
61-
freeWhenDone: false
62-
) ?? ""
57+
let buffer = UnsafeBufferPointer(start: textPtr, count: Int(prompt.length))
58+
promptText = String(decoding: buffer, as: UTF8.self)
6359
} else {
6460
promptText = ""
6561
}

TablePro/ViewModels/RedisKeyTreeViewModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ internal final class RedisKeyTreeViewModel {
8686
.map { .key(name: $0.key, fullKey: $0.key, keyType: $0.type) }
8787
}
8888

89-
var root = TrieNode()
89+
let root = TrieNode()
9090
for entry in keys {
9191
let parts = entry.key.components(separatedBy: separator)
9292
root.insert(parts: parts, fullKey: entry.key, keyType: entry.type)

TablePro/Views/Main/Extensions/MainContentCoordinator+Navigation.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ extension MainContentCoordinator {
469469
sidebarState.redisKeyTreeViewModel = vm
470470
}
471471
Task {
472-
await sidebarViewModel?.redisKeyTreeViewModel?.loadKeys(
472+
await self.sidebarViewModel?.redisKeyTreeViewModel?.loadKeys(
473473
connectionId: connId,
474474
database: database,
475475
separator: separator

TablePro/Views/Main/MainContentView.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ struct MainContentView: View {
230230

231231
let capturedWindowId = windowId
232232
let connectionId = connection.id
233-
let connectionName = connection.name
234233
Task { @MainActor in
235234
// Grace period: SwiftUI fires onDisappear transiently during tab group
236235
// merges/splits, then re-fires onAppear shortly after. The onAppear

TablePro/Views/Results/DataGridView+RowActions.swift

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ extension TableViewCoordinator {
3333

3434
func copyRows(at indices: Set<Int>) {
3535
let sortedIndices = indices.sorted()
36-
let columnTypes = (rowProvider as? InMemoryRowProvider)?.columnTypes
36+
let columnTypes = rowProvider.columnTypes
3737
var lines: [String] = []
3838

3939
for index in sortedIndices {
@@ -48,7 +48,7 @@ extension TableViewCoordinator {
4848

4949
func copyRowsWithHeaders(at indices: Set<Int>) {
5050
let sortedIndices = indices.sorted()
51-
let columnTypes = (rowProvider as? InMemoryRowProvider)?.columnTypes
51+
let columnTypes = rowProvider.columnTypes
5252
var lines: [String] = []
5353

5454
// Add header row
@@ -102,8 +102,8 @@ extension TableViewCoordinator {
102102
guard columnIndex >= 0 && columnIndex < rowProvider.columns.count else { return }
103103

104104
let value = rowProvider.value(atRow: rowIndex, column: columnIndex) ?? "NULL"
105-
let columnTypes = (rowProvider as? InMemoryRowProvider)?.columnTypes
106-
let columnType = columnTypes.flatMap { $0.indices.contains(columnIndex) ? $0[columnIndex] : nil }
105+
let columnTypes = rowProvider.columnTypes
106+
let columnType = columnTypes.indices.contains(columnIndex) ? columnTypes[columnIndex] : nil
107107
let copyValue = BlobFormattingService.shared.formatIfNeeded(value, columnType: columnType, for: .copy)
108108
ClipboardService.shared.writeText(copyValue)
109109
}
@@ -143,8 +143,7 @@ extension TableViewCoordinator {
143143
func copyRowsAsJson(at indices: Set<Int>) {
144144
let rows = indices.sorted().compactMap { rowProvider.rowValues(at: $0) }
145145
guard !rows.isEmpty else { return }
146-
let columnTypes = (rowProvider as? InMemoryRowProvider)?.columnTypes
147-
?? Array(repeating: ColumnType.text(rawType: nil), count: rowProvider.columns.count)
146+
let columnTypes = rowProvider.columnTypes
148147
let converter = JsonRowConverter(columns: rowProvider.columns, columnTypes: columnTypes)
149148
ClipboardService.shared.writeText(converter.generateJson(rows: rows))
150149
}

TablePro/Views/Results/DataGridView.swift

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -838,8 +838,10 @@ final class TableViewCoordinator: NSObject, NSTableViewDelegate, NSTableViewData
838838
object: nil,
839839
queue: .main
840840
) { [weak self] _ in
841-
guard let self, let tableView = self.tableView else { return }
842-
Self.updateVisibleCellFonts(tableView: tableView)
841+
MainActor.assumeIsolated {
842+
guard let self, let tableView = self.tableView else { return }
843+
Self.updateVisibleCellFonts(tableView: tableView)
844+
}
843845
}
844846
}
845847

@@ -850,7 +852,9 @@ final class TableViewCoordinator: NSObject, NSTableViewDelegate, NSTableViewData
850852
object: connectionId,
851853
queue: .main
852854
) { [weak self] _ in
853-
self?.releaseData()
855+
MainActor.assumeIsolated {
856+
self?.releaseData()
857+
}
854858
}
855859
}
856860

0 commit comments

Comments
 (0)