astzweig/swiftpm-mustache
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't log files that dont load throw error instead

Browse Source 
remove swift-log dependency
This commit is contained in:
Adam Fowler
2021-03-18 15:25:46 +00:00
parent 4af21bb4cf
commit aa30dcbddf
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Sources/HummingbirdMustache/Library+FileSystem.swift
View File

@@ -3,7 +3,7 @@ import Logging
extension HBMustacheLibrary {
/// Load templates from a folder
func loadTemplates(from directory: String, withExtension extension: String = "mustache", logger: Logger?) {
func loadTemplates(from directory: String, withExtension extension: String = "mustache") throws {
var directory = directory
if !directory.hasSuffix("/") {
directory += "/"
@@ -15,11 +15,12 @@ extension HBMustacheLibrary {
guard path.hasSuffix(extWithDot) else { continue }
guard let data = fs.contents(atPath: directory + path) else { continue }
let string = String(decoding: data, as: Unicode.UTF8.self)
guard let template = try? HBMustacheTemplate(string: string) else {
logger?.error("Failed to load \(path)")
continue
let template: HBMustacheTemplate
do {
template = try HBMustacheTemplate(string: string)
} catch {
throw Error.failedToLoad(path, error)
}
logger?.debug("Loading \(path)")
// drop ".mustache" from path to get name
let name = String(path.dropLast(extWithDot.count))
register(template, named: name)

8
Sources/HummingbirdMustache/Library.swift
View File

@@ -18,9 +18,9 @@ public final class HBMustacheLibrary {
/// the folder is recursive and templates in subfolders will be registered with the name `subfolder/template`.
/// - Parameter directory: Directory to look for mustache templates
/// - Parameter extension: Extension of files to look for
public init(directory: String, withExtension extension: String = "mustache", logger: Logger? = nil) {
public init(directory: String, withExtension extension: String = "mustache") throws {
templates = [:]
loadTemplates(from: directory, withExtension: `extension`, logger: logger)
try loadTemplates(from: directory, withExtension: `extension`)
}
/// Register template under name
@@ -49,5 +49,9 @@ public final class HBMustacheLibrary {
return template.render(object)
}
public enum Error: Swift.Error {
case failedToLoad(String, Swift.Error)
}
private var templates: [String: HBMustacheTemplate]
}