ch/CHGenerator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reorganize headers, page templates

Browse Source
This commit is contained in:
Christoph Hagen
2022-08-16 12:27:13 +02:00
parent 02a3dd4007
commit c8a70a3d42
10 changed files with 111 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
WebsiteGenerator/Generators/IndexPageGenerator.swift
View File

@@ -32,20 +32,19 @@ struct IndexPageGenerator {
to url: URL) throws {
let localized = site.localized(for: language)
var content = [OverviewPageTemplate.Key : String]()
var content = [PageTemplate.Key : String]()
content[.head] = try makeHead(site: site, language: language)
content[.topBar] = factory.topBar.generate(section: nil, languageButton: languageButton)
content[.title] = localized.title
content[.subtitle] = localized.subtitle
content[.titleText] = localized.description
content[.contentClass] = "overview"
content[.header] = makeHeader(localized: localized)
let sections = site.elements.compactMap { $0 as? Section }
content[.sections] = try factory.overviewSection.generate(
content[.content] = try factory.overviewSection.generate(
sections: sections,
in: site,
language: language,
sectionItemCount: sectionItemCount)
content[.footer] = SiteGenerator.pageFooter
try factory.overviewPage.generate(content, to: url)
try factory.page.generate(content, to: url)
}
private func makeHead(site: Site, language: String) throws -> String {
@@ -57,4 +56,12 @@ struct IndexPageGenerator {
linkPreviewImage: site.linkPreviewImage(for: language),
customHeadContent: try site.customHeadContent()))
}
private func makeHeader(localized: Site.LocalizedMetadata) -> String {
var content = [HeaderKey : String]()
content[.title] = localized.title
content[.subtitle] = localized.subtitle
content[.titleText] = localized.description
return factory.factory.centeredHeader.generate(content)
}
}

23
WebsiteGenerator/Generators/OverviewPageGenerator.swift
View File

@@ -19,19 +19,17 @@ struct OverviewPageGenerator {
let metadata = section.localized(for: language)
var content = [OverviewPageTemplate.Key : String]()
var content = [PageTemplate.Key : String]()
content[.head] = try makeHead(section: section, language: language)
let languageButton = section.nextLanguage(for: language)
content[.topBar] = factory.topBar.generate(
section: section.sectionId,
languageButton: languageButton)
content[.sections] = try makeContent(section: section, language: language)
content[.title] = metadata.title
content[.subtitle] = metadata.subtitle
content[.titleText] = metadata.description
content[.contentClass] = "overview"
content[.header] = makeHeader(metadata: metadata, language: language, backText: backText)
content[.content] = try makeContent(section: section, language: language)
content[.footer] = SiteGenerator.pageFooter
content[.backLink] = backText.unwrapped { factory.makeBackLink(text: $0, language: language) }
try factory.overviewPage.generate(content, to: url)
try factory.page.generate(content, to: url)
}
private func makeContent(section: Section, language: String) throws -> String {
@@ -59,4 +57,15 @@ struct OverviewPageGenerator {
customHeadContent: try section.customHeadContent())
return try factory.pageHead.generate(page: info)
}
private func makeHeader(metadata: Section.LocalizedMetadata,
language: String,
backText: String?) -> String {
var content = [HeaderKey : String]()
content[.title] = metadata.title
content[.subtitle] = metadata.subtitle
content[.titleText] = metadata.description
content[.backLink] = backText.unwrapped { factory.makeBackLink(text: $0, language: language) }
return factory.factory.centeredHeader.generate(content)
}
}

19
WebsiteGenerator/Generators/PageGenerator.swift
View File

@@ -31,13 +31,11 @@ struct PageGenerator {
#warning("Make prev and next navigation relative")
let metadata = page.localized(for: language)
let nextLanguage = page.nextLanguage(for: language)
var content = [ContentPageTemplate.Key : String]()
var content = [PageTemplate.Key : String]()
content[.head] = try makeHead(page: page, language: language)
content[.topBar] = factory.topBar.generate(section: page.sectionId, languageButton: nextLanguage)
content[.backLink] = factory.makeBackLink(text: backText, language: language)
content[.title] = metadata.title
content[.subtitle] = metadata.subtitle
content[.date] = factory.makeDateString(start: page.metadata.date, end: page.metadata.endDate)
content[.contentClass] = "content"
content[.header] = makeHeader(page: page.metadata, metadata: metadata, language: language, backText: backText)
content[.content] = try makeContent(page: page, language: language, url: inputContentUrl)
content[.previousPageLinkText] = previousPage.unwrapped { factory.makePrevText($0.text) }
content[.previousPageUrl] = previousPage?.link
@@ -45,8 +43,8 @@ struct PageGenerator {
content[.nextPageUrl] = nextPage?.link
content[.footer] = try page.customFooterContent()
try factory.contentPage.generate(content, to: url)
let url = files.outputFolder.appendingPathComponent(path)
try factory.page.generate(content, to: url)
}
private func makeContent(page: Page, language: String, url: URL) throws -> String {
@@ -68,4 +66,13 @@ struct PageGenerator {
customHeadContent: try page.customHeadContent())
return try factory.pageHead.generate(page: info)
}
private func makeHeader(page: Page.Metadata, metadata: Page.LocalizedMetadata, language: String, backText: String) -> String {
var content = [HeaderKey : String]()
content[.backLink] = factory.makeBackLink(text: backText, language: language)
content[.title] = metadata.title
content[.subtitle] = metadata.subtitle
content[.date] = factory.makeDateString(start: page.date, end: page.endDate)
return factory.factory.leftHeader.generate(content)
}
}

8
WebsiteGenerator/Templates/Filled/LocalizedSiteTemplate.swift
View File

@@ -46,12 +46,8 @@ struct LocalizedSiteTemplate {
// MARK: Pages
var overviewPage: OverviewPageTemplate {
factory.overviewPage
}
var contentPage: ContentPageTemplate {
factory.contentPage
var page: PageTemplate {
factory.page
}
init(factory: TemplateFactory, language: String, site: Site, files: FileProcessor) throws {

32
WebsiteGenerator/Templates/Pages/HeaderTemplate.swift Normal file
View File

@@ -0,0 +1,32 @@
import Foundation
protocol HeaderTemplate {
func generate(_ content: [ThumbnailKey : String], shouldIndent: Bool) throws -> String
}
enum HeaderKey: String, CaseIterable {
case backLink = "BACK_LINK"
case title = "TITLE"
case subtitle = "SUBTITLE"
case titleText = "TITLE_TEXT"
case date = "DATE"
}
struct CenteredHeaderTemplate: Template {
typealias Key = HeaderKey
let raw: String
static let templateName = "header-center.html"
}
struct LeftHeaderTemplate: Template {
typealias Key = HeaderKey
let raw: String
static let templateName = "header-left.html"
}

19
WebsiteGenerator/Templates/Pages/OverviewPageTemplate.swift
View File

@@ -1,19 +0,0 @@
import Foundation
struct OverviewPageTemplate: Template {
enum Key: String, CaseIterable {
case head = "HEAD"
case topBar = "TOP_BAR"
case backLink = "BACK_LINK"
case title = "TITLE"
case subtitle = "SUBTITLE"
case titleText = "TITLE_TEXT"
case sections = "SECTIONS"
case footer = "FOOTER"
}
let raw: String
static let templateName = "overview-page.html"
}

8
WebsiteGenerator/Templates/Pages/ContentPageTemplate.swift → WebsiteGenerator/Templates/Pages/PageTemplate.swift
View File

@@ -1,14 +1,12 @@
import Foundation
struct ContentPageTemplate: Template {
struct PageTemplate: Template {
enum Key: String, CaseIterable {
case head = "HEAD"
case topBar = "TOP_BAR"
case backLink = "BACK_LINK"
case title = "TITLE"
case subtitle = "SUBTITLE"
case date = "DATE"
case contentClass = "CONTENT_CLASS"
case header = "HEADER"
case content = "CONTENT"
case previousPageLinkText = "PREV_TEXT"
case previousPageUrl = "PREV_LINK"

15
WebsiteGenerator/Templates/TemplateFactory.swift
View File

@@ -37,11 +37,15 @@ final class TemplateFactory {
}
}
// MARK: Headers
let leftHeader: LeftHeaderTemplate
let centeredHeader: CenteredHeaderTemplate
// MARK: Pages
let overviewPage: OverviewPageTemplate
let contentPage: ContentPageTemplate
let page: PageTemplate
// MARK: Init
@@ -56,7 +60,8 @@ final class TemplateFactory {
self.largeThumbnail = try .init(in: templateFolder)
self.squareThumbnail = try .init(in: templateFolder)
self.smallThumbnail = try .init(in: templateFolder)
self.overviewPage = try .init(in: templateFolder)
self.contentPage = try .init(in: templateFolder)
self.leftHeader = try .init(in: templateFolder)
self.centeredHeader = try .init(in: templateFolder)
self.page = try .init(in: templateFolder)
}
}