Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion Sources/SQLiteData/CloudKit/Internal/DataManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
}

package var temporaryDirectory: URL {
URL(fileURLWithPath: "/")
URL(fileURLWithPath: "/tmp")
}
}

Expand All @@ -86,6 +86,9 @@
static var liveValue: any DataManager {
LiveDataManager()
}
static var previewValue: any DataManager {
InMemoryDataManager()
}
static var testValue: any DataManager {
InMemoryDataManager()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
for key in record.allKeys() {
guard let assetData = state.assets[AssetID(recordID: record.recordID, key: key)]
else { continue }
let url = URL(filePath: UUID().uuidString.lowercased())
let url = dataManager.wrappedValue.temporaryDirectory.appending(path: UUID().uuidString)
try dataManager.wrappedValue.save(assetData, to: url)
record[key] = CKAsset(fileURL: url)
}
Expand Down
8 changes: 4 additions & 4 deletions Tests/SQLiteDataTests/CloudKitTests/AssetsTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
coverImage_hash: Data(32 bytes),
remindersListID: 1,
coverImage: CKAsset(
fileURL: URL(file:///6105d6cc76af400325e94d588ce511be5bfdbb73b437dc51eca43917d7a43e3d),
fileURL: URL(file:///tmp/6105d6cc76af400325e94d588ce511be5bfdbb73b437dc51eca43917d7a43e3d),
dataString: "image"
)
),
Expand All @@ -61,7 +61,7 @@

inMemoryDataManager.storage.withValue { storage in
let url = URL(
string: "file:///6105d6cc76af400325e94d588ce511be5bfdbb73b437dc51eca43917d7a43e3d"
string: "file:///tmp/6105d6cc76af400325e94d588ce511be5bfdbb73b437dc51eca43917d7a43e3d"
)!
#expect(storage[url] == Data("image".utf8))
}
Expand Down Expand Up @@ -93,7 +93,7 @@
coverImage_hash: Data(32 bytes),
remindersListID: 1,
coverImage: CKAsset(
fileURL: URL(file:///97e67a5645969953f1a4cfe2ea75649864ff99789189cdd3f6db03e59f8a8ebf),
fileURL: URL(file:///tmp/97e67a5645969953f1a4cfe2ea75649864ff99789189cdd3f6db03e59f8a8ebf),
dataString: "new-image"
)
),
Expand All @@ -117,7 +117,7 @@

inMemoryDataManager.storage.withValue { storage in
let url = URL(
string: "file:///97e67a5645969953f1a4cfe2ea75649864ff99789189cdd3f6db03e59f8a8ebf"
string: "file:///tmp/97e67a5645969953f1a4cfe2ea75649864ff99789189cdd3f6db03e59f8a8ebf"
)!
#expect(storage[url] == Data("new-image".utf8))
}
Expand Down
24 changes: 24 additions & 0 deletions Tests/SQLiteDataTests/CloudKitTests/MockCloudDatabaseTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,30 @@
#expect(error == CKError(.unknownItem))
}

@available(iOS 17, macOS 14, tvOS 17, watchOS 10, *)
@Test func assetsUseTemporaryDirectory() async throws {
let recordID = CKRecord.ID(recordName: "record")
let record = CKRecord(recordType: "Record", recordID: recordID)
let sourceURL = URL(fileURLWithPath: "/sqlite-data-test-assets/asset.jpg")
try inMemoryDataManager.save(Data("image".utf8), to: sourceURL)
record["asset"] = CKAsset(fileURL: sourceURL)

let database = syncEngine.private.database
let (saveResults, _) = try database.modifyRecords(
saving: [record],
deleting: []
)
_ = try saveResults[recordID]?.get()

let fetched = try database.record(for: recordID)
let asset = fetched["asset"] as? CKAsset
let assetDirectory = try #require(asset?.fileURL?.path())
#expect(
assetDirectory
.hasPrefix(inMemoryDataManager.temporaryDirectory.path())
)
}

@available(iOS 17, macOS 14, tvOS 17, watchOS 10, *)
@Test func saveTransaction_ChildBeforeParent() async throws {
let parent = CKRecord(recordType: "A", recordID: CKRecord.ID(recordName: "A"))
Expand Down
30 changes: 30 additions & 0 deletions Tests/SQLiteDataTests/Internal/TemporaryDirectoryDataManager.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#if canImport(CloudKit)
import ConcurrencyExtras
import Foundation
import SQLiteData

@available(iOS 17, macOS 14, tvOS 17, watchOS 10, *)
struct TemporaryDirectoryDataManager: DataManager {
let temporaryDirectory: URL
let storage = LockIsolated<[URL: Data]>([:])

func load(_ url: URL) throws -> Data {
try storage.withValue { storage in
guard let data = storage[url]
else {
struct FileNotFound: Error {}
throw FileNotFound()
}
return data
}
}

func save(_ data: Data, to url: URL) throws {
storage.withValue { $0[url] = data }
}

func sha256(of fileURL: URL) -> Data? {
nil
}
}
#endif