Skip to content

Commit

Permalink
Allow Title via h1 without any other metadata (#229)
Browse files Browse the repository at this point in the history
  • Loading branch information
mrueg authored Jan 3, 2023
1 parent ef71aa1 commit 55b58bd
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 10 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -503,10 +503,10 @@ mark -h | --help
- `-c <path>` or `--config <path>` — Specify a path to the configuration file.
- `-k` — Lock page editing to current user only to prevent accidental
manual edits over Confluence Web UI.
- `--space <space>` - Use specified space key. If not specified space ley must be set in a page metadata.
- `--space <space>` - Use specified space key. If the space key is not specified, it must be set in the page metadata.
- `--drop-h1` – Don't include H1 headings in Confluence output.
This option corresponds to the `h1_drop` setting in the configuration file.
- `--title-from-h1` - Extract page title from a leading H1 heading. If no H1 heading on a page then title must be set in a page metadata.
- `--title-from-h1` - Extract page title from a leading H1 heading. If no H1 heading on a page exists, then title must be set in the page metadata.
This option corresponds to the `h1_title` setting in the configuration file.
- `--dry-run` — Show resulting HTML and don't update Confluence page content.
- `--minor-edit` — Don't send notifications while updating Confluence page.
Expand Down
21 changes: 13 additions & 8 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ Options:
Supports file globbing patterns (needs to be quoted).
-k Lock page editing to current user only to prevent accidental
manual edits over Confluence Web UI.
--space <space> Use specified space key. If not specified space ley must
be set in a page metadata.
--space <space> Use specified space key. If the space key is not specified, it must
be set in the page metadata.
--drop-h1 Don't include H1 headings in Confluence output.
--title-from-h1 Extract page title from a leading H1 heading. If no H1 heading
on a page then title must be set in a page metadata.
on a page exists, then title must be set in the page metadata.
--dry-run Resolve page and ancestry, show resulting HTML and exit.
--compile-only Show resulting HTML and don't update Confluence page content.
--minor-edit Don't send notifications while updating Confluence page.
Expand Down Expand Up @@ -197,11 +197,16 @@ func processFile(
}

if pageID == "" && meta == nil {
log.Fatal(
`specified file doesn't contain metadata ` +
`and URL is not specified via command line ` +
`or doesn't contain pageId GET-parameter`,
)
if flags.TitleFromH1 && flags.Space != "" {
meta = &mark.Meta{}
meta.Type = "page"
} else {
log.Fatal(
`specified file doesn't contain metadata ` +
`and URL is not specified via command line ` +
`or doesn't contain pageId GET-parameter`,
)
}
}

switch {
Expand Down

0 comments on commit 55b58bd

Please sign in to comment.