lysann/passforios
1
0
Fork 0
Code Issues Pull requests Activity

Polish class Password

Browse source
This commit is contained in:
yishilin14 2017-03-03 10:49:32 +08:00
parent c1da27ae04
commit 71cb9a02c0
1 changed files with 38 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

67
pass/Models/Password.swift
View file

@ -23,18 +23,15 @@ class Password {
var changed = false var changed = false
init(name: String, plainText: String) { init(name: String, plainText: String) {
self.name = name
self.plainText = plainText
// get password and additional fields
let plainTextSplit = plainText.characters.split(maxSplits: 1, omittingEmptySubsequences: false) { let plainTextSplit = plainText.characters.split(maxSplits: 1, omittingEmptySubsequences: false) {
$0 == "\n" || $0 == "\r\n" $0 == "\n" || $0 == "\r\n"
}.map(String.init) }.map(String.init)
let password = plainTextSplit[0] self.password = plainTextSplit[0]
let additionFieldsArray = Password.getAdditionFields(from: plainTextSplit[1]) (self.additions, self.additionKeys) = Password.getAdditionFields(from: plainTextSplit[1])
self.name = name
self.password = password
self.plainText = plainText
for additionField in additionFieldsArray {
self.additions[additionField.title] = additionField.content
self.additionKeys.append(additionField.title)
}
} }
func getUsername() -> String? { func getUsername() -> String? {
@ -45,45 +42,55 @@ class Password {
return getAdditionValue(withKey: "URL") ?? getAdditionValue(withKey: "url") ?? getAdditionValue(withKey: "Url") return getAdditionValue(withKey: "URL") ?? getAdditionValue(withKey: "url") ?? getAdditionValue(withKey: "Url")
} }
static func getAdditionFields(from additionFieldsPlainText: String) -> [AdditionField]{ // return a key-value pair from the line
var additionFieldsArray = [AdditionField]() // key might be nil, if there is no ":" in the line
static func getKeyValuePair(from line: String) -> (key: String?, value: String) {
let items = line.characters.split(separator: ":", maxSplits: 1, omittingEmptySubsequences: true).map(String.init)
var key : String?
var value = ""
if items.count == 1 {
value = items[0]
} else if items.count == 2 {
key = items[0]
value = items[1].trimmingCharacters(in: .whitespaces)
}
return (key, value)
}
static func getAdditionFields(from additionFieldsPlainText: String) -> ([String: String], [String]){
var additions = [String: String]()
var additionKeys = [String]()
var unknownIndex = 0 var unknownIndex = 0
additionFieldsPlainText.enumerateLines() { line, _ in additionFieldsPlainText.enumerateLines() { line, _ in
if line == "" { if line == "" {
return return
} }
let items = line.characters.split(separator: ":", maxSplits: 1, omittingEmptySubsequences: true).map(String.init) var (key, value) = getKeyValuePair(from: line)
var key = "" if key == nil {
var value = ""
if items.count == 1 {
unknownIndex += 1 unknownIndex += 1
key = "unknown \(unknownIndex)" key = "unknown \(unknownIndex)"
value = items[0]
} else if items.count == 2 {
key = items[0]
value = items[1].trimmingCharacters(in: .whitespaces)
} }
additionFieldsArray.append(AdditionField(title: key, content: value)) additions[key!] = value
additionKeys.append(key!)
} }
return additionFieldsArray
return (additions, additionKeys)
} }
func updatePassword(name: String, plainText: String) { func updatePassword(name: String, plainText: String) {
self.name = name self.name = name
if self.plainText != plainText { if self.plainText != plainText {
self.name = name
self.plainText = plainText
// get password and additional fields
let plainTextSplit = plainText.characters.split(maxSplits: 1, omittingEmptySubsequences: false) { let plainTextSplit = plainText.characters.split(maxSplits: 1, omittingEmptySubsequences: false) {
$0 == "\n" || $0 == "\r\n" $0 == "\n" || $0 == "\r\n"
}.map(String.init) }.map(String.init)
let password = plainTextSplit[0] self.password = plainTextSplit[0]
let additionFieldsArray = Password.getAdditionFields(from: plainTextSplit[1]) (self.additions, self.additionKeys) = 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 changed = true
} }
} }