Full generation, file type cleanup

CHDataManagement/Model/Content.swift

@@ -26,13 +26,14 @@ final class Content: ObservableObject {
     var tagOverview: TagOverviewPage?
 
     @Published
-    var results: [ItemId : PageGenerationResults]
+    var results: GenerationResults
+
+    @Published
+    var generationStatus: String = "Ready to generate"
 
     @Published
     private(set) var isGeneratingWebsite = false
 
-    let imageGenerator: ImageGenerator
-
     init(settings: Settings,
          posts: [Post],
          pages: [Page],
@@ -45,13 +46,10 @@ final class Content: ObservableObject {
         self.tags = tags
         self.files = files
         self.tagOverview = tagOverview
-        self.results = [:]
+        self.results = .init()
 
         let storage = Storage()
         self.storage = storage
-        self.imageGenerator = ImageGenerator(
-            storage: storage,
-            settings: settings)
     }
 
     init() {
@@ -62,13 +60,10 @@ final class Content: ObservableObject {
         self.tags = []
         self.files = []
         self.tagOverview = nil
-        self.results = [:]
+        self.results = .init()
 
         let storage = Storage()
         self.storage = storage
-        self.imageGenerator = ImageGenerator(
-            storage: storage,
-            settings: settings)
     }
 
     private func clear() {
@@ -78,7 +73,7 @@ final class Content: ObservableObject {
         self.tags = []
         self.files = []
         self.tagOverview = nil
-        self.results = [:]
+        self.results = .init()
     }
 
     var images: [FileResource] {
@@ -86,9 +81,7 @@ final class Content: ObservableObject {
     }
 
     func set(isGenerating: Bool) {
-        DispatchQueue.main.async {
-            self.isGeneratingWebsite = isGenerating
-        }
+        self.isGeneratingWebsite = isGenerating
     }
 
     func add(_ file: FileResource) {