fix for nil metadata (issue #161) (#162)

This commit is contained in:
cc-chris 2022-04-22 14:48:59 +05:30 committed by GitHub
parent 9ae3e658d2
commit a6ac341799
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

34
main.go
View File

@ -178,6 +178,23 @@ func processFile(
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
if pageID != "" && meta != nil {
log.Warning(
`specified file contains metadata, ` +
`but it will be ignored due specified command line URL`,
)
meta = nil
}
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`,
)
}
switch { switch {
case meta.Space == "" && flags.Space == "": case meta.Space == "" && flags.Space == "":
@ -262,23 +279,6 @@ func processFile(
os.Exit(0) os.Exit(0)
} }
if pageID != "" && meta != nil {
log.Warning(
`specified file contains metadata, ` +
`but it will be ignored due specified command line URL`,
)
meta = nil
}
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`,
)
}
var target *confluence.PageInfo var target *confluence.PageInfo
if meta != nil { if meta != nil {