1
0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2025-08-08 04:20:07 +02:00

♻️ Cleanup

This commit is contained in:
2022-05-05 20:09:40 +02:00
parent f725e09f55
commit f679231ade

View File

@ -43,9 +43,12 @@ class PhpConfigurationFile {
*/ */
private static func parseConfig(from lines: [String]) -> Config { private static func parseConfig(from lines: [String]) -> Config {
var config = Config() var config = Config()
var currentSectionName = "main" var currentSectionName = "main"
for line in lines { for line in lines {
let line = trim(line) let line = trim(line)
if line.hasPrefix("[") && line.hasSuffix("]") { if line.hasPrefix("[") && line.hasSuffix("]") {
currentSectionName = parseSectionHeader(line) currentSectionName = parseSectionHeader(line)
} else if let (key, value) = parseLine(line) { } else if let (key, value) = parseLine(line) {
@ -54,15 +57,16 @@ class PhpConfigurationFile {
config[currentSectionName] = section config[currentSectionName] = section
} }
} }
return config return config
} }
/** /**
Remove all whitespace and additional characters from individual lines. Remove all whitespace and additional characters from individual lines.
*/ */
private static func trim(_ s: String) -> String { private static func trim(_ string: String) -> String {
let whitespaces = CharacterSet(charactersIn: " \n\r\t") let whitespaces = CharacterSet(charactersIn: " \n\r\t")
return s.trimmingCharacters(in: whitespaces) return string.trimmingCharacters(in: whitespaces)
} }
/** /**
@ -96,9 +100,11 @@ class PhpConfigurationFile {
maxSplits: 1, maxSplits: 1,
omittingEmptySubsequences: false omittingEmptySubsequences: false
) )
if !parts.isEmpty { if !parts.isEmpty {
return String(parts[0]) return String(parts[0])
} }
return "" return ""
} }
@ -108,6 +114,7 @@ class PhpConfigurationFile {
private static func parseSectionHeader(_ line: String) -> String { private static func parseSectionHeader(_ line: String) -> String {
let from = line.index(after: line.startIndex) let from = line.index(after: line.startIndex)
let to = line.index(before: line.endIndex) let to = line.index(before: line.endIndex)
return line[from..<to] return line[from..<to]
} }
@ -117,11 +124,13 @@ class PhpConfigurationFile {
private static func parseLine(_ line: String) -> (String, String)? { private static func parseLine(_ line: String) -> (String, String)? {
let parts = stripComment(line) let parts = stripComment(line)
.split(separator: "=", maxSplits: 1) .split(separator: "=", maxSplits: 1)
if parts.count == 2 { if parts.count == 2 {
let k = trim(String(parts[0])) let k = trim(String(parts[0]))
let v = trim(String(parts[1])) let v = trim(String(parts[1]))
return (k, v) return (k, v)
} }
return nil return nil
} }