ch/ChWebsiteApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Generate pages, image descriptions

Browse Source
This commit is contained in:
Christoph Hagen
2024-12-06 21:59:36 +01:00
parent 18eb64f289
commit 5fb689ac7c
42 changed files with 1653 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
CHDataManagement/Extensions/String+Extensions.swift
View File

@ -12,6 +12,69 @@ extension String {
var nonEmpty: String? {
isEmpty ? nil : self
}
var trimmed: String {
trimmingCharacters(in: .whitespacesAndNewlines)
}
func indented(by indentation: String) -> String {
components(separatedBy: "\n").joined(separator: "\n" + indentation)
}
var withoutEmptyLines: String {
components(separatedBy: "\n")
.filter { !$0.trimmed.isEmpty }
.joined(separator: "\n")
}
/**
Remove the part after the last occurence of the separator (including the separator itself).
The string is left unchanges, if it does not contain the separator.
*/
func dropAfterLast(_ separator: String) -> String {
guard contains(separator) else {
return self
}
return components(separatedBy: separator).dropLast().joined(separator: separator)
}
func dropBeforeFirst(_ separator: String) -> String {
guard contains(separator) else {
return self
}
return components(separatedBy: separator).dropFirst().joined(separator: separator)
}
func lastComponentAfter(_ separator: String) -> String {
components(separatedBy: separator).last!
}
/**
Insert the new content before the last occurence of the specified separator.
If the separator does not appear in the string, then the new content is simply appended.
*/
func insert(_ content: String, beforeLast separator: String) -> String {
let parts = components(separatedBy: separator)
guard parts.count > 1 else {
return self + content
}
return parts.dropLast().joined(separator: separator) + content + separator + parts.last!
}
/**
Remove everything behind the first separator.
Also removes the separator itself. If the separator is not contained in the string, then the full string is returned.
*/
func dropAfterFirst<T>(_ separator: T) -> String where T: StringProtocol {
components(separatedBy: separator).first!
}
func between(_ start: String, and end: String) -> String {
dropBeforeFirst(start).dropAfterFirst(end)
}
}
extension String {
@ -30,3 +93,26 @@ extension String {
return (fileName: parts.dropLast().joined(separator: "."), fileExtension: parts.last)
}
}
extension Substring {
func dropBeforeFirst(_ separator: String) -> String {
guard contains(separator) else {
return String(self)
}
return components(separatedBy: separator).dropFirst().joined(separator: separator)
}
func between(_ start: String, and end: String) -> String {
components(separatedBy: start).last!
.components(separatedBy: end).first!
}
func between(first: String, andLast last: String) -> String {
dropBeforeFirst(first).dropAfterLast(last)
}
func last(after: String) -> String {
components(separatedBy: after).last!
}
}

18
CHDataManagement/Generator/GenerationResultsHandler.swift Normal file
View File

@ -0,0 +1,18 @@
import Foundation
final class GenerationResultsHandler {
var requiredVideoFiles: Set<String> = []
/// Generic warnings for pages
private var pageWarnings: [(message: String, source: String)] = []
func warning(_ message: String, page: Page) {
pageWarnings.append((message, page.id))
print("Page: \(page.id): \(message)")
}
func addRequiredVideoFile(fileId: String) {
requiredVideoFiles.insert(fileId)
}
}

23
CHDataManagement/Storage/ImageGenerator.swift → CHDataManagement/Generator/ImageGenerator.swift
View File

@ -50,6 +50,7 @@ final class ImageGenerator {
}
func runJobs(callback: (String) -> Void) -> Bool {
print("Generating \(jobs.count) images...")
for job in jobs {
callback("Generating image \(job.version)")
guard generate(job: job) else {
@ -69,6 +70,28 @@ final class ImageGenerator {
return "\(prefix).\(type.fileExtension)"
}
func generateImageSet(for image: String, maxWidth: CGFloat, maxHeight: CGFloat, altText: String) -> FeedEntryData.Image {
let type = ImageType(fileExtension: image.fileExtension!)!
let width2x = maxWidth * 2
let height2x = maxHeight * 2
_ = generateVersion(for: image, type: .avif, maximumWidth: maxWidth, maximumHeight: maxHeight)
_ = generateVersion(for: image, type: .avif, maximumWidth: width2x, maximumHeight: height2x)
_ = generateVersion(for: image, type: .webp, maximumWidth: maxWidth, maximumHeight: maxHeight)
_ = generateVersion(for: image, type: .webp, maximumWidth: width2x, maximumHeight: height2x)
_ = generateVersion(for: image, type: type, maximumWidth: maxWidth, maximumHeight: maxHeight)
_ = generateVersion(for: image, type: type, maximumWidth: width2x, maximumHeight: height2x)
let path = "/" + relativeImageOutputPath + "/" + image
return .init(rawImagePath: path,
width: Int(maxWidth),
height: Int(maxHeight),
altText: altText)
}
func generateVersion(for image: String, type: ImageType, maximumWidth: CGFloat, maximumHeight: CGFloat) -> String {
let version = versionFileName(image: image, type: type, width: maximumWidth, height: maximumHeight)
let fullPath = "/" + relativeImageOutputPath + "/" + version

445
CHDataManagement/Generator/PageContentGenerator.swift Normal file
View File

@ -0,0 +1,445 @@
import Foundation
import Ink
import Splash
typealias VideoSource = (url: String, type: VideoType)
final class PageContentParser {
private let pageLinkMarker = "page:"
private let largeImageIndicator = "*large*"
private let swift = SyntaxHighlighter(format: HTMLOutputFormat())
private let results: GenerationResultsHandler
private let content: Content
private let imageGenerator: ImageGenerator
private let page: Page
private let language: ContentLanguage
private var largeImageCount: Int = 0
init(page: Page, content: Content, language: ContentLanguage, results: GenerationResultsHandler, imageGenerator: ImageGenerator) {
self.page = page
self.content = content
self.language = language
self.results = results
self.imageGenerator = imageGenerator
}
func generatePage(from content: String) -> String {
let imageModifier = Modifier(target: .images) { html, markdown in
self.processMarkdownImage(markdown: markdown, html: html)
}
let codeModifier = Modifier(target: .codeBlocks) { html, markdown in
if markdown.starts(with: "```swift") {
let code = markdown.between("```swift", and: "```").trimmed
return "<pre><code>" + self.swift.highlight(code) + "</pre></code>"
}
return html
}
let linkModifier = Modifier(target: .links) { html, markdown in
self.handleLink(html: html, markdown: markdown)
}
let htmlModifier = Modifier(target: .html) { html, markdown in
self.handleHTML(html: html, markdown: markdown)
}
let headlinesModifier = Modifier(target: .headings) { html, markdown in
self.handleHeadlines(html: html, markdown: markdown)
}
let parser = MarkdownParser(modifiers: [imageModifier, codeModifier, linkModifier, htmlModifier, headlinesModifier])
return parser.html(from: content)
}
private func handleLink(html: String, markdown: Substring) -> String {
let file = markdown.between("(", and: ")")
if file.hasPrefix(pageLinkMarker) {
// Retain links pointing to elements within a page
let textToChange = file.dropAfterFirst("#")
let pageId = textToChange.replacingOccurrences(of: pageLinkMarker, with: "")
guard let pagePath = content.pageLink(pageId: pageId, language: language) else {
// Remove link since the page can't be found
return markdown.between("[", and: "]")
}
// Adjust file path to get the page url
// TODO: Calculate relative links to make pages more portable
return html.replacingOccurrences(of: textToChange, with: pagePath)
}
// TODO: Check that linked file exists
// if let filePath = page.nonAbsolutePathRelativeToRootForContainedInputFile(file) {
// // The target of the page link must be present after generation is complete
// results.expect(file: filePath, source: page.path)
// }
return html
}
private func handleHTML(html: String, markdown: Substring) -> String {
// TODO: Check HTML code in markdown for required resources
//print("[HTML] Found in page \(page.path):")
//print(markdown)
// Things to check:
// <img src=
// <a href=
//
return html
}
private func handleHeadlines(html: String, markdown: Substring) -> String {
let id = markdown
.last(after: "#")
.trimmed
.filter { $0.isNumber || $0.isLetter || $0 == " " }
.lowercased()
.components(separatedBy: " ")
.filter { $0 != "" }
.joined(separator: "-")
let parts = html.components(separatedBy: ">")
return parts[0] + " id=\"\(id)\">" + parts.dropFirst().joined(separator: ">")
}
private func processMarkdownImage(markdown: Substring, html: String) -> String {
// First, check the content type, then parse the remaining arguments
// Notation:
// <abc?> -> Optional argument
// <abc...> -> Repeated argument (0 or more)
// ![url](<url>;<text>)
// ![image](<imageId>;<caption?>]
// ![video](<fileId>;<alt>;<option1...>]
// ![svg](<fileId>;<<x>;<y>;<width>;<height>?>)
// ![download](<<fileId>,<text>,<download-filename?>;...)
// ![box](<title>;<body>)
// ![model](<file>;<description>)
// ![page](<pageId>)
// ![external](<<url>;<text>...>
// ![html](<fileId>)
guard let argumentList = markdown.between(first: "](", andLast: ")").removingPercentEncoding else {
results.warning("Invalid percent encoding for markdown image", page: page)
return ""
}
let arguments = argumentList.components(separatedBy: ";")
let rawCommand = markdown.between("![", and: "]").trimmed
guard rawCommand != "" else {
return handleImage(arguments)
}
guard let convertedCommand = rawCommand.removingPercentEncoding,
let command = ShorthandMarkdownKey(rawValue: convertedCommand) else {
// Treat unknown commands as normal links
print("Unknown markdown command: \(rawCommand)")
return html
}
switch command {
case .image:
return handleImage(arguments)
case .hikingStatistics:
return handleHikingStatistics(arguments)
case .downloadButtons:
return handleDownloadButtons(arguments)
case .video:
return handleVideo(arguments)
default:
print("Unhandled markdown command: \(command)")
return ""
/*
case .externalLink:
return handleExternalButtons(content: content)
case .includedHtml:
return handleExternalHTML(file: content)
case .box:
return handleSimpleBox(content: content)
case .pageLink:
return handlePageLink(pageId: content)
case .model:
return handle3dModel(content: content)
*/
}
}
private func handleImage(_ arguments: [String]) -> String {
// [image](<imageId>;<caption?>]
guard (1...2).contains(arguments.count) else {
results.warning("Invalid image arguments: \(arguments)", page: page)
return ""
}
let imageId = arguments[0]
guard let image = content.image(imageId) else {
results.warning("Missing image \(imageId)", page: page)
return ""
}
let caption = arguments.count == 2 ? arguments[1] : nil
let altText = image.getDescription(for: language)
let thumbnailWidth = CGFloat(content.settings.pages.contentWidth)
let thumbnail = imageGenerator.generateImageSet(
for: imageId,
maxWidth: thumbnailWidth, maxHeight: thumbnailWidth,
altText: altText)
let largeImageWidth = CGFloat(1200) // TODO: Move to settings
let largeImage = imageGenerator.generateImageSet(
for: imageId,
maxWidth: largeImageWidth, maxHeight: largeImageWidth,
altText: altText)
return PageImage(
imageId: imageId.replacingOccurrences(of: ".", with: "-"),
thumbnail: thumbnail,
largeImage: largeImage,
caption: caption).content
}
private func handleHikingStatistics(_ arguments: [String]) -> String {
guard (1...5).contains(arguments.count) else {
results.warning("Invalid hiking statistic arguments: \(arguments)", page: page)
return ""
}
let time = arguments[0].trimmed
let elevationUp = arguments.count > 1 ? arguments[1].trimmed : nil
let elevationDown = arguments.count > 2 ? arguments[2].trimmed : nil
let distance = arguments.count > 3 ? arguments[3].trimmed : nil
let calories = arguments.count > 4 ? arguments[4].trimmed : nil
return HikingStatistics(
time: time,
elevationUp: elevationUp,
elevationDown: elevationDown,
distance: distance,
calories: calories)
.content
}
private func handleDownloadButtons(_ arguments: [String]) -> String {
let buttons: [DownloadButtons.Item] = arguments.compactMap { button in
let parts = button.components(separatedBy: ",")
guard (2...3).contains(parts.count) else {
results.warning("Invalid download definition with \(parts)", page: page)
return nil
}
let file = parts[0].trimmed
let title = parts[1].trimmed
let downloadName = parts.count > 2 ? parts[2].trimmed : nil
// Ensure that file is available
guard let filePath = content.pathToFile(file) else {
results.warning("Missing download file \(file)", page: page)
return nil
}
return DownloadButtons.Item(filePath: filePath, text: title, downloadFileName: downloadName)
}
return DownloadButtons(items: buttons).content
}
private func handleVideo(_ arguments: [String]) -> String {
guard arguments.count >= 1 else {
return ""
}
let fileId = arguments[0].trimmed
let options: [VideoOption] = arguments.dropFirst().compactMap { optionText in
guard let optionText = optionText.trimmed.nonEmpty else {
return nil
}
guard let option = VideoOption(rawValue: optionText) else {
results.warning("Unknown video option \(optionText)", page: page)
return nil
}
return option
}
guard let filePath = content.pathToFile(fileId),
let file = content.file(id: fileId) else {
results.warning("Missing video file \(fileId)", page: page)
return ""
}
guard let videoType = file.type.videoType?.htmlType else {
results.warning("Unknown video file type for \(fileId)", page: page)
return ""
}
results.addRequiredVideoFile(fileId: fileId)
return ContentPageVideo(
filePath: filePath,
videoType: videoType,
options: options)
.content
}
/*
private func handleGif(file: String, altText: String) -> String {
let imagePath = page.pathRelativeToRootForContainedInputFile(file)
results.require(file: imagePath, source: page.path)
guard let size = results.getImageSize(atPath: imagePath, source: page.path) else {
return ""
}
let width = Int(size.width)
let height = Int(size.height)
return factory.html.image(file: file, width: width, height: height, altText: altText)
}
private func handleSvg(file: String, area: String?) -> String {
let imagePath = page.pathRelativeToRootForContainedInputFile(file)
results.require(file: imagePath, source: page.path)
guard let size = results.getImageSize(atPath: imagePath, source: page.path) else {
return "" // Missing image warning already produced
}
let width = Int(size.width)
let height = Int(size.height)
var altText = "image " + file.lastComponentAfter("/")
guard let area = area else {
return factory.html.image(file: file, width: width, height: height, altText: altText)
}
let parts = area.components(separatedBy: ",").map { $0.trimmed }
switch parts.count {
case 1:
return factory.html.image(file: file, width: width, height: height, altText: parts[0])
case 4:
break
case 5:
altText = parts[4]
default:
results.warning("Invalid area string for svg image", source: page.path)
return factory.html.image(file: file, width: width, height: height, altText: altText)
}
guard let x = Int(parts[0]),
let y = Int(parts[1]),
let partWidth = Int(parts[2]),
let partHeight = Int(parts[3]) else {
results.warning("Invalid area string for svg image", source: page.path)
return factory.html.image(file: file, width: width, height: height, altText: altText)
}
let part = SVGSelection(x, y, partWidth, partHeight)
return factory.html.svgImage(file: file, part: part, altText: altText)
}
private func handleFile(file: String, fileExtension: String) -> String {
results.warning("Unhandled file \(file) with extension \(fileExtension)", source: page.path)
return ""
}
private func handleExternalButtons(content: String) -> String {
let buttons = content
.components(separatedBy: ";")
.compactMap { button -> (url: String, text: String)? in
let parts = button.components(separatedBy: ",")
guard parts.count == 2 else {
results.warning("Invalid external link definition", page: page)
return nil
}
guard let url = parts[0].trimmed.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) else {
results.warning("Invalid external link \(parts[0].trimmed)", source: page.path)
return nil
}
let title = parts[1].trimmed
return (url, title)
}
return factory.html.externalButtons(buttons)
}
private func handleExternalHTML(file: String) -> String {
let path = page.pathRelativeToRootForContainedInputFile(file)
return results.getContentOfRequiredFile(at: path, source: page.path) ?? ""
}
private func handleSimpleBox(content: String) -> String {
let parts = content.components(separatedBy: ";")
guard parts.count > 1 else {
results.warning("Invalid box specification", page: page)
return ""
}
let title = parts[0]
let text = parts.dropFirst().joined(separator: ";")
return factory.makePlaceholder(title: title, text: text)
}
private func handlePageLink(pageId: String) -> String {
guard let linkedPage = siteRoot.find(pageId) else {
// Checking the page path will add it to the missing pages
_ = results.getPagePath(for: pageId, source: page.path, language: language)
// Remove link since the page can't be found
return ""
}
guard linkedPage.state == .standard else {
// Prevent linking to unpublished content
return ""
}
var content = [PageLinkTemplate.Key: String]()
content[.title] = linkedPage.title(for: language)
content[.altText] = ""
let fullThumbnailPath = linkedPage.thumbnailFilePath(for: language).destination
// Note: Here we assume that the thumbnail was already used elsewhere, so already generated
let relativeImageUrl = page.relativePathToOtherSiteElement(file: fullThumbnailPath)
let metadata = linkedPage.localized(for: language)
if linkedPage.state.hasThumbnailLink {
let fullPageUrl = linkedPage.fullPageUrl(for: language)
let relativePageUrl = page.relativePathToOtherSiteElement(file: fullPageUrl)
content[.url] = "href=\"\(relativePageUrl)\""
}
content[.image] = relativeImageUrl.dropAfterLast(".")
if let suffix = metadata.thumbnailSuffix {
content[.title] = factory.html.make(title: metadata.title, suffix: suffix)
} else {
content[.title] = metadata.title
}
let path = linkedPage.makePath(language: language, from: siteRoot)
content[.path] = factory.pageLink.makePath(components: path)
content[.description] = metadata.relatedContentText
if let parent = linkedPage.findParent(from: siteRoot), parent.thumbnailStyle == .large {
content[.className] = " related-page-link-large"
}
// We assume that the thumbnail images are already required by overview pages.
return factory.pageLink.generate(content)
}
private func handle3dModel(content: String) -> String {
let parts = content.components(separatedBy: ";")
guard parts.count > 1 else {
results.warning("Invalid 3d model specification", page: page)
return ""
}
let file = parts[0]
guard file.hasSuffix(".glb") else {
results.warning("Invalid 3d model file \(file) (must be .glb)", page: page)
return ""
}
// Ensure that file is available
let filePath = page.pathRelativeToRootForContainedInputFile(file)
results.require(file: filePath, source: page.path)
// Add required file to head
headers.insert(.modelViewer)
let description = parts.dropFirst().joined(separator: ";")
return """
<model-viewer alt="\(description)" src="\(file)" ar shadow-intensity="1" camera-controls touch-action="pan-y"></model-viewer>
"""
}
*/
}

43
CHDataManagement/Generator/PageGenerator.swift Normal file
View File

@ -0,0 +1,43 @@
final class PageGenerator {
private let content: Content
private let imageGenerator: ImageGenerator
private let navigationBarData: NavigationBarData
let results = GenerationResultsHandler()
init(content: Content, imageGenerator: ImageGenerator, navigationBarData: NavigationBarData) {
self.content = content
self.imageGenerator = imageGenerator
self.navigationBarData = navigationBarData
}
func generate(page: Page, language: ContentLanguage) -> String {
let contentGenerator = PageContentParser(
page: page,
content: content,
language: language,
results: results,
imageGenerator: imageGenerator)
let rawPageContent = content.storage.pageContent(for: page.id, language: language)
let pageContent = contentGenerator.generatePage(from: rawPageContent)
let localized = page.localized(in: language)
return ContentPage(
language: language,
dateString: page.dateText(in: language),
title: localized.title,
tags: page.tags.map { $0.data(in: language) },
linkTitle: localized.linkPreviewTitle ?? localized.title,
description: localized.linkPreviewDescription ?? "",
navigationBarData: navigationBarData,
pageContent: pageContent)
.content
}
}

51
CHDataManagement/Generator/ShorthandMarkdownKey.swift Normal file
View File

@ -0,0 +1,51 @@
import Foundation
/**
A string key used in markdown to indicate special elements
*/
enum ShorthandMarkdownKey: String {
/// A standard url
/// Format: `![url](<url>;<text>)`
case url
/// An image
/// Format: `![image](<imageId>;<caption?>]`
case image
/// Statistics about hiking
/// Format: `![hiking-stats](<`
case hikingStatistics = "hiking-stats"
/// A video
/// Format: `![video](<fileId>;<alt>;<option1...>]`
case video
/// An SVG image
/// Format: `![svg](<fileId>;<<x>;<y>;<width>;<height>?>)`
/// A variable number of download buttons for file downloads
/// Format: `[download](<<fileId>,<text>,<download-filename?>;...)`
case downloadButtons = "download"
/// A box with a title and content
/// Format: `![box](<title>;<body>)`
case box
/// A 3D model to display
/// Format: `![model](<file>;<description>)`
case model
/// A pretty link to another page on the site.
/// Format: `![page](<pageId>)`
case pageLink = "page"
/// A large button to an external page.
/// Format: `![external](<<url>;<text>...>`
case externalLink = "external"
/// Additional HTML code include verbatim into the page.
/// Format: `![html](<fileId>)`
case includedHtml = "html"
}

11
CHDataManagement/Generator/VideoOption.swift Normal file
View File

@ -0,0 +1,11 @@
/// HTML video options
enum VideoOption: String {
case controls
case autoplay
case muted
case loop
case playsinline
case poster
case preload
}

93
CHDataManagement/Storage/WebsiteGenerator.swift → CHDataManagement/Generator/WebsiteGenerator.swift
View File

@ -31,13 +31,19 @@ final class WebsiteGenerator {
}
private var mainContentMaximumWidth: CGFloat {
content.settings.posts.contentWidth
CGFloat(content.settings.posts.contentWidth)
}
private let content: Content
private let imageGenerator: ImageGenerator
private var navigationBarData: NavigationBarData {
createNavigationBarData(
settings: content.settings.navigationBar,
iconDescription: localizedSettings.navigationBarIconDescription)
}
init(content: Content, language: ContentLanguage) {
self.language = language
self.content = content
@ -67,16 +73,12 @@ final class WebsiteGenerator {
return true
}
let navBarData = createNavigationBarData(
settings: content.settings.navigationBar,
iconDescription: localizedSettings.navigationBarIconDescription)
let numberOfPages = (totalCount + postsPerPage - 1) / postsPerPage // Round up
for pageIndex in 1...numberOfPages {
let startIndex = (pageIndex - 1) * postsPerPage
let endIndex = min(pageIndex * postsPerPage, totalCount)
let postsOnPage = content.posts[startIndex..<endIndex]
guard createPostFeedPage(pageIndex, pageCount: numberOfPages, posts: postsOnPage, bar: navBarData) else {
guard createPostFeedPage(pageIndex, pageCount: numberOfPages, posts: postsOnPage, bar: navigationBarData) else {
return false
}
}
@ -95,26 +97,11 @@ final class WebsiteGenerator {
}
private func createImageSet(for image: ImageResource) -> FeedEntryData.Image {
let size1x = mainContentMaximumWidth
let size2x = mainContentMaximumWidth * 2
let avif1x = imageGenerator.generateVersion(for: image.id, type: .avif, maximumWidth: size1x, maximumHeight: size1x)
let avif2x = imageGenerator.generateVersion(for: image.id, type: .avif, maximumWidth: size2x, maximumHeight: size2x)
let webp1x = imageGenerator.generateVersion(for: image.id, type: .webp, maximumWidth: size1x, maximumHeight: size1x)
let webp2x = imageGenerator.generateVersion(for: image.id, type: .webp, maximumWidth: size2x, maximumHeight: size2x)
let jpg1x = imageGenerator.generateVersion(for: image.id, type: .jpg, maximumWidth: size1x, maximumHeight: size1x)
let jpg2x = imageGenerator.generateVersion(for: image.id, type: .jpg, maximumWidth: size2x, maximumHeight: size2x)
return FeedEntryData.Image(
altText: image.altText.getText(for: language),
avif1x: avif1x,
avif2x: avif2x,
webp1x: webp1x,
webp2x: webp2x,
jpg1x: jpg1x,
jpg2x: jpg2x)
imageGenerator.generateImageSet(
for: image.id,
maxWidth: mainContentMaximumWidth,
maxHeight: mainContentMaximumWidth,
altText: image.getDescription(for: language))
}
private func createPostFeedPage(_ pageIndex: Int, pageCount: Int, posts: ArraySlice<Post>, bar: NavigationBarData) -> Bool {
@ -122,7 +109,9 @@ final class WebsiteGenerator {
let localized: LocalizedPost = post.localized(in: language)
let linkUrl = post.linkedPage.map {
FeedEntryData.Link(url: $0.localized(in: language).relativeUrl, text: "View")
FeedEntryData.Link(
url: content.pageLink($0, language: language),
text: language == .english ? "View" : "Anzeigen") // TODO: Add to settings
}
return FeedEntryData(
@ -151,6 +140,56 @@ final class WebsiteGenerator {
}
}
private func generatePagesFolderIfNeeded() -> Bool {
let relativePath = content.settings.pages.pageUrlPrefix
return content.storage.write(in: .outputPath) { folder in
let outputFile = folder.appendingPathComponent(relativePath, isDirectory: true)
do {
try outputFile.ensureFolderExistence()
return true
} catch {
return false
}
}
}
func generate(page: Page) -> Bool {
guard generatePagesFolderIfNeeded() else {
print("Failed to generate output folder")
return false
}
let pageGenerator = PageGenerator(content: content, imageGenerator: imageGenerator, navigationBarData: navigationBarData)
let content = pageGenerator.generate(page: page, language: language)
let path = self.content.pageLink(page, language: language) + ".html"
guard save(content, to: path) else {
print("Failed to save page")
return false
}
guard imageGenerator.runJobs(callback: { _ in }) else {
return false
}
guard copy(requiredVideoFiles: pageGenerator.results.requiredVideoFiles) else {
return false
}
return true
}
private func copy(requiredVideoFiles: Set<String>) -> Bool {
print("Copying \(requiredVideoFiles.count) videos...")
for fileId in requiredVideoFiles {
guard let outputPath = content.pathToFile(fileId) else {
return false
}
guard content.storage.copy(file: fileId, to: outputPath) else {
print("Failed to copy video file to output folder")
return false
}
}
return true
}
private func save(_ content: String, to relativePath: String) -> Bool {
guard let data = content.data(using: .utf8) else {
print("Failed to create data for \(relativePath)")

44
CHDataManagement/Model/Content+Generation.swift Normal file
View File

@ -0,0 +1,44 @@
extension Content {
func pageLink(_ page: Page, language: ContentLanguage) -> String {
// TODO: Record link to trace connections between pages
var prefix = settings.pages.pageUrlPrefix
if !prefix.hasPrefix("/") {
prefix = "/" + prefix
}
if !prefix.hasSuffix("/") {
prefix.append("/")
}
return prefix + page.localized(in: language).urlString
}
func pageLink(pageId: String, language: ContentLanguage) -> String? {
guard let page = pages.first(where: { $0.id == pageId }) else {
// TODO: Note missing link
print("Missing page \(pageId) linked")
return nil
}
return pageLink(page, language: language)
}
func pathToFile(_ fileId: String) -> String? {
guard let file = file(id: fileId) else {
return nil
}
#warning("Add files path to settings")
return "/files/\(file.uniqueId)"
}
func image(_ imageId: String) -> ImageResource? {
images.first { $0.id == imageId }
}
func imageLink(imageId: String) {
}
func file(id: String) -> FileResource? {
files.first { $0.id == id }
}
}

29
CHDataManagement/Model/Content+Load.swift
View File

@ -49,6 +49,9 @@ extension Content {
let storage = Storage(baseFolder: URL(filePath: contentPath))
let settings = try storage.loadSettings()
let imageDescriptions = storage.loadImageDescriptions().reduce(into: [:]) { descriptions, description in
descriptions[description.imageId] = description
}
let tagData = try storage.loadAllTags()
let pagesData = try storage.loadAllPages()
@ -57,20 +60,20 @@ extension Content {
var images: [String : ImageResource] = [:]
var files: [FileResource] = []
var videos: [String] = []
for (file, url) in filesData {
let ext = file.components(separatedBy: ".").last!.lowercased()
let type = FileType(fileExtension: ext)
switch type {
case .image:
images[file] = ImageResource(uniqueId: file, altText: .init(en: "", de: ""), fileUrl: url)
case .file:
files.append(FileResource(uniqueId: file, description: ""))
case .video:
videos.append(file)
case .resource:
break
if case .image(let type) = type {
let descriptions = imageDescriptions[file]
images[file] = ImageResource(
type: type,
uniqueId: file,
en: descriptions?.english ?? "",
de: descriptions?.german ?? "",
fileUrl: url)
} else {
files.append(FileResource(type: type, uniqueId: file, description: ""))
}
}
@ -104,7 +107,6 @@ extension Content {
self.pages = pages.values.sorted(ascending: false) { $0.startDate }
self.files = files.sorted { $0.uniqueId }
self.images = images.values.sorted { $0.id }
self.videos = videos
self.posts = posts.sorted(ascending: false) { $0.startDate }
self.settings = makeSettings(settings, tags: tags)
}
@ -119,10 +121,15 @@ extension Content {
postsPerPage: settings.posts.postsPerPage,
contentWidth: settings.posts.contentWidth)
let pages = PageSettings(
pageUrlPrefix: settings.pages.pageUrlPrefix,
contentWidth: settings.pages.contentWidth)
return Settings(
outputDirectoryPath: settings.outputDirectoryPath,
navigationBar: navigationBar,
posts: posts,
pages: pages,
german: convert(settings.german),
english: convert(settings.english))
}

23
CHDataManagement/Model/Content+Save.swift
View File

@ -17,11 +17,23 @@ extension Content {
}
storage.save(settings: settings.file)
let imageDescriptions: [ImageDescriptions] = images.sorted().compactMap { image in
guard !image.englishDescription.isEmpty || !image.germanDescription.isEmpty else {
return nil
}
return ImageDescriptions(
imageId: image.id,
german: image.germanDescription.nonEmpty,
english: image.englishDescription.nonEmpty)
}
storage.save(imageDescriptions: imageDescriptions)
do {
try storage.deletePostFiles(notIn: posts.map { $0.id })
try storage.deletePageFiles(notIn: pages.map { $0.id })
try storage.deleteTagFiles(notIn: tags.map { $0.id })
let allFiles = files.map { $0.uniqueId } + images.map { $0.id } + videos
let allFiles = files.map { $0.uniqueId } + images.map { $0.id }
try storage.deleteFiles(notIn: allFiles)
} catch {
print("Failed to remove unused files: \(error)")
@ -128,6 +140,7 @@ extension Settings {
outputDirectoryPath: outputDirectoryPath,
navigationBar: navigationBar.file,
posts: posts.file,
pages: pages.file,
german: german.file,
english: english.file)
}
@ -141,6 +154,14 @@ private extension PostSettings {
}
}
private extension PageSettings {
var file: PageSettingsFile {
.init(pageUrlPrefix: pageUrlPrefix,
contentWidth: contentWidth)
}
}
private extension LocalizedSettings {
var file: LocalizedSettingsFile {

6
CHDataManagement/Model/Content.swift
View File

@ -19,9 +19,6 @@ final class Content: ObservableObject {
@Published
var images: [ImageResource]
@Published
var videos: [String]
@Published
var files: [FileResource]
@ -45,7 +42,6 @@ final class Content: ObservableObject {
tags: [Tag],
images: [ImageResource],
files: [FileResource],
videos: [String],
storedContentPath: String) {
self.settings = settings
self.posts = posts
@ -53,7 +49,6 @@ final class Content: ObservableObject {
self.tags = tags
self.images = images
self.files = files
self.videos = videos
self.storedContentPath = storedContentPath
self.contentPath = storedContentPath
self.storage = Storage(baseFolder: URL(filePath: storedContentPath))
@ -75,7 +70,6 @@ final class Content: ObservableObject {
self.tags = []
self.images = []
self.files = []
self.videos = []
contentPath = storedContentPath
do {

85
CHDataManagement/Model/DateItem.swift Normal file
View File

@ -0,0 +1,85 @@
import Foundation
protocol DateItem {
var startDate: Date { get }
var hasEndDate: Bool { get }
var endDate: Date { get }
}
extension DateItem {
private func datePrefixString(in language: ContentLanguage) -> String {
guard Calendar.current.isDate(startDate, equalTo: endDate, toGranularity: .year) else {
// Different year, return full string
return startDate.formatted(date: .long, time: .omitted)
}
guard Calendar.current.isDate(startDate, equalTo: endDate, toGranularity: .month) else {
// Different month
return DateItemStorage.dayAndMonth(of: startDate, in: language)
}
return DateItemStorage.day.string(from: startDate)
}
func dateText(in language: ContentLanguage) -> String {
guard hasEndDate else {
return DateItemStorage.dateString(for: startDate, in: language)
}
let endText = DateItemStorage.dateString(for: endDate, in: language)
return "\(datePrefixString(in: language)) - \(endText)"
}
}
private enum DateItemStorage {
static let englishDate: DateFormatter = {
let df = DateFormatter()
df.locale = .init(identifier: "en")
df.dateFormat = "d. MMMM yyyy"
return df
}()
static let germanDate: DateFormatter = {
let df = DateFormatter()
df.locale = .init(identifier: "de")
df.dateFormat = "d. MMMM yyyy"
return df
}()
static let englishDayAndMonth: DateFormatter = {
let df = DateFormatter()
df.locale = .init(identifier: "en")
df.dateFormat = "d. MMMM"
return df
}()
static let germanDayAndMonth: DateFormatter = {
let df = DateFormatter()
df.locale = .init(identifier: "de")
df.dateFormat = "d. MMMM"
return df
}()
static let day: DateFormatter = {
let df = DateFormatter()
df.dateFormat = "d."
return df
}()
static func dayAndMonth(of date: Date, in language: ContentLanguage) -> String {
switch language {
case .english: return englishDayAndMonth.string(from: date)
case .german: return germanDayAndMonth.string(from: date)
}
}
static func dateString(for date: Date, in language: ContentLanguage) -> String {
switch language {
case .english: return englishDate.string(from: date)
case .german: return germanDate.string(from: date)
}
}
}

9
CHDataManagement/Model/FileResource.swift
View File

@ -2,6 +2,8 @@ import Foundation
final class FileResource: ObservableObject {
let type: FileType
/// Globally unique id
@Published
var uniqueId: String
@ -10,6 +12,13 @@ final class FileResource: ObservableObject {
var description: String
init(uniqueId: String, description: String) {
self.type = FileType(fileExtension: uniqueId.fileExtension)
self.uniqueId = uniqueId
self.description = description
}
init(type: FileType, uniqueId: String, description: String) {
self.type = type
self.uniqueId = uniqueId
self.description = description
}

32
CHDataManagement/Model/ImageResource.swift
View File

@ -2,12 +2,18 @@ import SwiftUI
final class ImageResource: ObservableObject {
@Published
var type: ImageType
/// Globally unique id
@Published
var id: String
@Published
var altText: LocalizedText
var germanDescription: String
@Published
var englishDescription: String
@Published
var size: CGSize = .zero
@ -21,28 +27,46 @@ final class ImageResource: ObservableObject {
private let source: ImageSource
init(uniqueId: String, altText: LocalizedText, fileUrl: URL) {
init(type: ImageType, uniqueId: String, en: String, de: String, fileUrl: URL) {
self.type = type
self.id = uniqueId
self.source = .file(fileUrl)
self.altText = altText
self.englishDescription = en
self.germanDescription = de
}
init(resourceName: String) {
self.type = ImageType(fileExtension: resourceName.fileExtension!)!
self.id = resourceName
self.source = .resource(resourceName)
self.altText = .init(en: "A test image included in the bundle", de: "Ein Test-Image aus dem Bundle")
self.englishDescription = "A test image included in the bundle"
self.germanDescription = "Ein Test-Image aus dem Bundle"
}
private enum ImageSource {
case file(URL)
case resource(String)
}
func getDescription(for language: ContentLanguage) -> String {
switch language {
case .english: return englishDescription
case .german: return germanDescription
}
}
}
extension ImageResource: Identifiable {
}
extension ImageResource: Comparable {
static func < (lhs: ImageResource, rhs: ImageResource) -> Bool {
lhs.id < rhs.id
}
}
extension ImageResource: Equatable {
static func == (lhs: ImageResource, rhs: ImageResource) -> Bool {

16
CHDataManagement/Model/LocalizedPage.swift
View File

@ -85,20 +85,4 @@ final class LocalizedPage: ObservableObject {
self.linkPreviewTitle = linkPreviewTitle
self.linkPreviewDescription = linkPreviewDescription
}
@MainActor
func editableTitle() -> Binding<String> {
Binding(
get: {
self.title
},
set: { newValue in
self.title = newValue
}
)
}
var relativeUrl: String {
"/page/\(urlString)"
}
}

24
CHDataManagement/Model/LocalizedPost.swift
View File

@ -39,28 +39,4 @@ final class LocalizedPost: ObservableObject {
self.linkPreviewTitle = linkPreviewTitle
self.linkPreviewDescription = linkPreviewDescription
}
@MainActor
func editableTitle() -> Binding<String> {
Binding(
get: {
self.title
},
set: { newValue in
self.title = newValue
}
)
}
@MainActor
func editableContent() -> Binding<String> {
Binding(
get: {
self.content
},
set: { newValue in
self.content = newValue
}
)
}
}

4
CHDataManagement/Model/Page.swift
View File

@ -84,3 +84,7 @@ extension Page: Hashable {
hasher.combine(id)
}
}
extension Page: DateItem {
}

73
CHDataManagement/Model/Post.swift
View File

@ -80,77 +80,6 @@ extension Post: Hashable {
}
}
extension Post: DateItem {
// MARK: Feed entry
extension Post {
private static let englishDate: DateFormatter = {
let df = DateFormatter()
df.locale = .init(identifier: "en")
df.dateFormat = "d. MMMM yyyy"
return df
}()
private static let germanDate: DateFormatter = {
let df = DateFormatter()
df.locale = .init(identifier: "de")
df.dateFormat = "d. MMMM yyyy"
return df
}()
private static let englishDayAndMonth: DateFormatter = {
let df = DateFormatter()
df.locale = .init(identifier: "en")
df.dateFormat = "d. MMMM"
return df
}()
private static let germanDayAndMonth: DateFormatter = {
let df = DateFormatter()
df.locale = .init(identifier: "de")
df.dateFormat = "d. MMMM"
return df
}()
private static let day: DateFormatter = {
let df = DateFormatter()
df.dateFormat = "d."
return df
}()
private static func dayAndMonth(of date: Date, in language: ContentLanguage) -> String {
switch language {
case .english: return englishDayAndMonth.string(from: date)
case .german: return germanDayAndMonth.string(from: date)
}
}
private static func dateString(for date: Date, in language: ContentLanguage) -> String {
switch language {
case .english: return englishDate.string(from: date)
case .german: return germanDate.string(from: date)
}
}
private func datePrefixString(in language: ContentLanguage) -> String {
guard Calendar.current.isDate(startDate, equalTo: endDate, toGranularity: .year) else {
// Different year, return full string
return startDate.formatted(date: .long, time: .omitted)
}
guard Calendar.current.isDate(startDate, equalTo: endDate, toGranularity: .month) else {
// Different month
return Post.dayAndMonth(of: startDate, in: language)
}
return Post.day.string(from: startDate)
}
func dateText(in language: ContentLanguage) -> String {
guard hasEndDate else {
return Post.dateString(for: startDate, in: language)
}
let endText = Post.dateString(for: endDate, in: language)
return "\(datePrefixString(in: language)) - \(endText)"
}
}

43
CHDataManagement/Storage/Model/FileType.swift → CHDataManagement/Model/Types/FileType.swift
View File

@ -3,13 +3,17 @@ import Foundation
enum FileType {
case image(ImageType)
case file
case video
case resource
case file(String)
case video(VideoType)
case resource(String)
init(fileExtension: String) {
switch fileExtension.lowercased() {
init(fileExtension: String?) {
guard let ext = fileExtension?.lowercased() else {
self = .file("")
return
}
switch ext {
case "jpg", "jpeg":
self = .image(.jpg)
case "png":
@ -21,20 +25,25 @@ enum FileType {
case "gif":
self = .image(.gif)
case "html", "stl", "f3d", "step", "f3z", "zip", "json", "conf", "css", "js", "cpp", "cddx", "svg", "glb", "mp3", "pdf", "swift":
self = .file
self = .file(ext)
case "mp4":
self = .video
self = .video(.mp4)
case "m4v":
self = .video(.m4v)
case "webm":
self = .video(.webm)
case "key", "psd":
self = .resource
self = .resource(ext)
default:
print("Unhandled file type: \(fileExtension)")
self = .resource
print("Unhandled file type: \(ext)")
self = .resource(ext)
}
}
var fileExtension: String {
switch self {
case .image(let imageType): return imageType.fileExtension
case .video(let videoType): return videoType.fileExtension
default:
return "" // TODO: Fix
}
@ -46,4 +55,18 @@ enum FileType {
}
return false
}
var isVideo: Bool {
if case .video = self {
return true
}
return false
}
var videoType: VideoType? {
if case .video(let videoType) = self {
return videoType
}
return nil
}
}

0
CHDataManagement/Model/ImageType.swift → CHDataManagement/Model/Types/ImageType.swift
View File

36
CHDataManagement/Model/Types/VideoType.swift Normal file
View File

@ -0,0 +1,36 @@
enum VideoType: String {
case mp4
case m4v
case webm
}
extension VideoType {
var fileExtension: String {
switch self {
case .mp4:
return "mp4"
case .m4v:
return "m4v"
case .webm:
return "webm"
}
}
var htmlType: String {
switch self {
case .mp4, .m4v:
return "video/mp4"
case .webm:
return "video/webm"
}
}
}
extension VideoType: CaseIterable {
}

19
CHDataManagement/Page Elements/ContentElements/ContentPageVideo.swift Normal file
View File

@ -0,0 +1,19 @@
struct ContentPageVideo: HtmlProducer {
let filePath: String
let videoType: String
let options: [VideoOption]
func populate(_ result: inout String) {
result += "<video\(optionString)>Video not supported."
result += "<source src='\(filePath)' type='\(videoType)'>"
result += "</video>"
}
private var optionString: String {
options.map { " " + $0.rawValue }.joined()
}
}

34
CHDataManagement/Page Elements/ContentElements/DownloadButtons.swift Normal file
View File

@ -0,0 +1,34 @@
struct DownloadButtons {
struct Item {
let filePath: String
let text: String
let downloadFileName: String?
}
let items: [Item]
init(items: [Item]) {
self.items = items
}
var content: String {
var result = "<p style='display: flex'>"
for item in items {
addButton(of: item, to: &result)
}
result += "</p>"
return result
}
private func addButton(of item: Item, to result: inout String) {
let downloadText = item.downloadFileName.map { " download='\($0)'" } ?? ""
result += "<a class='download-button' href='\(item.filePath)'\(downloadText)>"
result += "\(item.text)<span class='icon icon-download'></span>"
result += "</a>"
}
}

42
CHDataManagement/Page Elements/ContentElements/HikingStatistics.swift Normal file
View File

@ -0,0 +1,42 @@
struct HikingStatistics {
private let time: String?
private let elevationUp: String?
private let elevationDown: String?
private let distance: String?
private let calories: String?
init(time: String?, elevationUp: String?, elevationDown: String?, distance: String?, calories: String?) {
self.time = time
self.elevationUp = elevationUp
self.elevationDown = elevationDown
self.distance = distance
self.calories = calories
}
var content: String {
var result = "<div class='stats-container'>"
if let time {
result += "<div><svg><use href='#icon-clock'></use></svg>\(time)</div>"
}
if let elevationUp {
result += "<div><svg><use href='#icon-arrow-up'></use></svg>\(elevationUp)</div>"
}
if let elevationDown {
result += "<div><svg><use href='#icon-arrow-down'></use></svg>\(elevationDown)</div>"
}
if let distance {
result += "<div><svg><use href='#icon-sign'></use></svg>\(distance)</div>"
}
if let calories {
result += "<div><svg><use href='#icon-flame'></use></svg>\(calories)</div>"
}
result += "</div>"
return result
}
}

29
CHDataManagement/Page Elements/ContentElements/TagList.swift Normal file
View File

@ -0,0 +1,29 @@
protocol HtmlProducer {
func populate(_ result: inout String)
}
extension HtmlProducer {
var content: String {
var result = ""
populate(&result)
return result
}
}
struct TagList: HtmlProducer {
let tags: [FeedEntryData.Tag]
func populate(_ result: inout String) {
guard !tags.isEmpty else {
return
}
result += "<div class='tags'>"
for tag in tags {
result += "<span class='tag' onclick=\"location.href='\(tag.url)'; event.stopPropagation();\">\(tag.name)</span>"
}
result += "</div>"
}
}

19
CHDataManagement/Page Elements/FeedEntry.swift
View File

@ -2,15 +2,18 @@ import Foundation
struct FeedEntry {
let data: FeedEntryData
private let data: FeedEntryData
init(data: FeedEntryData) {
self.data = data
}
private var cardLinkClassText: String {
data.link != nil ? " linked-card" : ""
}
var content: String {
#warning("TODO: Select CSS classes based on existence of link (hover effects, mouse pointer")
var result = "<div class='card'>"
var result = "<div class='card\(cardLinkClassText)'>"
ImageGallery(id: data.entryId, images: data.images)
.addContent(to: &result)
@ -23,14 +26,8 @@ struct FeedEntry {
if let title = data.title {
result += "<h2>\(title.htmlEscaped())</h2>"
}
if !data.tags.isEmpty {
result += "<div class='tags'>"
for tag in data.tags {
result += "<span class='tag' onclick=\"location.href='\(tag.url)'; event.stopPropagation();\">\(tag.name)</span>"
//result += "<a class='tag' href='\(tag.url)'>\(tag.name)</a>"
}
result += "</div>"
}
result += TagList(tags: data.tags).content
for paragraph in data.text {
result += "<p>\(paragraph)</p>"
}

18
CHDataManagement/Page Elements/FeedEntryData.swift
View File

@ -43,19 +43,13 @@ struct FeedEntryData {
struct Image {
let rawImagePath: String
let width: Int
let height: Int
let altText: String
let avif1x: String
let avif2x: String
let webp1x: String
let webp2x: String
let jpg1x: String
let jpg2x: String
}
}

14
CHDataManagement/Page Elements/ImageGallery.swift
View File

@ -15,16 +15,6 @@ struct ImageGallery {
self.images = images
}
private func imageCode(_ image: FeedEntryData.Image) -> String {
//return "<img src='\(image.mainImageUrl)' loading='lazy' alt='\(image.altText.htmlEscaped())'>"
var result = "<picture>"
result += "<source type='image/avif' srcset='\(image.avif1x) 1x, \(image.avif2x) 2x'/>"
result += "<source type='image/webp' srcset='\(image.webp1x) 1x, \(image.webp2x) 2x'/>"
result += "<img srcset='\(image.jpg2x) 2x' src='\(image.jpg1x)' loading='lazy' alt='\(image.altText.htmlEscaped())'/>"
result += "</picture>"
return result
}
func addContent(to result: inout String) {
guard !images.isEmpty else {
return
@ -33,7 +23,7 @@ struct ImageGallery {
result += "<div id='\(htmlSafeId)' class='swiper'><div class='swiper-wrapper'>"
guard images.count > 1 else {
result += imageCode(images[0])
result += WebsiteImage(image: images[0]).content
result += "</div></div>" // Close swiper, swiper-wrapper
return
}
@ -42,7 +32,7 @@ struct ImageGallery {
// TODO: Use different images based on device
result += "<div class='swiper-slide'>"
result += imageCode(image)
result += WebsiteImage(image: image).content
result += "<div class='swiper-lazy-preloader swiper-lazy-preloader-white'></div>"

27
CHDataManagement/Page Elements/PageImage.swift Normal file
View File

@ -0,0 +1,27 @@
import Foundation
struct PageImage {
let imageId: String
let thumbnail: FeedEntryData.Image
let largeImage: FeedEntryData.Image
let caption: String?
var content: String {
var result = ""
result += "<div class='content-image' onclick=\"document.getElementById('\(imageId)').classList.add('active')\">"
result += WebsiteImage(image: thumbnail).content
result += "</div>"
result += "<div id='\(imageId)' class='fullscreen-image' onclick=\"document.getElementById('\(imageId)').classList.remove('active')\">"
result += WebsiteImage(image: largeImage).content
if let caption {
result += "<div class='caption'>\(caption)</div>"
}
result += "<div class='close'></div>"
result += "</div>"
return result
}
}

35
CHDataManagement/Page Elements/WebsiteImage.swift Normal file
View File

@ -0,0 +1,35 @@
struct WebsiteImage {
private let prefix1x: String
private let prefix2x: String
private let altText: String
private let ext: String
init(image: FeedEntryData.Image) {
self.init(rawImagePath: image.rawImagePath,
width: image.width,
height: image.height,
altText: image.altText)
}
init(rawImagePath: String, width: Int, height: Int, altText: String) {
let (prefix, ext) = rawImagePath.fileNameAndExtension
self.prefix1x = "\(prefix)@\(width)x\(height)"
self.prefix2x = "\(prefix)@\(width*2)x\(height*2)"
self.altText = altText.htmlEscaped()
self.ext = ext ?? "jpg"
}
var content: String {
var result = "<picture>"
result += "<source type='image/avif' srcset='\(prefix1x).avif 1x, \(prefix2x).avif 2x'/>"
result += "<source type='image/webp' srcset='\(prefix1x).webm 1x, \(prefix1x).webm 2x'/>"
result += "<img srcset='\(prefix2x).\(ext) 2x' src='\(prefix1x).\(ext)' loading='lazy' alt='\(altText)'/>"
result += "</picture>"
return result
}
}

73
CHDataManagement/Pages/ContentPage.swift Normal file
View File

@ -0,0 +1,73 @@
import Foundation
struct ContentPage: HtmlProducer {
private let linkTitle: String
private let description: String
private let language: ContentLanguage
private let dateString: String
private let title: String
private let tags: [FeedEntryData.Tag]
private let navigationBarData: NavigationBarData
private let pageContent: String
init(language: ContentLanguage, dateString: String, title: String, tags: [FeedEntryData.Tag], linkTitle: String, description: String, navigationBarData: NavigationBarData, pageContent: String) {
self.language = language
self.dateString = dateString
self.title = title
self.tags = tags
self.linkTitle = linkTitle
self.description = description
self.navigationBarData = navigationBarData
self.pageContent = pageContent
}
func populate(_ result: inout String) {
// TODO: Add headers and footers from page content
result += "<!DOCTYPE html><html lang=\"\(language.rawValue)\">"
result += PageHead(title: title, description: description, additionalHeaders: "").content
result += "<body>"
result += NavigationBar(data: navigationBarData).content
result += "<main><article>"
result += "<div style=\"height: 70px;\"></div>"
result += "<h3>\(dateString)</h3>"
result += "<h1>\(title)</h1>"
result += TagList(tags: tags).content
result += symbols
result += pageContent
result += "</article></main>"
result += "" // TODO: Footer
result += "</body></html>" // Close content
}
private let symbols: String =
"""
<div style="display:none">
<svg id="icon-clock" width="16" height="16" viewBox="0 0 16 16">
<path fill="currentColor" d="M8 3.5a.5.5 0 0 0-1 0V9a.5.5 0 0 0 .3.4l3.5 2a.5.5 0 0 0 .4-.8L8 8.7V3.5z"/>
<path fill="currentColor" d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16zm7-8A7 7 0 1 1 1 8a7 7 0 0 1 14 0z"/>
</svg>
<svg id="icon-arrow-up" width="16" height="16">
<path fill="currentColor" d="m14 2.5a.5.5 0 0 0 -.5-.5h-6a.5.5 0 0 0 0 1h4.8l-10.16 10.15a.5.5 0 0 0 .7.7l10.16-10.14v4.79a.5.5 0 0 0 1 0z"/>
</svg>
<svg id="icon-arrow-down" width="16" height="16">
<path fill="currentColor" fill-rule="evenodd" d="M14 13.5a.5.5 0 0 1-.5.5h-6a.5.5 0 0 1 0-1h4.8L2.14 2.85a.5.5 0 1 1 .7-.7L13 12.29V7.5a.5.5 0 0 1 1 0v6z"/>
</svg>
<svg id="icon-sign" width="16" height="16">
<path fill="currentColor" d="M7 1.4V4H2a1 1 0 0 0-1 1v4a1 1 0 0 0 1 1h5v6h2v-6h3.5a1 1 0 0 0 .8-.4l2-2.3a.5.5 0 0 0 0-.6l-2-2.3a1 1 0 0 0-.8-.4H9V1.4a1 1 0 0 0-2 0zM12.5 5l1.7 2-1.7 2H2V5h10.5z"/>
</svg>
<svg id="icon-flame" width="16" height="16">
<path fill="currentColor" d="M8 16c3.3 0 6-2 6-5.5 0-1.5-.5-4-2.5-6 .3 1.5-1.3 2-1.3 2C11 4 9 .5 6 0c.4 2 .5 4-2 6-1.3 1-2 2.7-2 4.5C2 14 4.7 16 8 16Zm0-1c-1.7 0-3-1-3-2.8 0-.7.3-2 1.3-3-.2.8.7 1.3.7 1.3-.4-1.3.5-3.3 2-3.5-.2 1-.3 2 1 3a3 3 0 0 1 1 2.3C11 14 9.7 15 8 15Z"/>
</svg>
</div>
"""
}

1
CHDataManagement/Preview Content/Content+Mock.swift
View File

@ -21,6 +21,5 @@ extension Content {
tags: [.hiking, .mountains, .nature, .sports],
images: [],
files: [],
videos: [],
storedContentPath: dbPath)
}

13
CHDataManagement/Storage/Model/ImageDescriptions.swift Normal file
View File

@ -0,0 +1,13 @@
struct ImageDescriptions {
let imageId: String
let german: String?
let english: String?
}
extension ImageDescriptions: Codable {
}

82
CHDataManagement/Storage/Storage.swift
View File

@ -154,7 +154,7 @@ final class Storage {
let contentUrl = pageContentUrl(pageId: pageId, language: language)
guard fm.fileExists(atPath: contentUrl.path()) else {
print("No file at \(contentUrl.path())")
return "New file"
return ""
}
do {
return try String(contentsOf: contentUrl, encoding: .utf8)
@ -235,6 +235,34 @@ final class Storage {
// MARK: Files
private var imageDescriptionFilename: String {
"image-descriptions.json"
}
private var imageDescriptionUrl: URL {
baseFolder.appending(path: "image-descriptions.json")
}
func loadImageDescriptions() -> [ImageDescriptions] {
do {
return try read(relativePath: imageDescriptionFilename)
} catch {
print("Failed to read image descriptions: \(error)")
return []
}
}
@discardableResult
func save(imageDescriptions: [ImageDescriptions]) -> Bool {
do {
try writeIfChanged(imageDescriptions, to: imageDescriptionFilename)
return true
} catch {
print("Failed to write image descriptions: \(error)")
return false
}
}
/// The folder path where other files are stored (by their unique name)
var filesFolder: URL { subFolder("files") }
@ -251,6 +279,26 @@ final class Storage {
return copy(file: url, to: contentUrl, type: "file", id: fileId)
}
func copy(file fileId: String, to relativeOutputPath: String) -> Bool {
do {
try operate(in: .contentPath) { contentPath in
try operate(in: .outputPath) { outputPath in
let output = outputPath.appending(path: relativeOutputPath, directoryHint: .notDirectory)
if output.exists {
return
}
let input = contentPath.appending(path: "files/\(fileId)", directoryHint: .notDirectory)
try output.ensureParentFolderExistence()
try FileManager.default.copyItem(at: input, to: output)
}
}
return true
} catch {
print("Failed to copy file \(fileId) to output folder: \(error)")
return false
}
}
func loadAllFiles() throws -> [String : URL] {
try files(in: filesFolder).reduce(into: [:]) { files, url in
files[url.lastPathComponent] = url
@ -365,6 +413,30 @@ final class Storage {
}
}
private func writeIfChanged<T>(_ value: T, to relativePath: String) throws where T: Encodable {
try operate(in: .contentPath) { contentPath in
let url = contentPath.appending(path: relativePath, directoryHint: .notDirectory)
let data = try encoder.encode(value)
if fm.fileExists(atPath: url.path()) {
// Check if content is the same, to prevent unnecessary writes
do {
let oldData = try Data(contentsOf: url)
if data == oldData {
// File is the same, don't write
return
}
} catch {
print("Failed to read file \(url.path()) for equality check: \(error)")
// No check possible, write file
}
} else {
print("Writing new file \(url.path())")
}
try data.write(to: url)
print("Saved file \(url.path())")
}
}
/**
Encode a value and write it to a file, if the content changed
*/
@ -426,6 +498,14 @@ final class Storage {
return write(data: data, type: type, id: id, to: file)
}
private func read<T>(relativePath: String) throws -> T where T: Decodable {
try operate(in: .contentPath) { baseFolder in
let url = baseFolder.appending(path: relativePath, directoryHint: .notDirectory)
let data = try Data(contentsOf: url)
return try decoder.decode(T.self, from: data)
}
}
private func read<T>(at url: URL) throws -> T where T: Decodable {
let data = try Data(contentsOf: url)
return try decoder.decode(T.self, from: data)

3
CHDataManagement/Views/Files/FilesView.swift
View File

@ -60,7 +60,8 @@ struct FilesView: View {
print("A file '\(fileId)' already exists")
continue
}
let file = FileResource(uniqueId: fileId, description: "")
let type = FileType(fileExtension: fileId.fileExtension)
let file = FileResource(type: type, uniqueId: fileId, description: "")
guard content.storage.copyFile(at: url, fileId: fileId) else {
print("Failed to import file '\(fileId)'")
continue

7
CHDataManagement/Views/Images/ImageDetailsView.swift
View File

@ -26,9 +26,12 @@ struct ImageDetailsView: View {
Text("Update")
}
}
Text("Description")
Text("German Description")
.font(.headline)
TextField("", text: image.altText.text(for: language))
TextField("", text: $image.germanDescription)
Text("English Description")
.font(.headline)
TextField("", text: $image.englishDescription)
Text("Info")
.font(.headline)
HStack(alignment: .top) {

103
CHDataManagement/Views/Pages/PageContentView.swift Normal file
View File

@ -0,0 +1,103 @@
import SwiftUI
import HighlightedTextEditor
struct PageContentView: View {
@ObservedObject
var page: Page
@ObservedObject
private var localized: LocalizedPage
let language: ContentLanguage
@EnvironmentObject
private var content: Content
@State
private var isGeneratingWebsite = false
@State
private var pageContent: String = ""
init(page: Page, language: ContentLanguage) {
self.page = page
self.localized = page.localized(in: language)
self.language = language
}
var body: some View {
VStack(alignment: .leading) {
TextField("", text: $localized.title)
.font(.title)
.textFieldStyle(.plain)
HStack(alignment: .firstTextBaseline) {
Button(action: loadContent) {
Text("Load")
}
Button(action: saveContent) {
Text("Save")
}
Button(action: generate) {
Text("Generate")
}
.disabled(isGeneratingWebsite)
Spacer()
}
HighlightedTextEditor(
text: $pageContent,
highlightRules: .markdown)
}
.padding()
.onAppear(perform: loadContent)
.onDisappear(perform: saveContent)
}
private func loadContent() {
let content = content.storage.pageContent(for: page.id, language: language)
guard content != "" else {
pageContent = "New file"
return
}
pageContent = content
}
private func saveContent() {
guard pageContent != "", pageContent != "New file" else {
return
}
content.storage.save(pageContent: pageContent, for: page.id, language: language)
}
private func generate() {
guard content.settings.outputDirectoryPath != "" else {
print("Invalid output path")
return
}
let url = URL(fileURLWithPath: content.settings.outputDirectoryPath)
guard FileManager.default.fileExists(atPath: url.path) else {
print("Missing output folder")
return
}
isGeneratingWebsite = true
print("Generating page")
DispatchQueue.global(qos: .userInitiated).async {
let generator = WebsiteGenerator(
content: content,
language: language)
if !generator.generate(page: page) {
print("Generation failed")
}
DispatchQueue.main.async {
isGeneratingWebsite = false
print("Done")
}
}
}
}
#Preview {
PageContentView(page: .empty, language: .english)
}

51
CHDataManagement/Views/Pages/PageDetailView.swift
View File

@ -1,51 +0,0 @@
import SwiftUI
import HighlightedTextEditor
struct PageDetailView: View {
@ObservedObject
var page: Page
@Environment(\.language)
private var language
@EnvironmentObject
private var content: Content
@State
private var pageContent: String = ""
var body: some View {
VStack(alignment: .leading) {
TextField("", text: page.localized(in: language).editableTitle())
.font(.title)
.textFieldStyle(.plain)
HStack(alignment: .firstTextBaseline) {
Button(action: loadContent) {
Text("Load")
}
Button(action: saveContent) {
Text("Save")
}
Spacer()
}
HighlightedTextEditor(
text: $pageContent,
highlightRules: .markdown)
}
.padding()
}
private func loadContent() {
pageContent = content.storage.pageContent(for: page.id, language: language)
}
private func saveContent() {
content.storage.save(pageContent: pageContent, for: page.id, language: language)
}
}
#Preview {
PageDetailView(page: .empty)
}

4
CHDataManagement/Views/Pages/PageListView.swift
View File

@ -42,8 +42,8 @@ struct PageListView: View {
.navigationSplitViewColumnWidth(min: 300, ideal: 300, max: 300)
} content: {
if let selected {
PageDetailView(page: selected)
.id(selected.id)
PageContentView(page: selected, language: language)
.id(selected.id + language.rawValue)
.layoutPriority(1)
} else {
// Fallback if no item is selected