ch/CHGenerator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: ch:6e717a8cf7c5aae19aa027d472fe16ab09dbda85
Branches Tags
ch:main
..
compare: ch:89245f2553a41812f5de3e0579279b615d26cba4
Branches Tags
ch:main

No commits in common. "6e717a8cf7c5aae19aa027d472fe16ab09dbda85" and "89245f2553a41812f5de3e0579279b615d26cba4" have entirely different histories.
6e717a8cf7 ... 89245f2553

2 changed files with 3 additions and 17 deletions
Show Stats Expand all files Collapse all files

11
Sources/Generator/Extensions/String+Extensions.swift
View File

@ -67,21 +67,10 @@ extension String {
extension Substring { 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 { func between(_ start: String, and end: String) -> String {
components(separatedBy: start).last! components(separatedBy: start).last!
.components(separatedBy: end).first! .components(separatedBy: end).first!
} }
func between(first: String, andLast last: String) -> String {
dropBeforeFirst(first).dropAfterLast(last)
}
} }
extension String { extension String {

9
Sources/Generator/Generators/PageContentGenerator.swift
View File

@ -87,11 +87,8 @@ struct PageContentGenerator {
// For a simple boxes: ![box](title;body) // For a simple boxes: ![box](title;body)
// A fancy page link: ![page](page_id) // A fancy page link: ![page](page_id)
// External pages: ![external](url1, text1; url2, text2, ...) // External pages: ![external](url1, text1; url2, text2, ...)
guard let fileAndTitle = markdown.between(first: "](", andLast: ")").removingPercentEncoding else { let fileAndTitle = markdown.between("(", and: ")")
results.warning("Invalid percent encoding for markdown image", source: page.path) let alt = markdown.between("[", and: "]").nonEmpty
return ""
}
let alt = markdown.between("[", and: "]").nonEmpty?.removingPercentEncoding
if let alt = alt, let command = ShorthandMarkdownKey(rawValue: alt) { if let alt = alt, let command = ShorthandMarkdownKey(rawValue: alt) {
return handleShortHandCommand(command, page: page, language: language, content: fileAndTitle) return handleShortHandCommand(command, page: page, language: language, content: fileAndTitle)
} }
@ -253,7 +250,7 @@ struct PageContentGenerator {
.compactMap { button -> (file: String, text: String, downloadName: String?)? in .compactMap { button -> (file: String, text: String, downloadName: String?)? in
let parts = button.components(separatedBy: ",") let parts = button.components(separatedBy: ",")
guard parts.count == 2 || parts.count == 3 else { guard parts.count == 2 || parts.count == 3 else {
results.warning("Invalid download definition with \(parts)", source: page.path) results.warning("Invalid button definition", source: page.path)
return nil return nil
} }
let file = parts[0].trimmed let file = parts[0].trimmed