summaryrefslogtreecommitdiff
path: root/Sora/Data/Booru/Provider
diff options
context:
space:
mode:
Diffstat (limited to 'Sora/Data/Booru/Provider')
-rw-r--r--Sora/Data/Booru/Provider/BooruProviderCredentials.swift36
1 files changed, 33 insertions, 3 deletions
diff --git a/Sora/Data/Booru/Provider/BooruProviderCredentials.swift b/Sora/Data/Booru/Provider/BooruProviderCredentials.swift
index 898201a..6733405 100644
--- a/Sora/Data/Booru/Provider/BooruProviderCredentials.swift
+++ b/Sora/Data/Booru/Provider/BooruProviderCredentials.swift
@@ -5,17 +5,45 @@ struct BooruProviderCredentials: Codable, Identifiable, Equatable {
let provider: BooruProvider
var apiKey: String
var userID: Int
+ var login: String
- init(provider: BooruProvider, apiKey: String, userID: Int, id: UUID = UUID()) {
+ init(
+ provider: BooruProvider,
+ apiKey: String,
+ userID: Int,
+ login: String = "",
+ id: UUID = UUID()
+ ) {
self.id = id
self.provider = provider
self.apiKey = apiKey
self.userID = userID
+ self.login = login
+ }
+
+ // swiftlint:disable explicit_enum_raw_value
+ private enum CodingKeys: String, CodingKey {
+ case id
+ case provider
+ case apiKey
+ case userID
+ case login
+ }
+ // swiftlint:enable explicit_enum_raw_value
+
+ init(from decoder: Decoder) throws {
+ let container = try decoder.container(keyedBy: CodingKeys.self)
+
+ id = try container.decodeIfPresent(UUID.self, forKey: .id) ?? UUID()
+ provider = try container.decode(BooruProvider.self, forKey: .provider)
+ apiKey = try container.decodeIfPresent(String.self, forKey: .apiKey) ?? ""
+ userID = try container.decodeIfPresent(Int.self, forKey: .userID) ?? 0
+ login = try container.decodeIfPresent(String.self, forKey: .login) ?? ""
}
static func from(
// swiftlint:disable:next large_tuple
- _ rawCredentials: [(provider: BooruProvider, apiKey: String, userID: Int)],
+ _ rawCredentials: [(provider: BooruProvider, apiKey: String, userID: Int, login: String)],
existingCredentials: [Self]
) -> [Self] {
rawCredentials.map { credentials in
@@ -26,6 +54,7 @@ struct BooruProviderCredentials: Codable, Identifiable, Equatable {
provider: credentials.provider,
apiKey: credentials.apiKey,
userID: credentials.userID,
+ login: credentials.login,
id: existingKey.id
)
}
@@ -33,7 +62,8 @@ struct BooruProviderCredentials: Codable, Identifiable, Equatable {
return Self(
provider: credentials.provider,
apiKey: credentials.apiKey,
- userID: credentials.userID
+ userID: credentials.userID,
+ login: credentials.login
)
}
}