Full page content, fixes, cleaner settings

CHDataManagement/Model/Content+Load.swift

@@ -38,14 +38,6 @@ extension Content {
             linkPreviewDescription: page.linkPreviewDescription)
     }
 
-    private func convert(_ settings: LocalizedSettingsFile) -> LocalizedSettings {
-        .init(navigationBarIconDescription: settings.navigationBarIconDescription,
-              posts: .init(
-                title: settings.posts.feedTitle,
-                description: settings.posts.feedDescription,
-                feedUrlPrefix: settings.posts.feedUrlPrefix))
-    }
-
     func loadFromDisk() throws {
         let storage = Storage(baseFolder: URL(filePath: contentPath))
 
@@ -118,26 +110,23 @@ extension Content {
 
     private func makeSettings(_ settings: SettingsFile, tags: [String : Tag]) -> Settings {
 
-        let navigationBar = NavigationBarSettings(
-            iconPath: settings.navigationBar.navigationIconPath,
-            tags: settings.navigationBar.navigationTags.map { tags[$0]! })
+        let navigationTags = settings.navigationTags.map { tags[$0]! }
 
         let posts = PostSettings(
             postsPerPage: settings.posts.postsPerPage,
             contentWidth: settings.posts.contentWidth)
 
-        let pages = PageSettings(
-            pageUrlPrefix: settings.pages.pageUrlPrefix,
-            contentWidth: settings.pages.contentWidth,
-            largeImageWidth: settings.pages.largeImageWidth)
+        let pages = PageSettings(file: settings.pages)
+
+        let paths = PathSettings(file: settings.paths)
 
         return Settings(
-            outputDirectoryPath: settings.outputDirectoryPath,
-            navigationBar: navigationBar,
+            paths: paths,
+            navigationTags: navigationTags,
             posts: posts,
             pages: pages,
-            german: convert(settings.german),
-            english: convert(settings.english))
+            german: .init(file: settings.german),
+            english: .init(file: settings.english))
     }
 
     private func loadPages(_ pagesData: [String : PageFile], tags: [String : Tag], images: [String : FileResource]) -> [String : Page] {