support edit password
This commit is contained in:
parent
41d45bfbf9
commit
b2ee8c429f
14 changed files with 459 additions and 72 deletions
|
|
@ -19,43 +19,34 @@ class Password {
|
|||
var password = ""
|
||||
var additions = [String: String]()
|
||||
var additionKeys = [String]()
|
||||
var plainText = ""
|
||||
var changed = false
|
||||
|
||||
convenience init(name: String, plainText: String) {
|
||||
var i = 0
|
||||
var additionFieldsArray = [AdditionField]()
|
||||
var password = ""
|
||||
var unkownIndex = 0
|
||||
plainText.enumerateLines() { line, _ in
|
||||
if i == 0 {
|
||||
password = line
|
||||
} else {
|
||||
let items = line.characters.split(separator: ":", maxSplits: 1, omittingEmptySubsequences: true).map(String.init)
|
||||
var key = ""
|
||||
var value = ""
|
||||
if items.count == 1 {
|
||||
unkownIndex += 1
|
||||
key = "unkown \(unkownIndex)"
|
||||
value = items[0]
|
||||
} else {
|
||||
key = items[0]
|
||||
value = items[1].trimmingCharacters(in: .whitespaces)
|
||||
}
|
||||
additionFieldsArray.append(AdditionField(title: key, content: value))
|
||||
}
|
||||
i += 1
|
||||
}
|
||||
self.init(name: name, password: password, additionsArray: additionFieldsArray)
|
||||
}
|
||||
|
||||
init(name: String, password: String, additionsArray: [AdditionField]) {
|
||||
init(name: String, plainText: String) {
|
||||
let plainTextSplit = plainText.characters.split(maxSplits: 1, omittingEmptySubsequences: false) {
|
||||
$0 == "\n" || $0 == "\r\n"
|
||||
}.map(String.init)
|
||||
let password = plainTextSplit[0]
|
||||
let additionFieldsArray = Password.getAdditionFields(from: plainTextSplit[1])
|
||||
// self.init(name: name, password: password, additionsArray: additionFieldsArray)
|
||||
self.name = name
|
||||
self.password = password
|
||||
for additionField in additionsArray {
|
||||
self.plainText = plainText
|
||||
for additionField in additionFieldsArray {
|
||||
self.additions[additionField.title] = additionField.content
|
||||
self.additionKeys.append(additionField.title)
|
||||
}
|
||||
}
|
||||
|
||||
// private convenience init(name: String, password: String, additionsArray: [AdditionField]) {
|
||||
// self.name = name
|
||||
// self.password = password
|
||||
// for additionField in additionsArray {
|
||||
// self.additions[additionField.title] = additionField.content
|
||||
// self.additionKeys.append(additionField.title)
|
||||
// }
|
||||
// }
|
||||
|
||||
func getUsername() -> String? {
|
||||
return getAdditionValue(withKey: "Username") ?? getAdditionValue(withKey: "username")
|
||||
}
|
||||
|
|
@ -64,9 +55,53 @@ class Password {
|
|||
return getAdditionValue(withKey: "URL") ?? getAdditionValue(withKey: "url") ?? getAdditionValue(withKey: "Url")
|
||||
}
|
||||
|
||||
func getPlainText() -> String {
|
||||
static func getAdditionFields(from additionFieldsPlainText: String) -> [AdditionField]{
|
||||
var additionFieldsArray = [AdditionField]()
|
||||
var unkownIndex = 0
|
||||
|
||||
additionFieldsPlainText.enumerateLines() { line, _ in
|
||||
let items = line.characters.split(separator: ":", maxSplits: 1, omittingEmptySubsequences: true).map(String.init)
|
||||
var key = ""
|
||||
var value = ""
|
||||
if items.count == 1 {
|
||||
unkownIndex += 1
|
||||
key = "unkown \(unkownIndex)"
|
||||
value = items[0]
|
||||
} else {
|
||||
key = items[0]
|
||||
value = items[1].trimmingCharacters(in: .whitespaces)
|
||||
}
|
||||
additionFieldsArray.append(AdditionField(title: key, content: value))
|
||||
}
|
||||
return additionFieldsArray
|
||||
}
|
||||
|
||||
func updatePassword(name: String, plainText: String) {
|
||||
self.name = name
|
||||
if self.plainText != plainText {
|
||||
let plainTextSplit = plainText.characters.split(maxSplits: 1, omittingEmptySubsequences: false) {
|
||||
$0 == "\n" || $0 == "\r\n"
|
||||
}.map(String.init)
|
||||
let password = plainTextSplit[0]
|
||||
let additionFieldsArray = Password.getAdditionFields(from: plainTextSplit[1])
|
||||
self.password = password
|
||||
self.additions = [String: String]()
|
||||
self.additionKeys = []
|
||||
for additionField in additionFieldsArray {
|
||||
self.additions[additionField.title] = additionField.content
|
||||
self.additionKeys.append(additionField.title)
|
||||
}
|
||||
changed = true
|
||||
}
|
||||
}
|
||||
|
||||
func getAdditionsPlainText() -> String {
|
||||
let plainAdditionsText = self.additionKeys.map { "\($0): \(self.additions[$0]!)" }.joined(separator: "\n")
|
||||
return "\(self.password)\n\(plainAdditionsText)"
|
||||
return plainAdditionsText
|
||||
}
|
||||
|
||||
func getPlainText() -> String {
|
||||
return "\(self.password)\n\(getAdditionsPlainText())"
|
||||
}
|
||||
|
||||
func getPlainData() -> Data {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue