trying to fix crash

kvyatkovskys · Apr 4, 2023 · 1276120 · 1276120
1 parent 7950546
commit 1276120
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 22 deletions.
diff --git a/Sources/KVKLogger/KVKLogger.swift b/Sources/KVKLogger/KVKLogger.swift
@@ -76,15 +76,14 @@ open class KVKLogger {
                            details: String?) {
         let date = Date()
         if isEnableSaveIntoDB {
-            let item = store.getNewItem()
-            item?.createdAt = date
-            item?.status = status ?? .info
-            item?.logType = logType
-            item?.type = type
-            item?.details = details
-            item?.items = items
-            item?.data = data
-            store.save()
+            let item = ItemLogProxy(createdAt: date,
+                                    data: data,
+                                    details: details,
+                                    items: items,
+                                    logType: logType,
+                                    status: status ?? .info,
+                                    type: type)
+            store.save(log: item)
         }
 
         if isDebugMode != false {

diff --git a/Sources/KVKLogger/KVKLoggerProxyView.swift b/Sources/KVKLogger/KVKLoggerProxyView.swift
@@ -9,16 +9,12 @@ import SwiftUI
 
 public struct KVKLoggerView: View {
     private let persistenceContainer = KVKLogger.shared.store
-    @Environment (\.scenePhase) private var scenePhase
 
     public init() {}
 
     public var body: some View {
         KVKLoggerProxyView()
             .environment(\.managedObjectContext, persistenceContainer.viewContext)
-            .onChange(of: scenePhase) { (_) in
-                persistenceContainer.save()
-            }
     }
 }
 

diff --git a/Sources/KVKLogger/KVKModels.swift b/Sources/KVKLogger/KVKModels.swift
@@ -244,6 +244,16 @@ struct CurateContainer: Identifiable {
     }
 }
 
+struct ItemLogProxy {
+    var createdAt: Date?
+    var data: Data?
+    var details: String?
+    var items: String?
+    var logType: KVKLogType?
+    var status: KVKStatus?
+    var type: ItemLogType?
+}
+
 final class ItemLog: NSManagedObject {
 
     @NSManaged var createdAt_: Date?

diff --git a/Sources/KVKLogger/KVKPersistenceСontroller.swift b/Sources/KVKLogger/KVKPersistenceСontroller.swift
@@ -49,22 +49,25 @@ final class KVKPersistenceСontroller {
         checkOldRecords()
     }
 
-    func getNewItem() -> ItemLog? {
-        ItemLog(context: backgroundContext)
-    }
-
-    func save() {
+    func save(log: ItemLogProxy) {
         // temporary checking a file
         if let url = cacheDBURL, !FileManager.default.fileExists(atPath: url.path) {
             debugPrint("Can't find DB in directory.")
             return
         }
-
-        guard backgroundContext.hasChanges && !backgroundContext.insertedObjects.isEmpty else { return }
-
+
         backgroundContext.performAndWait { [weak self] in
+            guard let self else { return }
             do {
-                try self?.backgroundContext.save()
+                let itemLog = ItemLog(context: self.backgroundContext)
+                itemLog.createdAt_ = log.createdAt
+                itemLog.data_ = log.data
+                itemLog.details_ = log.details
+                itemLog.items_ = log.items
+                itemLog.status_ = log.status?.rawValue
+                itemLog.logType_ = log.logType?.rawValue
+                itemLog.type_ = log.type?.rawValue
+                try self.backgroundContext.save()
             } catch {
                 debugPrint("Could not save data. \(error), \(error.localizedDescription)")
             }