permissionlesstech/bitchat
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat.git synced 2026-07-24 23:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(georelay): make CSV parser nonisolated and call as Self.parseCSV to satisfy Swift 6 actor isolation

Browse Source
This commit is contained in:
jack
2025-08-24 12:41:58 +02:00
parent e44ba3e5c7
commit c55e2d4b44
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitchat/Nostr/GeoRelayDirectory.swift
+4 -4
View File
@@ -84,7 +84,7 @@ final class GeoRelayDirectory {
if let cache = self.cacheURL(), if let cache = self.cacheURL(),
let data = try? Data(contentsOf: cache), let data = try? Data(contentsOf: cache),
let text = String(data: data, encoding: .utf8) { let text = String(data: data, encoding: .utf8) {
let arr = parseCSV(text) let arr = Self.parseCSV(text)
if !arr.isEmpty { return arr } if !arr.isEmpty { return arr }
} }
// Try bundled resource(s) // Try bundled resource(s)
@@ -95,7 +95,7 @@ final class GeoRelayDirectory {
].compactMap { $0 } ].compactMap { $0 }
for url in bundleCandidates { for url in bundleCandidates {
if let data = try? Data(contentsOf: url), let text = String(data: data, encoding: .utf8) { if let data = try? Data(contentsOf: url), let text = String(data: data, encoding: .utf8) {
let arr = parseCSV(text) let arr = Self.parseCSV(text)
if !arr.isEmpty { return arr } if !arr.isEmpty { return arr }
} }
} }
@@ -103,13 +103,13 @@ final class GeoRelayDirectory {
if let cwd = FileManager.default.currentDirectoryPath as String?, if let cwd = FileManager.default.currentDirectoryPath as String?,
let data = try? Data(contentsOf: URL(fileURLWithPath: cwd).appendingPathComponent("relays/online_relays_gps.csv")), let data = try? Data(contentsOf: URL(fileURLWithPath: cwd).appendingPathComponent("relays/online_relays_gps.csv")),
let text = String(data: data, encoding: .utf8) { let text = String(data: data, encoding: .utf8) {
return parseCSV(text) return Self.parseCSV(text)
} }
SecureLogger.log("GeoRelayDirectory: no local CSV found; entries empty", category: SecureLogger.session, level: .warning) SecureLogger.log("GeoRelayDirectory: no local CSV found; entries empty", category: SecureLogger.session, level: .warning)
return [] return []
} }
private static func parseCSV(_ text: String) -> [Entry] { nonisolated static func parseCSV(_ text: String) -> [Entry] {
var result: Set<Entry> = [] var result: Set<Entry> = []
let lines = text.split(whereSeparator: { $0.isNewline }) let lines = text.split(whereSeparator: { $0.isNewline })
// Skip header if present // Skip header if present