rock-n-code/amiibo-service
1
0
Fork 0
Code Issues Pull Requests Actions Releases 15 Activity

Some suggested improvements #16

Merged
javier merged 6 commits from library/suggested-improvements into main 2025-10-02 01:51:17 +00:00
Conversation 0 Commits 6 Files Changed 124
+63 -62
1 changed files with 63 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 903220050c - Show all commits
Sources/AmiiboService/Public/Clients/AmiiboLiveClient.swift
+63 -62
View File
@@ -177,28 +177,18 @@ private extension AmiiboLiveClient {
let response: Operations.getAmiibos.Output let response: Operations.getAmiibos.Output
do { do {
response = try await client.getAmiibos( response = try await client.getAmiibos(.init(query: .init(
.init(query: .init( amiiboSeries: filter.series,
amiiboSeries: filter.series, character: filter.gameCharacter,
character: filter.gameCharacter, gameseries: filter.gameSeries,
gameseries: filter.gameSeries, id: filter.identifier,
id: filter.identifier, name: filter.name,
name: filter.name, showgames: filter.showGames,
showgames: filter.showGames, showusage: filter.showUsage,
showusage: filter.showUsage, _type: filter.type
_type: filter.type )))
))
)
} catch is CancellationError {
throw AmiiboServiceError.cancelled
} catch let error as ClientError {
if error.underlyingError is DecodingError {
throw AmiiboServiceError.decoding
} else {
throw AmiiboServiceError.unknown
}
} catch { } catch {
throw AmiiboServiceError.unknown try handle(error: error)
} }
switch response { switch response {
@@ -224,16 +214,12 @@ private extension AmiiboLiveClient {
let response: Operations.getAmiiboSeries.Output let response: Operations.getAmiiboSeries.Output
do { do {
response = try await client.getAmiiboSeries( response = try await client.getAmiiboSeries(.init(query: .init(
.init(query: .init( key: filter.key,
key: filter.key, name: filter.name
name: filter.name )))
))
)
} catch is CancellationError {
throw AmiiboServiceError.cancelled
} catch { } catch {
throw AmiiboServiceError.unknown try handle(error: error)
} }
switch response { switch response {
@@ -263,16 +249,12 @@ private extension AmiiboLiveClient {
let response: Operations.getAmiiboTypes.Output let response: Operations.getAmiiboTypes.Output
do { do {
response = try await client.getAmiiboTypes( response = try await client.getAmiiboTypes(.init(query: .init(
.init(query: .init( key: filter.key,
key: filter.key, name: filter.name
name: filter.name )))
))
)
} catch is CancellationError {
throw AmiiboServiceError.cancelled
} catch { } catch {
throw AmiiboServiceError.unknown try handle(error: error)
} }
switch response { switch response {
@@ -302,16 +284,12 @@ private extension AmiiboLiveClient {
let response: Operations.getGameCharacters.Output let response: Operations.getGameCharacters.Output
do { do {
response = try await client.getGameCharacters( response = try await client.getGameCharacters(.init(query: .init(
.init(query: .init( key: filter.key,
key: filter.key, name: filter.name
name: filter.name )))
))
)
} catch is CancellationError {
throw AmiiboServiceError.cancelled
} catch { } catch {
throw AmiiboServiceError.unknown try handle(error: error)
} }
switch response { switch response {
@@ -341,16 +319,12 @@ private extension AmiiboLiveClient {
let response: Operations.getGameSeries.Output let response: Operations.getGameSeries.Output
do { do {
response = try await client.getGameSeries( response = try await client.getGameSeries(.init(query: .init(
.init(query: .init( key: filter.key,
key: filter.key, name: filter.name
name: filter.name )))
))
)
} catch is CancellationError {
throw AmiiboServiceError.cancelled
} catch { } catch {
throw AmiiboServiceError.unknown try handle(error: error)
} }
switch response { switch response {
@@ -378,10 +352,8 @@ private extension AmiiboLiveClient {
do { do {
response = try await client.getLastUpdated() response = try await client.getLastUpdated()
} catch is CancellationError {
throw AmiiboServiceError.cancelled
} catch { } catch {
throw AmiiboServiceError.unknown try handle(error: error)
} }
switch response { switch response {
@@ -395,6 +367,37 @@ private extension AmiiboLiveClient {
} }
} }
/// Maps a given error to a `AmiiboServiceError` error.
/// - Parameter error: An error to map.
/// - Throws: An ``AmiiboServiceError`` error.
func handle(error: any Error) throws -> Never {
switch error {
case is CancellationError:
throw AmiiboServiceError.cancelled
case let clientError as ClientError:
switch clientError.underlyingError {
case is DecodingError:
throw AmiiboServiceError.decoding
case let urlError as URLError:
switch urlError.code {
case .cannotFindHost,
.cannotConnectToHost,
.dnsLookupFailed,
.networkConnectionLost,
.notConnectedToInternet,
.timedOut:
throw AmiiboServiceError.notAvailable
default:
throw AmiiboServiceError.unknown
}
default:
throw AmiiboServiceError.unknown
}
default:
throw AmiiboServiceError.unknown
}
}
/// Retrieves a list of amiibo items from a wrapper container. /// Retrieves a list of amiibo items from a wrapper container.
/// - Parameter wrapper: A wrapper container that either has an object or a list of items. /// - Parameter wrapper: A wrapper container that either has an object or a list of items.
/// - Returns: A list of amiibo items, sorted by identifiers. /// - Returns: A list of amiibo items, sorted by identifiers.
@@ -404,7 +407,6 @@ private extension AmiiboLiveClient {
switch wrapper.amiibo { switch wrapper.amiibo {
case let .Amiibo(object): case let .Amiibo(object):
return [.init(object)] return [.init(object)]
case let .AmiiboList(list): case let .AmiiboList(list):
return list return list
.map { .init($0) } .map { .init($0) }
@@ -424,7 +426,6 @@ private extension AmiiboLiveClient {
switch wrapper.amiibo { switch wrapper.amiibo {
case let .Tuple(payload): case let .Tuple(payload):
return [.init(payload)] return [.init(payload)]
case let .TupleList(list): case let .TupleList(list):
return list return list
.map { .init($0) } .map { .init($0) }