Improve printing and image creation

This commit is contained in:
Christoph Hagen
2022-12-04 19:15:22 +01:00
parent 6a52f62402
commit 956cfb52c4
23 changed files with 1421 additions and 1077 deletions

View File

@ -35,7 +35,7 @@ struct LocalizedSiteTemplate {
factory.page
}
init(factory: TemplateFactory, language: String, site: Element, log: GenerationResultsHandler) {
init(factory: TemplateFactory, language: String, site: Element, results: GenerationResultsHandler) {
self.author = site.author
self.factory = factory
@ -66,12 +66,8 @@ struct LocalizedSiteTemplate {
language: language,
sections: sections,
topBarWebsiteTitle: site.topBarTitle)
self.pageHead = PageHeadGenerator(
factory: factory,
log: log)
self.overviewSection = OverviewSectionGenerator(
factory: factory,
log: log)
self.pageHead = PageHeadGenerator(factory: factory, results: results)
self.overviewSection = OverviewSectionGenerator(factory: factory, results: results)
}
// MARK: Content

View File

@ -26,10 +26,10 @@ extension Template {
self.init(raw: raw, results: results)
}
func generate(_ content: [Key : String], to url: URL) -> Bool {
let content = generate(content)
#warning("log.write(content, to: url, file: )")
return true
@discardableResult
func generate(_ content: [Key : String], to file: String, source: String) -> Bool {
let content = generate(content).data(using: .utf8)!
return results.writeIfChanged(content, file: file, source: source)
}
func generate(_ content: [Key : String], shouldIndent: Bool = false) -> String {