2015-12-07 13:57:01 -05:00
|
|
|
// Copyright 2015 The Hugo Authors. All rights reserved.
|
2015-03-15 18:32:41 -04:00
|
|
|
//
|
2015-11-23 22:16:36 -05:00
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
2015-03-15 18:32:41 -04:00
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
// You may obtain a copy of the License at
|
2015-11-23 22:16:36 -05:00
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
2015-03-15 18:32:41 -04:00
|
|
|
//
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
// limitations under the License.
|
2016-03-24 18:34:12 -04:00
|
|
|
|
2015-03-15 18:32:41 -04:00
|
|
|
package commands
|
|
|
|
|
|
|
|
import (
|
|
|
|
"bytes"
|
2016-11-18 16:54:57 -05:00
|
|
|
"errors"
|
2015-03-15 18:32:41 -04:00
|
|
|
"os"
|
|
|
|
"time"
|
|
|
|
|
2017-06-13 12:42:45 -04:00
|
|
|
"github.com/gohugoio/hugo/parser"
|
2017-06-13 13:07:35 -04:00
|
|
|
"github.com/spf13/cobra"
|
2015-03-15 18:32:41 -04:00
|
|
|
)
|
|
|
|
|
|
|
|
var undraftCmd = &cobra.Command{
|
|
|
|
Use: "undraft path/to/content",
|
2017-03-14 12:46:33 -04:00
|
|
|
Short: "Undraft resets the content's draft status",
|
|
|
|
Long: `Undraft resets the content's draft status
|
2015-08-07 14:09:40 -04:00
|
|
|
and updates the date to the current date and time.
|
2015-08-04 05:15:12 -04:00
|
|
|
If the content's draft status is 'False', nothing is done.`,
|
2015-12-02 05:42:53 -05:00
|
|
|
RunE: Undraft,
|
2015-03-15 18:32:41 -04:00
|
|
|
}
|
|
|
|
|
2016-03-24 18:34:12 -04:00
|
|
|
// Undraft publishes the specified content by setting its draft status
|
2015-03-15 18:32:41 -04:00
|
|
|
// to false and setting its publish date to now. If the specified content is
|
|
|
|
// not a draft, it will log an error.
|
2015-12-02 05:42:53 -05:00
|
|
|
func Undraft(cmd *cobra.Command, args []string) error {
|
:sparkles: Implement Page bundling and image handling
This commit is not the smallest in Hugo's history.
Some hightlights include:
* Page bundles (for complete articles, keeping images and content together etc.).
* Bundled images can be processed in as many versions/sizes as you need with the three methods `Resize`, `Fill` and `Fit`.
* Processed images are cached inside `resources/_gen/images` (default) in your project.
* Symbolic links (both files and dirs) are now allowed anywhere inside /content
* A new table based build summary
* The "Total in nn ms" now reports the total including the handling of the files inside /static. So if it now reports more than you're used to, it is just **more real** and probably faster than before (see below).
A site building benchmark run compared to `v0.31.1` shows that this should be slightly faster and use less memory:
```bash
▶ ./benchSite.sh "TOML,num_langs=.*,num_root_sections=5,num_pages=(500|1000),tags_per_page=5,shortcodes,render"
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 101785785 78067944 -23.30%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 185481057 149159919 -19.58%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 103149918 85679409 -16.94%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 203515478 169208775 -16.86%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 532464 391539 -26.47%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1056549 772702 -26.87%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 555974 406630 -26.86%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1086545 789922 -27.30%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 53243246 43598155 -18.12%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 105811617 86087116 -18.64%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 54558852 44545097 -18.35%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 106903858 86978413 -18.64%
```
Fixes #3651
Closes #3158
Fixes #1014
Closes #2021
Fixes #1240
Updates #3757
2017-07-24 03:00:23 -04:00
|
|
|
c, err := InitializeConfig(false, nil)
|
2017-01-10 04:55:03 -05:00
|
|
|
|
|
|
|
if err != nil {
|
2015-12-02 05:42:53 -05:00
|
|
|
return err
|
|
|
|
}
|
2015-03-15 18:32:41 -04:00
|
|
|
|
|
|
|
if len(args) < 1 {
|
2015-12-02 05:42:53 -05:00
|
|
|
return newUserError("a piece of content needs to be specified")
|
2015-03-15 18:32:41 -04:00
|
|
|
}
|
|
|
|
|
:sparkles: Implement Page bundling and image handling
This commit is not the smallest in Hugo's history.
Some hightlights include:
* Page bundles (for complete articles, keeping images and content together etc.).
* Bundled images can be processed in as many versions/sizes as you need with the three methods `Resize`, `Fill` and `Fit`.
* Processed images are cached inside `resources/_gen/images` (default) in your project.
* Symbolic links (both files and dirs) are now allowed anywhere inside /content
* A new table based build summary
* The "Total in nn ms" now reports the total including the handling of the files inside /static. So if it now reports more than you're used to, it is just **more real** and probably faster than before (see below).
A site building benchmark run compared to `v0.31.1` shows that this should be slightly faster and use less memory:
```bash
▶ ./benchSite.sh "TOML,num_langs=.*,num_root_sections=5,num_pages=(500|1000),tags_per_page=5,shortcodes,render"
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 101785785 78067944 -23.30%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 185481057 149159919 -19.58%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 103149918 85679409 -16.94%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 203515478 169208775 -16.86%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 532464 391539 -26.47%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1056549 772702 -26.87%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 555974 406630 -26.86%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1086545 789922 -27.30%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 53243246 43598155 -18.12%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 105811617 86087116 -18.64%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 54558852 44545097 -18.35%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 106903858 86978413 -18.64%
```
Fixes #3651
Closes #3158
Fixes #1014
Closes #2021
Fixes #1240
Updates #3757
2017-07-24 03:00:23 -04:00
|
|
|
cfg := c.DepsCfg
|
|
|
|
|
2015-03-15 18:32:41 -04:00
|
|
|
location := args[0]
|
|
|
|
// open the file
|
2017-01-10 04:55:03 -05:00
|
|
|
f, err := cfg.Fs.Source.Open(location)
|
2015-03-15 18:32:41 -04:00
|
|
|
if err != nil {
|
2015-12-02 05:42:53 -05:00
|
|
|
return err
|
2015-03-15 18:32:41 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// get the page from file
|
|
|
|
p, err := parser.ReadFrom(f)
|
|
|
|
f.Close()
|
|
|
|
if err != nil {
|
2015-12-02 05:42:53 -05:00
|
|
|
return err
|
2015-03-15 18:32:41 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
w, err := undraftContent(p)
|
|
|
|
if err != nil {
|
2015-12-02 17:37:40 -05:00
|
|
|
return newSystemErrorF("an error occurred while undrafting %q: %s", location, err)
|
2015-03-15 18:32:41 -04:00
|
|
|
}
|
|
|
|
|
2017-01-10 04:55:03 -05:00
|
|
|
f, err = cfg.Fs.Source.OpenFile(location, os.O_WRONLY|os.O_TRUNC, 0644)
|
2015-03-15 18:32:41 -04:00
|
|
|
if err != nil {
|
2015-12-02 17:37:40 -05:00
|
|
|
return newSystemErrorF("%q not be undrafted due to error opening file to save changes: %q\n", location, err)
|
2015-03-15 18:32:41 -04:00
|
|
|
}
|
|
|
|
defer f.Close()
|
|
|
|
_, err = w.WriteTo(f)
|
|
|
|
if err != nil {
|
2015-12-02 17:37:40 -05:00
|
|
|
return newSystemErrorF("%q not be undrafted due to save error: %q\n", location, err)
|
2015-03-15 18:32:41 -04:00
|
|
|
}
|
2015-12-02 05:42:53 -05:00
|
|
|
return nil
|
2015-03-15 18:32:41 -04:00
|
|
|
}
|
|
|
|
|
2015-11-16 09:15:17 -05:00
|
|
|
// undraftContent: if the content is a draft, change its draft status to
|
2015-03-15 18:32:41 -04:00
|
|
|
// 'false' and set the date to time.Now(). If the draft status is already
|
|
|
|
// 'false', don't do anything.
|
|
|
|
func undraftContent(p parser.Page) (bytes.Buffer, error) {
|
|
|
|
var buff bytes.Buffer
|
|
|
|
// get the metadata; easiest way to see if it's a draft
|
|
|
|
meta, err := p.Metadata()
|
|
|
|
if err != nil {
|
|
|
|
return buff, err
|
|
|
|
}
|
|
|
|
// since the metadata was obtainable, we can also get the key/value separator for
|
|
|
|
// Front Matter
|
|
|
|
fm := p.FrontMatter()
|
|
|
|
if fm == nil {
|
2016-11-18 16:54:57 -05:00
|
|
|
return buff, errors.New("Front Matter was found, nothing was finalized")
|
2015-03-15 18:32:41 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
var isDraft, gotDate bool
|
|
|
|
var date string
|
|
|
|
L:
|
|
|
|
for k, v := range meta.(map[string]interface{}) {
|
|
|
|
switch k {
|
|
|
|
case "draft":
|
|
|
|
if !v.(bool) {
|
2016-11-18 16:54:57 -05:00
|
|
|
return buff, errors.New("not a Draft: nothing was done")
|
2015-03-15 18:32:41 -04:00
|
|
|
}
|
|
|
|
isDraft = true
|
|
|
|
if gotDate {
|
|
|
|
break L
|
|
|
|
}
|
|
|
|
case "date":
|
|
|
|
date = v.(string) // capture the value to make replacement easier
|
|
|
|
gotDate = true
|
|
|
|
if isDraft {
|
|
|
|
break L
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// if draft wasn't found in FrontMatter, it isn't a draft.
|
|
|
|
if !isDraft {
|
2016-11-18 16:54:57 -05:00
|
|
|
return buff, errors.New("not a Draft: nothing was done")
|
2015-03-15 18:32:41 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// get the front matter as bytes and split it into lines
|
|
|
|
var lineEnding []byte
|
2016-03-23 09:51:16 -04:00
|
|
|
fmLines := bytes.Split(fm, []byte("\n"))
|
2015-03-15 18:32:41 -04:00
|
|
|
if len(fmLines) == 1 { // if the result is only 1 element, try to split on dos line endings
|
2016-03-23 09:51:16 -04:00
|
|
|
fmLines = bytes.Split(fm, []byte("\r\n"))
|
2015-03-15 18:32:41 -04:00
|
|
|
if len(fmLines) == 1 {
|
2016-11-18 16:54:57 -05:00
|
|
|
return buff, errors.New("unable to split FrontMatter into lines")
|
2015-03-15 18:32:41 -04:00
|
|
|
}
|
2016-03-23 09:51:16 -04:00
|
|
|
lineEnding = append(lineEnding, []byte("\r\n")...)
|
2015-03-15 18:32:41 -04:00
|
|
|
} else {
|
2016-03-23 09:51:16 -04:00
|
|
|
lineEnding = append(lineEnding, []byte("\n")...)
|
2015-03-15 18:32:41 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// Write the front matter lines to the buffer, replacing as necessary
|
|
|
|
for _, v := range fmLines {
|
|
|
|
pos := bytes.Index(v, []byte("draft"))
|
|
|
|
if pos != -1 {
|
2017-03-14 12:46:33 -04:00
|
|
|
continue
|
2015-03-15 18:32:41 -04:00
|
|
|
}
|
|
|
|
pos = bytes.Index(v, []byte("date"))
|
|
|
|
if pos != -1 { // if date field wasn't found, add it
|
|
|
|
v = bytes.Replace(v, []byte(date), []byte(time.Now().Format(time.RFC3339)), 1)
|
|
|
|
}
|
|
|
|
buff.Write(v)
|
|
|
|
buff.Write(lineEnding)
|
|
|
|
}
|
|
|
|
|
|
|
|
// append the actual content
|
2016-08-30 13:22:26 -04:00
|
|
|
buff.Write(p.Content())
|
2015-03-15 18:32:41 -04:00
|
|
|
|
|
|
|
return buff, nil
|
|
|
|
}
|