tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ndb: use is_closed which also check nil ptrs

Browse Source 
not an issue atm, but maybe in the future
This commit is contained in:
William Casarin
2024-01-26 14:02:03 -08:00
parent 851bffed0f
commit 6ae326d193
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
damus/ContentView.swift
View File

@@ -466,7 +466,7 @@ struct ContentView: View {
if damus_state.ndb.reopen() {
print("txn: NOSTRDB REOPENED")
} else {
print("txn: NOSTRDB FAILED TO REOPEN closed:\(damus_state.ndb.closed)")
print("txn: NOSTRDB FAILED TO REOPEN closed:\(damus_state.ndb.is_closed)")
}
}
.onChange(of: scenePhase) { (phase: ScenePhase) in

16
nostrdb/Ndb.swift
View File

@@ -32,7 +32,11 @@ class Ndb {
let path: String?
let owns_db: Bool
var generation: Int
var closed: Bool
private var closed: Bool
var is_closed: Bool {
self.closed || self.ndb.ndb == nil
}
static func safemode() -> Ndb? {
guard let path = db_path ?? old_db_path else { return nil }
@@ -179,7 +183,7 @@ class Ndb {
}
func close() {
guard !self.closed else { return }
guard !self.is_closed else { return }
self.closed = true
print("txn: CLOSING NOSTRDB")
ndb_destroy(self.ndb.ndb)
@@ -187,7 +191,7 @@ class Ndb {
}
func reopen() -> Bool {
guard self.closed,
guard self.is_closed,
let db = Self.open(path: self.path, owns_db_file: self.owns_db) else {
return false
}
@@ -381,7 +385,7 @@ class Ndb {
}
func process_client_event(_ str: String) -> Bool {
guard !self.closed else { return false }
guard !self.is_closed else { return false }
return str.withCString { cstr in
return ndb_process_client_event(ndb.ndb, cstr, Int32(str.utf8.count)) != 0
}
@@ -407,14 +411,14 @@ class Ndb {
}
func process_event(_ str: String) -> Bool {
guard !closed else { return false }
guard !is_closed else { return false }
return str.withCString { cstr in
return ndb_process_event(ndb.ndb, cstr, Int32(str.utf8.count)) != 0
}
}
func process_events(_ str: String) -> Bool {
guard !closed else { return false }
guard !is_closed else { return false }
return str.withCString { cstr in
return ndb_process_events(ndb.ndb, cstr, str.utf8.count) != 0
}

2
nostrdb/NdbTxn.swift
View File

@@ -35,7 +35,7 @@ class NdbTxn<T> {
self.generation = Thread.current.threadDictionary["txn_generation"] as! Int
} else {
self.txn = ndb_txn()
guard !ndb.closed else { return nil }
guard !ndb.is_closed else { return nil }
self.generation = ndb.generation
let ok = ndb_begin_query(ndb.ndb.ndb, &self.txn) != 0
if !ok {