Cleaned up Index and Page URL handling

Author: dimitribouniol

Sources/CodableDatastore/Persistence/Disk Persistence/Datastore/DatastoreIndex.swift

@@ -55,56 +55,11 @@ extension DiskPersistence.Datastore.Index {
 // MARK: - Common URL Accessors
 
 extension DiskPersistence.Datastore.Index {
-    /// The URL that points to the index.
-    nonisolated var indexURL: URL {
-        switch id {
-        case .primary:
-            return datastore
-                .directIndexesURL
-                .appendingPathComponent("Primary.datastoreindex", isDirectory: true)
-        case .direct(let indexID, _):
-            return datastore
-                .directIndexesURL
-                .appendingPathComponent("\(indexID).datastoreindex", isDirectory: true)
-        case .secondary(let indexID, _):
-            return datastore
-                .secondaryIndexesURL
-                .appendingPathComponent("\(indexID).datastoreindex", isDirectory: true)
-        }
-    }
-    
-    /// The URL that points to the Manifest directory.
-    nonisolated var manifestsURL: URL {
-        indexURL.appendingPathComponent("Manifest", isDirectory: true)
-    }
-    
-    /// The URL that points to the Manifest directory.
-    nonisolated var pagesURL: URL {
-        indexURL.appendingPathComponent("Pages", isDirectory: true)
-    }
-    
     /// The URL that points to the manifest.
     nonisolated var manifestURL: URL {
-        switch id {
-        case .primary(let manifestID):
-            return datastore
-                .directIndexesURL
-                .appendingPathComponent("Primary.datastoreindex", isDirectory: true)
-                .appendingPathComponent("Manifest", isDirectory: true)
-                .appendingPathComponent("\(manifestID).indexmanifest", isDirectory: false)
-        case .direct(let indexID, let manifestID):
-            return datastore
-                .directIndexesURL
-                .appendingPathComponent("\(indexID).datastoreindex", isDirectory: true)
-                .appendingPathComponent("Manifest", isDirectory: true)
-                .appendingPathComponent("\(manifestID).indexmanifest", isDirectory: false)
-        case .secondary(let indexID, let manifestID):
-            return datastore
-                .secondaryIndexesURL
-                .appendingPathComponent("\(indexID).datastoreindex", isDirectory: true)
-                .appendingPathComponent("Manifest", isDirectory: true)
-                .appendingPathComponent("\(manifestID).indexmanifest", isDirectory: false)
-        }
+        datastore
+            .manifestsURL(for: id)
+            .appendingPathComponent("\(id.manifestID).indexmanifest", isDirectory: false)
     }
 }
 
@@ -134,10 +89,26 @@ extension DiskPersistence.Datastore.Index {
         }
 
         /// Make sure the directories exists first.
-        try FileManager.default.createDirectory(at: manifestsURL, withIntermediateDirectories: true)
+        try FileManager.default.createDirectory(at: datastore.manifestsURL(for: id), withIntermediateDirectories: true)
 
         /// Encode the provided manifest, and write it to disk.
         let data = Data(manifest.bytes)
         try data.write(to: manifestURL, options: .atomic)
     }
 }
+
+// MARK: - Pages
+
+extension DiskPersistence.Datastore.Index {
+    var orderedPages: [DiskPersistence.Datastore.Page] {
+        get async throws {
+            var pages: [DiskPersistence.Datastore.Page] = []
+            
+            for pageID in try await manifest.orderedPageIDs {
+                pages.append(await datastore.page(for: .init(index: id, page: pageID)))
+            }
+            
+            return pages
+        }
+    }
+}

Sources/CodableDatastore/Persistence/Disk Persistence/Datastore/DatastorePage.swift

@@ -12,11 +12,6 @@ typealias DatastorePageIdentifier = DatedIdentifier<DiskPersistence<ReadOnly>.Da
 
 extension DiskPersistence.Datastore {
     actor Page: Identifiable {
-        struct ID: Hashable {
-            let index: Index.ID
-            let page: DatastorePageIdentifier
-        }
-        
         unowned let datastore: DiskPersistence<AccessMode>.Datastore
 
         let id: ID
@@ -30,3 +25,29 @@ extension DiskPersistence.Datastore {
         }
     }
 }
+
+// MARK: - Helper Types
+
+extension DiskPersistence.Datastore.Page {
+    struct ID: Hashable {
+        let index: DiskPersistence.Datastore.Index.ID
+        let page: DatastorePageIdentifier
+    }
+}
+
+// MARK: - Common URL Accessors
+
+extension DiskPersistence.Datastore.Page {
+    /// The URL that points to the page.
+    nonisolated var pageURL: URL {
+        let baseURL = datastore.pagesURL(for: id.index)
+        
+        guard let components = try? id.page.components else { preconditionFailure("Components could not be determined for Page.") }
+        
+        return baseURL
+            .appendingPathComponent(components.year, isDirectory: true)
+            .appendingPathComponent(components.monthDay, isDirectory: true)
+            .appendingPathComponent(components.hourMinute, isDirectory: true)
+            .appendingPathComponent("\(id).datastorepage", isDirectory: false)
+    }
+}

Sources/CodableDatastore/Persistence/Disk Persistence/Datastore/PersistenceDatastore.swift

@@ -67,6 +67,30 @@ extension DiskPersistence.Datastore {
         datastoreURL
             .appendingPathComponent("SecondaryIndexes", isDirectory: true)
     }
+    
+    nonisolated func indexURL(for indexID: Index.ID) -> URL {
+        switch indexID {
+        case .primary:
+            return directIndexesURL
+                .appendingPathComponent("Primary.datastoreindex", isDirectory: true)
+        case .direct(let indexID, _):
+            return directIndexesURL
+                .appendingPathComponent("\(indexID).datastoreindex", isDirectory: true)
+        case .secondary(let indexID, _):
+            return secondaryIndexesURL
+                .appendingPathComponent("\(indexID).datastoreindex", isDirectory: true)
+        }
+    }
+    
+    nonisolated func manifestsURL(for indexID: Index.ID) -> URL {
+        indexURL(for: indexID)
+            .appendingPathComponent("Manifest", isDirectory: true)
+    }
+    
+    nonisolated func pagesURL(for indexID: Index.ID) -> URL {
+        indexURL(for: indexID)
+            .appendingPathComponent("Pages", isDirectory: true)
+    }
 }
 
 // MARK: - Root Object Management