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

Fix icons, external file rename

Browse Source
This commit is contained in:
Christoph Hagen 2024-12-14 18:26:11 +01:00
parent be2aab2ea8
commit cdaaa36303
6 changed files with 22 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHDataManagement.xcodeproj/project.pbxproj
View File

@ -114,7 +114,6 @@
E29D318B2D0B07EE0051B7F4 /* ContentBox.swift in Sources */ = {isa = PBXBuildFile; fileRef = E29D318A2D0B07E60051B7F4 /* ContentBox.swift */; };
E29D318E2D0B2E680051B7F4 /* PageSettingsContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E29D318D2D0B2E640051B7F4 /* PageSettingsContentView.swift */; };
E29D31902D0B34870051B7F4 /* PageContentAnomaly.swift in Sources */ = {isa = PBXBuildFile; fileRef = E29D318F2D0B34870051B7F4 /* PageContentAnomaly.swift */; };
E29D31922D0B3EFC0051B7F4 /* PageCommandExtractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = E29D31912D0B3EF30051B7F4 /* PageCommandExtractor.swift */; };
E29D31942D0B7D280051B7F4 /* SvgImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = E29D31932D0B7D250051B7F4 /* SvgImage.swift */; };
E29D31962D0C186E0051B7F4 /* PathSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = E29D31952D0C18690051B7F4 /* PathSettings.swift */; };
E29D31982D0C19340051B7F4 /* PathSettingsFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = E29D31972D0C19300051B7F4 /* PathSettingsFile.swift */; };
@ -282,7 +281,6 @@
E29D318A2D0B07E60051B7F4 /* ContentBox.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentBox.swift; sourceTree = "<group>"; };
E29D318D2D0B2E640051B7F4 /* PageSettingsContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PageSettingsContentView.swift; sourceTree = "<group>"; };
E29D318F2D0B34870051B7F4 /* PageContentAnomaly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PageContentAnomaly.swift; sourceTree = "<group>"; };
E29D31912D0B3EF30051B7F4 /* PageCommandExtractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PageCommandExtractor.swift; sourceTree = "<group>"; };
E29D31932D0B7D250051B7F4 /* SvgImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SvgImage.swift; sourceTree = "<group>"; };
E29D31952D0C18690051B7F4 /* PathSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PathSettings.swift; sourceTree = "<group>"; };
E29D31972D0C19300051B7F4 /* PathSettingsFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PathSettingsFile.swift; sourceTree = "<group>"; };
@ -405,7 +403,6 @@
isa = PBXGroup;
children = (
E29D31B62D0DAC030051B7F4 /* Page Content */,
E29D31912D0B3EF30051B7F4 /* PageCommandExtractor.swift */,
E29D318F2D0B34870051B7F4 /* PageContentAnomaly.swift */,
E29D31842D0AE8EE0051B7F4 /* RequiredHeaders.swift */,
E25DA5222CFF6C2600AEF16D /* ImageGenerator.swift */,
@ -891,7 +888,6 @@
E2A21C2A2CB2AA4F0060935B /* Post+Mock.swift in Sources */,
E29D312E2D03A0D70051B7F4 /* LocalizedPageDetailView.swift in Sources */,
E2581DED2C75202400F1F079 /* Tag.swift in Sources */,
E29D31922D0B3EFC0051B7F4 /* PageCommandExtractor.swift in Sources */,
E29D315B2D06D63E0051B7F4 /* ModelFileType.swift in Sources */,
E29D31302D03A2C50051B7F4 /* DescriptionField.swift in Sources */,
E29D31BE2D0DB85A0051B7F4 /* AudioPlayerCommand.swift in Sources */,

1
CHDataManagement/Generator/Page Content/LabelsCommand.swift
View File

@ -23,6 +23,7 @@ struct LabelsCommandProcessor: CommandProcessor {
results.invalid(command: .labels, markdown)
return nil
}
results.requiredIcons.insert(icon)
return .init(icon: icon, value: parts[1])
}
return ContentLabels(labels: labels).content

32
CHDataManagement/Generator/PageCommandExtractor.swift
View File

@ -1,32 +0,0 @@
import Ink
#warning("Remove if unused")
final class PageCommandExtractor {
private var occurrences: [(full: String, command: String, arguments: [String])] = []
func findOccurrences(of command: ShorthandMarkdownKey, in content: String) -> [(full: String, arguments: [String])] {
findOccurrences(of: command.rawValue, in: content)
}
func findOccurrences(of command: String, in content: String) -> [(full: String, arguments: [String])] {
let parser = MarkdownParser(modifiers: [
Modifier(target: .images, closure: processMarkdownImage),
])
_ = parser.html(from: content)
return occurrences
.filter { $0.command == command }
.map { ($0.full, $0.arguments) }
}
private func processMarkdownImage(html: String, markdown: Substring) -> String {
let argumentList = markdown.between(first: "](", andLast: ")").removingPercentEncoding ?? markdown.between(first: "](", andLast: ")")
let arguments = argumentList.components(separatedBy: ";")
let command = markdown.between("![", and: "]").trimmed
occurrences.append((full: String(markdown), command: command, arguments: arguments))
return ""
}
}

5
CHDataManagement/Main/MainView.swift
View File

@ -1,14 +1,15 @@
import SwiftUI
import SFSafeSymbols
#warning("Fix podcast")
#warning("Allow selection of pages as navigation bar items")
#warning("Add link to other language")
#warning("Transfer images of posts to other language")
#warning("Show tag selection view for pages")
#warning("Button to replace files")
#warning("Add external pages")
#warning("Convert statistics into key-value pairs")
#warning("Replace links to files inside pages when id changes")
#warning("Calculate file sizes")
#warning("Specify image aspect ratio to prevent page jumps")
@main
struct MainView: App {

17
CHDataManagement/Model/FileResource.swift
View File

@ -116,6 +116,23 @@ final class FileResource: Item {
default: return content.settings.paths.filesOutputFolderPath
}
}
// MARK: File
func update(id newId: String) -> Bool {
guard !isExternallyStored else {
id = newId
return true
}
do {
try content.storage.move(file: id, to: newId)
id = newId
return true
} catch {
print("Failed to move file \(id) to \(newId)")
return false
}
}
}
extension FileResource: Identifiable {

7
CHDataManagement/Views/Files/FileDetailView.swift
View File

@ -55,14 +55,9 @@ struct FileDetailView: View {
}
private func setNewId() {
do {
try file.content.storage.move(file: file.id, to: newId)
} catch {
print("Failed to move file \(file.id)")
if !file.update(id: newId) {
newId = file.id
return
}
file.id = newId
}
}