diff --git a/.swiftlint.yml b/.swiftlint.yml index 7668393..daf3cb8 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -98,7 +98,7 @@ whitelist_rules: - modifier_order - multiline_arguments - multiline_arguments_brackets -# - multiline_function_chains + - multiline_function_chains # - multiline_literal_brackets # - multiline_parameters # - multiline_parameters_brackets diff --git a/pass/Views/UICodeHighlightingLabel.swift b/pass/Views/UICodeHighlightingLabel.swift index f05586b..8914d2c 100644 --- a/pass/Views/UICodeHighlightingLabel.swift +++ b/pass/Views/UICodeHighlightingLabel.swift @@ -34,7 +34,8 @@ class UICodeHighlightingLabel: UILocalizedLabel { return NSAttributedString(string: line, attributes: UICodeHighlightingLabel.CODE_ATTRIBUTES) } return NSAttributedString(string: line) - }.reduce(into: NSMutableAttributedString(string: "")) { + } + .reduce(into: NSMutableAttributedString(string: "")) { $0.append($1) $0.append(UICodeHighlightingLabel.ATTRIBUTED_NEWLINE) } diff --git a/passKit/Models/PasswordStore.swift b/passKit/Models/PasswordStore.swift index adb27a3..6a82c54 100644 --- a/passKit/Models/PasswordStore.swift +++ b/passKit/Models/PasswordStore.swift @@ -262,19 +262,19 @@ public class PasswordStore { private func updatePasswordEntityCoreData() { deleteCoreData(entityName: "PasswordEntity") do { - var q = try fm.contentsOfDirectory(atPath: storeURL.path).filter { - !$0.hasPrefix(".") - }.map { (filename) -> PasswordEntity in - let passwordEntity = NSEntityDescription.insertNewObject(forEntityName: "PasswordEntity", into: context) as! PasswordEntity - if filename.hasSuffix(".gpg") { - passwordEntity.name = String(filename.prefix(upTo: filename.index(filename.endIndex, offsetBy: -4))) - } else { - passwordEntity.name = filename + var q = try fm.contentsOfDirectory(atPath: storeURL.path) + .filter { !$0.hasPrefix(".") } + .map { (filename) -> PasswordEntity in + let passwordEntity = NSEntityDescription.insertNewObject(forEntityName: "PasswordEntity", into: context) as! PasswordEntity + if filename.hasSuffix(".gpg") { + passwordEntity.name = String(filename.prefix(upTo: filename.index(filename.endIndex, offsetBy: -4))) + } else { + passwordEntity.name = filename + } + passwordEntity.path = filename + passwordEntity.parent = nil + return passwordEntity } - passwordEntity.path = filename - passwordEntity.parent = nil - return passwordEntity - } while !q.isEmpty { let e = q.first! q.remove(at: 0) @@ -286,19 +286,19 @@ public class PasswordStore { if fm.fileExists(atPath: filePath, isDirectory: &isDirectory) { if isDirectory.boolValue { e.isDir = true - let files = try fm.contentsOfDirectory(atPath: filePath).filter { - !$0.hasPrefix(".") - }.map { (filename) -> PasswordEntity in - let passwordEntity = NSEntityDescription.insertNewObject(forEntityName: "PasswordEntity", into: context) as! PasswordEntity - if filename.hasSuffix(".gpg") { - passwordEntity.name = String(filename.prefix(upTo: filename.index(filename.endIndex, offsetBy: -4))) - } else { - passwordEntity.name = filename + let files = try fm.contentsOfDirectory(atPath: filePath) + .filter { !$0.hasPrefix(".") } + .map { (filename) -> PasswordEntity in + let passwordEntity = NSEntityDescription.insertNewObject(forEntityName: "PasswordEntity", into: context) as! PasswordEntity + if filename.hasSuffix(".gpg") { + passwordEntity.name = String(filename.prefix(upTo: filename.index(filename.endIndex, offsetBy: -4))) + } else { + passwordEntity.name = filename + } + passwordEntity.path = "\(e.path!)/\(filename)" + passwordEntity.parent = e + return passwordEntity } - passwordEntity.path = "\(e.path!)/\(filename)" - passwordEntity.parent = e - return passwordEntity - } q += files } else { e.isDir = false