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

Use SwiftFormat version 0.47.x

Browse source
This commit is contained in:
Danny Moesch 2020-11-07 12:06:28 +01:00 • committed by Mingshen Sun
parent e8389eb262
commit 49c6b25611
18 changed files with 69 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

16
passKit/Models/PasswordEntity.swift
View file

@ -9,19 +9,19 @@
import Foundation
import SwiftyUserDefaults
extension PasswordEntity {
public var nameWithCategory: String {
public extension PasswordEntity {
var nameWithCategory: String {
if let path = path, path.hasSuffix(".gpg") {
return String(path.prefix(upTo: path.index(path.endIndex, offsetBy: -4)))
}
return ""
}
public func getCategoryText() -> String {
func getCategoryText() -> String {
getCategoryArray().joined(separator: " > ")
}
public func getCategoryArray() -> [String] {
func getCategoryArray() -> [String] {
var parentEntity = parent
var passwordCategoryArray: [String] = []
while parentEntity != nil {
@ -32,7 +32,7 @@ extension PasswordEntity {
return passwordCategoryArray
}
public func getURL() throws -> URL {
func getURL() throws -> URL {
if let path = getPath().stringByAddingPercentEncodingForRFC3986(), let url = URL(string: path) {
return url
}
@ -42,16 +42,16 @@ extension PasswordEntity {
// XXX: define some getters to get core data, we need to consider
// manually write models instead auto generation.
public func getImage() -> Data? {
func getImage() -> Data? {
image
}
public func getName() -> String {
func getName() -> String {
// unwrap non-optional core data
name ?? ""
}
public func getPath() -> String {
func getPath() -> String {
// unwrap non-optional core data
path ?? ""
}

6
passKit/Models/PasswordStore.swift
View file

@ -645,8 +645,8 @@ public class PasswordStore {
}
// get the oldest local commit
guard let firstLocalCommit = localCommits.last,
firstLocalCommit.parents.count == 1,
let newHead = firstLocalCommit.parents.first else {
firstLocalCommit.parents.count == 1,
let newHead = firstLocalCommit.parents.first else {
throw AppError.gitReset
}
try storeRepository.reset(to: newHead, resetType: .hard)
@ -707,7 +707,7 @@ public class PasswordStore {
public func findGPGID(from url: URL) -> String {
var path = url
while !FileManager.default.fileExists(atPath: path.appendingPathComponent(".gpg-id").path),
path.path != "file:///" {
path.path != "file:///" {
path = path.deletingLastPathComponent()
}
path = path.appendingPathComponent(".gpg-id")