Include space parameter as well

This commit is contained in:
Manuel Rüger
2023-03-20 22:54:11 +01:00
parent 21cf51efd7
commit 9840c01e8a
3 changed files with 15 additions and 14 deletions

View File

@@ -29,6 +29,7 @@ func ResolveRelativeLinks(
meta *Meta,
markdown []byte,
base string,
spaceFromCli string,
titleFromH1 bool,
) ([]LinkSubstitution, error) {
matches := parseLinks(string(markdown))
@@ -43,7 +44,7 @@ func ResolveRelativeLinks(
match.hash,
)
resolved, err := resolveLink(api, base, match, titleFromH1)
resolved, err := resolveLink(api, base, match, spaceFromCli, titleFromH1)
if err != nil {
return nil, karma.Format(err, "resolve link: %q", match.full)
}
@@ -65,6 +66,7 @@ func resolveLink(
api *confluence.API,
base string,
link markdownLink,
spaceFromCli string,
titleFromH1 bool,
) (string, error) {
var result string
@@ -95,7 +97,7 @@ func resolveLink(
// This helps to determine if found link points to file that's
// not markdown or have mark required metadata
linkMeta, _, err := ExtractMeta(linkContents, titleFromH1)
linkMeta, _, err := ExtractMeta(linkContents, spaceFromCli, titleFromH1)
if err != nil {
log.Errorf(
err,

View File

@@ -46,7 +46,7 @@ var (
reHeaderPatternMacro = regexp.MustCompile(`<!-- Macro: .*`)
)
func ExtractMeta(data []byte, titleFromH1 bool) (*Meta, []byte, error) {
func ExtractMeta(data []byte, spaceFromCli string, titleFromH1 bool) (*Meta, []byte, error) {
var (
meta *Meta
offset int
@@ -146,7 +146,7 @@ func ExtractMeta(data []byte, titleFromH1 bool) (*Meta, []byte, error) {
}
}
if titleFromH1 {
if titleFromH1 || spaceFromCli != "" {
if meta == nil {
meta = &Meta{}
}
@@ -159,9 +159,12 @@ func ExtractMeta(data []byte, titleFromH1 bool) (*Meta, []byte, error) {
meta.ContentAppearance = FullWidthContentAppearance // Default to full-width for backwards compatibility
}
if meta.Title == "" {
if titleFromH1 && meta.Title == "" {
meta.Title = ExtractDocumentLeadingH1(data)
}
if spaceFromCli != "" && meta.Space == "" {
meta.Space = spaceFromCli
}
}
if meta == nil {