From 09b1f48aeab71545f9e8f10dce0137330b97e81e Mon Sep 17 00:00:00 2001
From: Christoph Hagen <github@christophhagen.de>
Date: Mon, 27 Jan 2025 07:56:07 +0100
Subject: [PATCH] Insert more line breaks

---
 .../Generator/Page Generators/FeedPageGenerator.swift    | 2 +-
 .../ContentElements/AudioPlayer/AudioPlayer.swift        | 8 +++++++-
 .../ContentElements/AudioPlayer/AudioPlayerContent.swift | 6 +++---
 CHDataManagement/Page Elements/FeedEntry.swift           | 9 ++++-----
 CHDataManagement/Page Elements/GenericPage.swift         | 3 ++-
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/CHDataManagement/Generator/Page Generators/FeedPageGenerator.swift b/CHDataManagement/Generator/Page Generators/FeedPageGenerator.swift
index 2d6b69e..0360d74 100644
--- a/CHDataManagement/Generator/Page Generators/FeedPageGenerator.swift	
+++ b/CHDataManagement/Generator/Page Generators/FeedPageGenerator.swift	
@@ -68,7 +68,7 @@ final class FeedPageGenerator {
             header: pageHeader,
             additionalFooter: footer) { content in
                 if let pageTitle {
-                    content += "<h1 class='separated-headline'>\(pageTitle)</h1>"
+                    content += "<h1 class='separated-headline'>\(pageTitle)</h1>\n"
                 }
                 for post in posts {
                     content += FeedEntry(data: post).content
diff --git a/CHDataManagement/Page Elements/ContentElements/AudioPlayer/AudioPlayer.swift b/CHDataManagement/Page Elements/ContentElements/AudioPlayer/AudioPlayer.swift
index 433deea..f19857d 100644
--- a/CHDataManagement/Page Elements/ContentElements/AudioPlayer/AudioPlayer.swift	
+++ b/CHDataManagement/Page Elements/ContentElements/AudioPlayer/AudioPlayer.swift	
@@ -122,7 +122,13 @@ struct AudioPlayer: HtmlProducer {
 
         var content: String {
             """
-            <div class="playlist-song amplitude-song-container amplitude-play-pause amplitude-paused" data-amplitude-song-index="\(index)"><img src="\(image)"><div class="playlist-song-meta"><span class="playlist-song-name">\(name)</span><span class="playlist-song-artist">\(album) &bull; \(artist)</span></div></div>
+            <div class="playlist-song amplitude-song-container amplitude-play-pause amplitude-paused" data-amplitude-song-index="\(index)">
+                <img src="\(image)">
+                <div class="playlist-song-meta">
+                    <span class="playlist-song-name">\(name)</span>
+                    <span class="playlist-song-artist">\(album) &bull; \(artist)</span>
+                </div>
+            </div>
             """
         }
     }
diff --git a/CHDataManagement/Page Elements/ContentElements/AudioPlayer/AudioPlayerContent.swift b/CHDataManagement/Page Elements/ContentElements/AudioPlayer/AudioPlayerContent.swift
index 7ff3347..dd50c83 100644
--- a/CHDataManagement/Page Elements/ContentElements/AudioPlayer/AudioPlayerContent.swift	
+++ b/CHDataManagement/Page Elements/ContentElements/AudioPlayer/AudioPlayerContent.swift	
@@ -18,14 +18,14 @@ struct AudioPlayerScript: HtmlProducer {
     }
 
     func populate(_ result: inout String) {
-        result += "<script>window.onload = () => { "
+        result += "<script>\nwindow.onload = () => { "
         result += "Amplitude.init({ songs: "
         let songData = try! JSONEncoder().encode(items)
         result += String(data: songData, encoding: .utf8)!
-        result += "}); }; " // Close Amplitude.init and window.onload
+        result += "}); };\n" // Close Amplitude.init and window.onload
         result += "function playEntry(index) { Amplitude.playSongAtIndex(index) };"
         result += animatePlaylist
-        result += "</script>"
+        result += "\n</script>"
     }
 
     private var animatePlaylist: String {
diff --git a/CHDataManagement/Page Elements/FeedEntry.swift b/CHDataManagement/Page Elements/FeedEntry.swift
index c6d1ea1..3e94e09 100644
--- a/CHDataManagement/Page Elements/FeedEntry.swift	
+++ b/CHDataManagement/Page Elements/FeedEntry.swift	
@@ -1,6 +1,6 @@
 import Foundation
 
-struct FeedEntry {
+struct FeedEntry: HtmlProducer {
 
     private let data: FeedEntryData
 
@@ -12,8 +12,8 @@ struct FeedEntry {
         data.link != nil ? " linked-card" : ""
     }
 
-    var content: String {
-        var result = "<article><div class='card\(cardLinkClassText)'>"
+    func populate(_ result: inout String) {
+        result += "<article><div class='card\(cardLinkClassText)'>"
         switch data.media {
         case .images(let images):
             ImageGallery(id: data.entryId, images: images).populate(&result)
@@ -41,7 +41,6 @@ struct FeedEntry {
         if let url = data.link {
             result += "<div class='link-center'><div class='link'>\(url.text)</div></div>"
         }
-        result += "</div></div></article>" // Closes card-content, card, article
-        return result
+        result += "</div></div></article>\n" // Closes card-content, card, article
     }
 }
diff --git a/CHDataManagement/Page Elements/GenericPage.swift b/CHDataManagement/Page Elements/GenericPage.swift
index ca96a82..130cbc2 100644
--- a/CHDataManagement/Page Elements/GenericPage.swift	
+++ b/CHDataManagement/Page Elements/GenericPage.swift	
@@ -19,8 +19,9 @@ struct GenericPage {
     var content: String {
         var result = ""
         header.populate(&result) // Opens <html><body><main>
+        result += "\n"
         insertedContent(&result)
-        result += "</main>" // Close <main>
+        result += "</main>\n" // Close <main>
         result += additionalFooter
         result += "</body></html>" // Close <body><html>
         return result