mirror of
https://github.com/kovetskiy/mark.git
synced 2025-04-24 05:42:40 +08:00
add new format headers
This commit is contained in:
parent
94f925d796
commit
45e96ed864
@ -22,10 +22,10 @@ Confluence instance and update it accordingly.
|
||||
|
||||
File in extended format should follow specification
|
||||
```markdown
|
||||
[]:# (X-Space: <space key>)
|
||||
[]:# (X-Parent: <parent 1>)
|
||||
[]:# (X-Parent: <parent 2>)
|
||||
[]:# (X-Title: <title>)
|
||||
<!-- Space: <space key> -->
|
||||
<!-- Parent: <parent 1> -->
|
||||
<!-- Parent: <parent 2> -->
|
||||
<!-- Title: <title> -->
|
||||
|
||||
<page contents>
|
||||
```
|
||||
|
@ -43,7 +43,10 @@ type Meta struct {
|
||||
}
|
||||
|
||||
func ExtractMeta(data []byte) (*Meta, error) {
|
||||
headerPattern := regexp.MustCompile(`\[\]:\s*#\s*\(([^:]+):\s*(.*)\)`)
|
||||
var (
|
||||
headerPatternV1 = regexp.MustCompile(`\[\]:\s*#\s*\(([^:]+):\s*(.*)\)`)
|
||||
headerPatternV2 = regexp.MustCompile(`<!--\s*([^:]+):\s*(.*)\s*-->`)
|
||||
)
|
||||
|
||||
var meta *Meta
|
||||
|
||||
@ -55,9 +58,19 @@ func ExtractMeta(data []byte) (*Meta, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
matches := headerPattern.FindStringSubmatch(line)
|
||||
matches := headerPatternV2.FindStringSubmatch(line)
|
||||
if matches == nil {
|
||||
break
|
||||
matches = headerPatternV1.FindStringSubmatch(line)
|
||||
if matches == nil {
|
||||
break
|
||||
}
|
||||
|
||||
log.Warningf(
|
||||
fmt.Errorf(`legacy header usage found: %s`, line),
|
||||
"please use new header format: <!-- %s: %s -->",
|
||||
matches[1],
|
||||
matches[2],
|
||||
)
|
||||
}
|
||||
|
||||
if meta == nil {
|
||||
|
Loading…
x
Reference in New Issue
Block a user