Support an "expiration" date #726 #2137

g3wanghc · 2016-05-10T19:12:50Z

First time using goLang and first time contribution. Please be gentle. :V

CLAassistant · 2016-05-10T19:12:51Z

All committers have signed the CLA.

bep · 2016-05-10T19:22:42Z

hugolib/site_test.go

@@ -296,6 +296,42 @@ func TestDraftAndFutureRender(t *testing.T) {
 	viper.Set("BuildFuture", false)
 }

+func FutureExpirationRender(t *testing.T) {


I'm pretty sure it has to be named Test* something for it to run.

g3wanghc · 2016-05-10T19:36:08Z

@bep What's a good way to make make check more verbose? I'm having trouble finding my formatting errors. 😢

bep · 2016-05-10T19:41:25Z

hugolib/page.go

@@ -467,7 +468,8 @@ func (p *Page) LinkTitle() string {
 }

 func (p *Page) ShouldBuild() bool {


This method has gotten complex enough to deserve a refactor.

I would pull out a function (as in not a method) with:

buildFuture

buildExpired

buildDrafts

publishDate

expiryDate

I.e. no dependency on Page nor Viper, then create a table driven test for that function.

@bep Is what I'm doing correct or does it need more work? 😁

bep · 2016-05-10T19:46:38Z

As to make and gofmt, the best is to actually do gfmting your code. But remember that make uses

gofmt -s (s = simplifies)

so gofmt -s -w thefile.go

bep · 2016-05-10T20:37:11Z

hugolib/site_test.go

+
+	if len(s.Pages) < 1 {
+		t.Fatal("Valid content expired unexpectedly")
+	}


These two assertions looks a little bit funky. What you want to know is that len(Pages) == 1 and s.Pages[0].title = "doc2"

Hahaha yeah my bad, I will fix that.

g3wanghc · 2016-05-11T17:05:21Z

I had to fix my commit messages hehehe. :V

bep · 2016-05-19T16:04:58Z

As to why this hasn't been merged. This looks perfectly fine, very good, and will be merged eventually. I have announced a kind-of freeze period before the 0.16 release, but that seems to drag out.

moorereason · 2016-05-19T17:22:03Z

hugolib/page.go

+	return true
+}
+
+func IsExpiredPage(expiryDate time.Time) bool {


The IsExpiredPage and IsFuturePage functions have nothing to do with pages, really. They just compare times to time.Now(). They should probably be named something like IsExpiredTime and IsFutureTime.

g3wanghc · 2016-05-19T19:02:48Z

@moorereason 👌

moorereason · 2016-05-19T20:19:29Z

hugolib/page.go

+	if !(buildDrafts || !Draft) {
+		return false
+	}
+	if !buildFuture {


Collapse these if-sets down one more level:

if !buildFuture && !publishDate.IsZero() && publishDate.After(time.Now()) {

bep · 2016-06-09T13:51:10Z

This looks good. I took it for a spin, and the vital parts looks fine, but the list expired lists all of my pages -- I have only one with expiredDate.

g3wanghc · 2016-06-10T15:00:06Z

Oops, will fix it. :P

g3wanghc · 2016-06-13T17:45:45Z

@bep Fixed the list, and a typo.

I've noticed something weird in replacePage on site.go.

func (s *Site) replacePage(page *Page) {
    // will find existing page that matches filepath and remove it
    s.removePage(page)
    s.addPage(page)
}

If the original page wasn't built, then it wouldn't be part of site.Pages.

If you've modified an unpublishedPage, replacePage will be called but removePage wouldn't do anything since it can't find it in site.Pages. addPage will be called and futureCount is increased by 1.

If you added a future publishDate to an existing Page in site.Pages, then removePage will decrease futureCount by -1, and addPage will increate futureCount by 1, resulting in a net gain of 0.

Therefore, Site stats after replacePage is called will always be wrong.

Should we just keep track a list of Pages on Site that aren't being built?

bep · 2016-06-13T18:11:10Z

@g3wanghc create a separate issue for the stats counters.

g3wanghc · 2016-06-13T18:16:30Z

@bep Done. #2211

bep · 2016-06-14T13:54:51Z

Merged, solid work, thanks.

g3wanghc · 2016-06-14T14:07:32Z

Awesome!

github-actions · 2022-02-22T01:51:51Z

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

bep reviewed May 10, 2016
View reviewed changes

Hanchen Wang added 5 commits May 11, 2016 10:04

hugolib: Support an expiration date

267b5a2

hugelib: Add expiredCount as a Site variable

804a72b

hugolib: Add sort ByExpiryDate function

be4da7b

hugolib: Add GroupByExpireDate function

46c0898

commands: Add buildExpired flag

0af4045

moorereason reviewed May 19, 2016
View reviewed changes

Hanchen Wang added 7 commits May 29, 2016 11:23

commands: Add listExpiredCmd for expired pages

b6eecca

docs: Add expirydate to front-matter doc

c465fca

docs: Add instructions on buildExpired in build configurations

5c916de

docs: Example of how to use Order by ExpiryDate

96b7bb0

docs: Add ExpiryDate to the list of variables

add7082

hugolib: Refactor page.ShouldBuild and table driven test

d4b3962

hugolib: Bug fix futureStats

90f16ba

hugolib: Add expiredStats to build feedback

d1414a5

Hanchen Wang added 2 commits June 13, 2016 11:37

hugolib: Handle unpecified date for IsFuture and IsExpired

bfc61ea

hugolib: futureStats plural

a53615f

bep closed this Jun 14, 2016

github-actions bot locked as resolved and limited conversation to collaborators Feb 22, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support an "expiration" date #726 #2137

Support an "expiration" date #726 #2137

g3wanghc commented May 10, 2016

CLAassistant commented May 10, 2016 •

edited

Loading

bep May 10, 2016

g3wanghc commented May 10, 2016 •

edited

Loading

bep May 10, 2016 •

edited

Loading

g3wanghc May 12, 2016

bep commented May 10, 2016 •

edited

Loading

bep May 10, 2016

g3wanghc May 10, 2016

g3wanghc commented May 11, 2016

bep commented May 19, 2016

moorereason May 19, 2016

g3wanghc commented May 19, 2016

moorereason May 19, 2016

bep commented Jun 9, 2016

g3wanghc commented Jun 10, 2016

g3wanghc commented Jun 13, 2016

bep commented Jun 13, 2016

g3wanghc commented Jun 13, 2016

bep commented Jun 14, 2016

g3wanghc commented Jun 14, 2016

github-actions bot commented Feb 22, 2022

		@@ -467,7 +468,8 @@ func (p *Page) LinkTitle() string {
		}

		func (p *Page) ShouldBuild() bool {

Support an "expiration" date #726 #2137

Support an "expiration" date #726 #2137

Conversation

g3wanghc commented May 10, 2016

CLAassistant commented May 10, 2016 • edited Loading

bep May 10, 2016

Choose a reason for hiding this comment

g3wanghc commented May 10, 2016 • edited Loading

bep May 10, 2016 • edited Loading

Choose a reason for hiding this comment

g3wanghc May 12, 2016

Choose a reason for hiding this comment

bep commented May 10, 2016 • edited Loading

bep May 10, 2016

Choose a reason for hiding this comment

g3wanghc May 10, 2016

Choose a reason for hiding this comment

g3wanghc commented May 11, 2016

bep commented May 19, 2016

moorereason May 19, 2016

Choose a reason for hiding this comment

g3wanghc commented May 19, 2016

moorereason May 19, 2016

Choose a reason for hiding this comment

bep commented Jun 9, 2016

g3wanghc commented Jun 10, 2016

g3wanghc commented Jun 13, 2016

bep commented Jun 13, 2016

g3wanghc commented Jun 13, 2016

bep commented Jun 14, 2016

g3wanghc commented Jun 14, 2016

github-actions bot commented Feb 22, 2022

CLAassistant commented May 10, 2016 •

edited

Loading

g3wanghc commented May 10, 2016 •

edited

Loading

bep May 10, 2016 •

edited

Loading

bep commented May 10, 2016 •

edited

Loading