Browser improvements

This commit is contained in:
Ilya Laktyushin
2024-07-22 20:03:13 +04:00
parent 345616704a
commit 4e46697a66
7 changed files with 119 additions and 83 deletions

View File

@@ -29,16 +29,14 @@ public struct WebBrowserException: Codable, Equatable {
public struct WebBrowserSettings: Codable, Equatable {
public let defaultWebBrowser: String?
public let autologin: Bool
public let exceptions: [WebBrowserException]
public static var defaultSettings: WebBrowserSettings {
return WebBrowserSettings(defaultWebBrowser: nil, autologin: true, exceptions: [])
return WebBrowserSettings(defaultWebBrowser: nil, exceptions: [])
}
public init(defaultWebBrowser: String?, autologin: Bool, exceptions: [WebBrowserException]) {
public init(defaultWebBrowser: String?, exceptions: [WebBrowserException]) {
self.defaultWebBrowser = defaultWebBrowser
self.autologin = autologin
self.exceptions = exceptions
}
@@ -46,7 +44,6 @@ public struct WebBrowserSettings: Codable, Equatable {
let container = try decoder.container(keyedBy: StringCodingKey.self)
self.defaultWebBrowser = try? container.decodeIfPresent(String.self, forKey: "defaultWebBrowser")
self.autologin = (try? container.decodeIfPresent(Bool.self, forKey: "autologin")) ?? true
self.exceptions = (try? container.decodeIfPresent([WebBrowserException].self, forKey: "exceptions")) ?? []
}
@@ -54,7 +51,6 @@ public struct WebBrowserSettings: Codable, Equatable {
var container = encoder.container(keyedBy: StringCodingKey.self)
try container.encodeIfPresent(self.defaultWebBrowser, forKey: "defaultWebBrowser")
try container.encode(self.autologin, forKey: "autologin")
try container.encode(self.exceptions, forKey: "exceptions")
}
@@ -62,9 +58,6 @@ public struct WebBrowserSettings: Codable, Equatable {
if lhs.defaultWebBrowser != rhs.defaultWebBrowser {
return false
}
if lhs.autologin != rhs.autologin {
return false
}
if lhs.exceptions != rhs.exceptions {
return false
}
@@ -72,15 +65,11 @@ public struct WebBrowserSettings: Codable, Equatable {
}
public func withUpdatedDefaultWebBrowser(_ defaultWebBrowser: String?) -> WebBrowserSettings {
return WebBrowserSettings(defaultWebBrowser: defaultWebBrowser, autologin: self.autologin, exceptions: self.exceptions)
return WebBrowserSettings(defaultWebBrowser: defaultWebBrowser, exceptions: self.exceptions)
}
public func withUpdatedAutologin(_ autologin: Bool) -> WebBrowserSettings {
return WebBrowserSettings(defaultWebBrowser: self.defaultWebBrowser, autologin: autologin, exceptions: self.exceptions)
}
public func withUpdatedExceptions(_ exceptions: [WebBrowserException]) -> WebBrowserSettings {
return WebBrowserSettings(defaultWebBrowser: self.defaultWebBrowser, autologin: self.autologin, exceptions: exceptions)
return WebBrowserSettings(defaultWebBrowser: self.defaultWebBrowser, exceptions: exceptions)
}
}