commands: Fix build logic when listing expired/future draft content

Fixes #10972
This commit is contained in:
Bjørn Erik Pedersen 2023-05-21 10:16:25 +02:00
parent 2637b4ef4d
commit e6dc8053bf
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
2 changed files with 30 additions and 3 deletions

View file

@ -73,7 +73,11 @@ func newListCommand() *listCommand {
p.PublishDate().Format(time.RFC3339)} p.PublishDate().Format(time.RFC3339)}
} }
return list(cd, r, createRecord, "buildDrafts", true) return list(cd, r, createRecord,
"buildDrafts", true,
"buildFuture", true,
"buildExpired", true,
)
}, },
}, },
&simpleCommand{ &simpleCommand{
@ -91,7 +95,10 @@ func newListCommand() *listCommand {
} }
} }
return list(cd, r, createRecord, "buildFuture", true) return list(cd, r, createRecord,
"buildFuture", true,
"buildDrafts", true,
)
}, },
}, },
&simpleCommand{ &simpleCommand{
@ -109,7 +116,10 @@ func newListCommand() *listCommand {
} }
} }
return list(cd, r, createRecord, "buildExpired", true) return list(cd, r, createRecord,
"buildExpired", true,
"buildDrafts", true,
)
}, },
}, },
&simpleCommand{ &simpleCommand{

View file

@ -3,17 +3,23 @@
hugo list drafts hugo list drafts
! stderr . ! stderr .
stdout 'draft.md,2019-01-01T00:00:00Z' stdout 'draft.md,2019-01-01T00:00:00Z'
stdout 'draftexpired.md,2018-01-01T00:00:00Z'
stdout 'draftfuture.md,2030-01-01T00:00:00Z'
hugo list future hugo list future
stdout 'future.md,2030-01-01T00:00:00Z' stdout 'future.md,2030-01-01T00:00:00Z'
stdout 'draftfuture.md,2030-01-01T00:00:00Z'
hugo list expired hugo list expired
stdout 'expired.md,2018-01-01T00:00:00Z' stdout 'expired.md,2018-01-01T00:00:00Z'
stdout 'draftexpired.md,2018-01-01T00:00:00Z'
hugo list all hugo list all
stdout 'future.md,2030-01-01T00:00:00Z' stdout 'future.md,2030-01-01T00:00:00Z'
stdout 'draft.md,2019-01-01T00:00:00Z' stdout 'draft.md,2019-01-01T00:00:00Z'
stdout 'expired.md,2018-01-01T00:00:00Z' stdout 'expired.md,2018-01-01T00:00:00Z'
stdout 'draftexpired.md,2018-01-01T00:00:00Z'
stdout 'draftfuture.md,2030-01-01T00:00:00Z'
-- hugo.toml -- -- hugo.toml --
baseURL = "https://example.org/" baseURL = "https://example.org/"
@ -32,3 +38,14 @@ expiryDate: 2019-01-01
--- ---
date: 2030-01-01 date: 2030-01-01
--- ---
-- content/draftfuture.md --
---
date: 2030-01-01
draft: true
---
-- content/draftexpired.md --
---
date: 2018-01-01
expiryDate: 2019-01-01
draft: true
---