Getting there

matt-ramotar · Jul 7, 2024 · 249cec7 · 249cec7
1 parent c5561b3
commit 249cec7
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/...g/mobilenativefoundation/storex/paging/runtime/internal/pager/api/LinkedHashMapManager.kt b/...g/mobilenativefoundation/storex/paging/runtime/internal/pager/api/LinkedHashMapManager.kt
@@ -23,7 +23,7 @@ internal interface LinkedHashMapManager<Id : Identifier<Id>, K : Comparable<K>,
     suspend fun getPersistedItem(id: Id): V?
 
     suspend fun getCachedPage(key: K):  PagingSource. LoadResult. Data<Id, K, V>?
-    suspend fun getPersistedPage(key: K):  PagingSource. LoadResult. Data<Id, K, V>?
+    suspend fun getPersistedPage(params: PagingSource.LoadParams<K>):  PagingSource. LoadResult. Data<Id, K, V>?
 
     suspend fun saveItem(item: V) : PersistenceResult<Unit>
     suspend fun getItemsInOrder(): List<V?>

diff --git a/...ilenativefoundation/storex/paging/runtime/internal/pager/impl/RealLinkedHashMapManager.kt b/...ilenativefoundation/storex/paging/runtime/internal/pager/impl/RealLinkedHashMapManager.kt
@@ -107,8 +107,25 @@ internal class RealLinkedHashMapManager<Id : Identifier<Id>, K : Comparable<K>,
         return pageMemoryCache[key]
     }
 
-    override suspend fun getPersistedPage(key: K): PagingSource.LoadResult.Data<Id, K, V>? {
-        TODO("Not yet implemented")
+    override suspend fun getPersistedPage(params: PagingSource.LoadParams<K>): PagingSource.LoadResult.Data<Id, K, V>? {
+        val result = persistence?.pages?.getPage(params) ?: return null
+
+        return when (result) {
+            is PersistenceResult.Success -> result.data?.also { page ->
+                // If found in persistent storage, update the memory cache
+                pageMemoryCache[params.key] = page
+            }
+
+            is PersistenceResult.Error -> {
+                logger.debug("Error retrieving page: ${result.message}")
+                null
+            }
+
+            PersistenceResult.Skipped -> {
+                // Do nothing
+                null
+            }
+        }
     }
 
     override suspend fun getItemsInOrder(): List<V?> {

diff --git a/...ilenativefoundation/storex/paging/runtime/internal/pagingScope/impl/PagingScopeBuilder.kt b/...ilenativefoundation/storex/paging/runtime/internal/pagingScope/impl/PagingScopeBuilder.kt
@@ -103,9 +103,10 @@ class PagingScopeBuilder<Id : Identifier<Id>, K : Comparable<K>, V : Identifiabl
     override fun setErrorHandlingStrategy(strategy: ErrorHandlingStrategy) =
         apply { errorHandlingStrategy = strategy }
 
-    override fun setPlaceholderFactory(placeholderFactory: PlaceholderFactory<Id, K, V>): PagingScope.Builder<Id, K, V> {
-        TODO("Not yet implemented")
-    }
+    override fun setPlaceholderFactory(placeholderFactory: PlaceholderFactory<Id, K, V>): PagingScope.Builder<Id, K, V> =
+        apply {
+            this.placeholderFactory = placeholderFactory
+        }
 
     override fun setItemMemoryCache(cache: MutableMap<Id, V>) = apply { itemMemoryCache = cache }
     override fun setPageMemoryCache(cache: MutableMap<K, PagingSource.LoadResult.Data<Id, K, V>>) =

diff --git a/...g/mobilenativefoundation/storex/paging/runtime/internal/store/impl/ConcurrentPageStore.kt b/...g/mobilenativefoundation/storex/paging/runtime/internal/store/impl/ConcurrentPageStore.kt
@@ -82,7 +82,7 @@ internal class ConcurrentPageStore<Id : Identifier<Id>, K : Comparable<K>, V : I
 
                 // Attempt to load from persistent storage
                 logger.debug("Attempting to load page from persistent storage")
-                val persistedPage = linkedHashMapManager.getPersistedPage(params.key)
+                val persistedPage = linkedHashMapManager.getPersistedPage(params)
 
                 if (persistedPage != null) {
                     logger.debug("Found page in persistent storage: $persistedPage")