mirror/spacedrive
1
0
Fork 0
mirror of https://github.com/spacedriveapp/spacedrive.git synced 2026-04-29 10:52:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Simplify Library Management in DaemonConnector and Swift Client

Browse Source 
- Removed the setupLibraryManagement method and integrated its functionality directly into the loadLibraries method for better clarity.
- Enhanced library loading to automatically select the first library if none is currently selected, improving user experience.
- Updated the SpacedriveClient to streamline the switchToLibrary method, ensuring it uses the async method for library switching.
- Refactored DaemonRequest cases to align with the new action and query method signatures, enhancing consistency across the API.
This commit is contained in:
Jamie Pine
2025-09-23 22:40:45 -07:00
parent c1fff9b27b
commit 74b7beb9c2
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
packages/swift-client/Sources/SpacedriveClient/SpacedriveClient.swift
View File

@@ -77,10 +77,7 @@ public class SpacedriveClient {
/// - Parameter libraryId: The ID of the library to switch to
/// - Throws: SpacedriveError if the library doesn't exist or can't be accessed
public func switchToLibrary(_ libraryId: String) async throws {
// First verify the library exists by getting its info
let libraryInfo = try await libraries.info(LibraryInfoQueryInput())
// Check if the library exists in the list
// Check if the library exists in the list (core-scoped query)
let libraries = try await getLibraries()
let libraryExists = libraries.contains { $0.id == libraryId }
@@ -170,9 +167,9 @@ public class SpacedriveClient {
let effectiveLibraryId = libraryId ?? getCurrentLibraryId()
if method.hasPrefix("query:") {
request = DaemonRequest.jsonQuery(method: method, payload: jsonPayload, libraryId: effectiveLibraryId)
request = DaemonRequest.query(method: method, libraryId: effectiveLibraryId, payload: jsonPayload)
} else if method.hasPrefix("action:") {
request = DaemonRequest.jsonAction(method: method, payload: jsonPayload, libraryId: effectiveLibraryId)
request = DaemonRequest.action(method: method, libraryId: effectiveLibraryId, payload: jsonPayload)
} else {
throw SpacedriveError.invalidResponse("Invalid method format: \(method)")
}
@@ -309,17 +306,17 @@ public class SpacedriveClient {
case .ping:
requestData = Data("\"Ping\"".utf8)
case .jsonQuery(let method, let payload, let libraryId):
case .query(let method, let libraryId, let payload):
let libraryIdJson = libraryId.map { "\"library_id\":\"\($0)\"," } ?? ""
let jsonString = """
{"JsonQuery":{"method":"\(method)",\(libraryIdJson)"payload":\(try jsonStringFromDictionary(payload))}}
{"Query":{"method":"\(method)",\(libraryIdJson)"payload":\(try jsonStringFromDictionary(payload))}}
"""
requestData = Data(jsonString.utf8)
case .jsonAction(let method, let payload, let libraryId):
case .action(let method, let libraryId, let payload):
let libraryIdJson = libraryId.map { "\"library_id\":\"\($0)\"," } ?? ""
let jsonString = """
{"JsonAction":{"method":"\(method)",\(libraryIdJson)"payload":\(try jsonStringFromDictionary(payload))}}
{"Action":{"method":"\(method)",\(libraryIdJson)"payload":\(try jsonStringFromDictionary(payload))}}
"""
requestData = Data(jsonString.utf8)
@@ -465,8 +462,8 @@ public class SpacedriveClient {
/// Request types that match the Rust daemon protocol
internal enum DaemonRequest {
case ping
case jsonAction(method: String, payload: [String: Any], libraryId: String?)
case jsonQuery(method: String, payload: [String: Any], libraryId: String?)
case action(method: String, libraryId: String?, payload: [String: Any])
case query(method: String, libraryId: String?, payload: [String: Any])
case subscribe(eventTypes: [String], filter: EventFilter?)
case unsubscribe
case shutdown