Use Realm in a more memory efficient way for extensions

home-assistant · Apr 25, 2024 · afd8dd5 · afd8dd5
1 parent a3e10a5
commit afd8dd5
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/Sources/Extensions/AppIntents/Widget/Actions/WidgetActionsAppIntentTimelineProvider.swift b/Sources/Extensions/AppIntents/Widget/Actions/WidgetActionsAppIntentTimelineProvider.swift
@@ -1,6 +1,7 @@
 import AppIntents
 import Shared
 import WidgetKit
+import RealmSwift
 
 @available(iOS 17, *)
 struct WidgetActionsAppIntentTimelineProvider: AppIntentTimelineProvider {
@@ -14,7 +15,7 @@ struct WidgetActionsAppIntentTimelineProvider: AppIntentTimelineProvider {
     func timeline(for configuration: Intent, in context: Context) async -> Timeline<Entry> {
         .init(
             entries: [Self.entry(for: configuration, in: context)],
-            policy: .after(Current.date().addingTimeInterval(expiration.converted(to: .seconds).value))
+            policy: .after(Current.date().addingTimeInterval(WidgetActionsDataSource.expiration.converted(to: .seconds).value))
         )
     }
 
@@ -30,10 +31,6 @@ struct WidgetActionsAppIntentTimelineProvider: AppIntentTimelineProvider {
         return WidgetActionsEntry(actions: actions)
     }
 
-    private var expiration: Measurement<UnitDuration> {
-        .init(value: 24, unit: .hours)
-    }
-
     private static func entry(for configuration: Intent, in context: Context) -> Entry {
         if let existing = configuration.actions?.compactMap({ $0.asAction() }), !existing.isEmpty {
             return .init(actions: existing)
@@ -43,7 +40,7 @@ struct WidgetActionsAppIntentTimelineProvider: AppIntentTimelineProvider {
     }
 
     private static func defaultActions(in context: Context) -> [Action] {
-        let allActions = Current.realm().objects(Action.self).sorted(byKeyPath: #keyPath(Action.Position))
+        let allActions = WidgetActionsDataSource.actions
         let maxCount = WidgetBasicContainerView.maximumCount(family: context.family)
 
         switch allActions.count {
@@ -61,10 +58,21 @@ extension IntentActionAppEntity {
             return nil
         }
 
-        guard let result = Current.realm().object(ofType: Action.self, forPrimaryKey: id) else {
+        guard let result = Realm.getRealm(objectTypes: [Action.self, RLMScene.self]).object(ofType: Action.self, forPrimaryKey: id) else {
             return nil
         }
 
         return result
     }
 }
+
+final class WidgetActionsDataSource {
+    static var expiration: Measurement<UnitDuration> {
+        .init(value: 24, unit: .hours)
+    }
+
+    static var actions: Results<Action> {
+        return Realm.getRealm(objectTypes: [Action.self, RLMScene.self]).objects(Action.self).sorted(byKeyPath: #keyPath(Action.Position))
+    }
+
+}
diff --git a/Sources/Extensions/Widgets/Actions/WidgetActionsProvider.swift b/Sources/Extensions/Widgets/Actions/WidgetActionsProvider.swift
@@ -23,7 +23,7 @@ struct WidgetActionsProvider: IntentTimelineProvider {
     }
 
     private static func defaultActions(in context: Context) -> [Action] {
-        let allActions = Current.realm().objects(Action.self).sorted(byKeyPath: #keyPath(Action.Position))
+        let allActions = WidgetActionsDataSource.actions
         let maxCount = WidgetBasicContainerView.maximumCount(family: context.family)
 
         switch allActions.count {

diff --git a/Sources/Extensions/Widgets/Assist/WidgetAssistProvider.swift b/Sources/Extensions/Widgets/Assist/WidgetAssistProvider.swift
@@ -14,8 +14,6 @@ struct WidgetAssistProvider: IntentTimelineProvider {
     typealias Intent = AssistInAppIntent
     typealias Entry = WidgetAssistEntry
 
-    @Environment(\.diskCache) var diskCache: DiskCache
-
     func placeholder(in context: Context) -> WidgetAssistEntry {
         .init()
     }

diff --git a/Sources/Shared/Common/Extensions/Realm+Initialization.swift b/Sources/Shared/Common/Extensions/Realm+Initialization.swift
@@ -29,6 +29,11 @@ public extension Realm {
 
     /// The live data store, located in shared storage.
     static let live: () -> Realm = {
+        getRealm()
+    }
+
+    /// Mainly used to specify objectTypes in a context such as an extension, otherwise always use "Realm.live"
+    static func getRealm(objectTypes: [ObjectBase.Type]? = nil) -> Realm {
         if NSClassFromString("XCTest") != nil {
             do {
                 return try Realm(configuration: .init(inMemoryIdentifier: "Tests", deleteRealmIfMigrationNeeded: true))
@@ -227,7 +232,8 @@ public extension Realm {
                 // Check for the realm file size to be greater than the max file size, and the amount of bytes
                 // currently used to be less than 50% of the total realm file size
                 return (realmFileSizeInBytes > maxFileSize) && (Double(usedBytes) / Double(realmFileSizeInBytes)) < 0.5
-            }
+            },
+            objectTypes: objectTypes
         )
 
         do {