Skip to content

Commit

Permalink
🎁I Implement Page bundling and image handling
Browse files Browse the repository at this point in the history
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).

Fixes gohugoio#3651
Closes gohugoio#3158
Fixes gohugoio#1014
Closes gohugoio#2021
Fixes gohugoio#1240
Updates gohugoio#3757
  • Loading branch information
bep committed Dec 24, 2017
1 parent 02f2735 commit 04c1d0d
Show file tree
Hide file tree
Showing 81 changed files with 5,302 additions and 3,056 deletions.
119 changes: 102 additions & 17 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
revision = "v1.1.0"

[[constraint]]
branch = "master"
name = "github.com/dchest/cssmin"
name = "github.com/disintegration/imaging"
revision = "v1.2.4"

[[constraint]]
name = "github.com/magefile/mage"
Expand Down Expand Up @@ -116,6 +116,10 @@
name = "github.com/stretchr/testify"
version = "1.1.4"

[[constraint]]
branch = "master"
name = "github.com/olekukonko/tablewriter"

[[constraint]]
name = "github.com/yosssi/ace"
version = "0.0.5"
Expand Down
4 changes: 2 additions & 2 deletions commands/benchmark.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func benchmark(cmd *cobra.Command, args []string) error {
return err
}

c, err := newCommandeer(cfg)
c, err := newCommandeer(cfg, false)
if err != nil {
return err
}
Expand Down Expand Up @@ -84,7 +84,7 @@ func benchmark(cmd *cobra.Command, args []string) error {

t := time.Now()
for i := 0; i < benchmarkTimes; i++ {
if err = c.resetAndBuildSites(false); err != nil {
if err = c.resetAndBuildSites(); err != nil {
return err
}
}
Expand Down
21 changes: 15 additions & 6 deletions commands/commandeer.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,16 @@ import (
"github.com/gohugoio/hugo/deps"
"github.com/gohugoio/hugo/helpers"
"github.com/gohugoio/hugo/hugofs"
src "github.com/gohugoio/hugo/source"
)

type commandeer struct {
*deps.DepsCfg
pathSpec *helpers.PathSpec
visitedURLs *types.EvictingStringQueue

staticDirsConfig []*src.Dirs

serverPorts []int

configured bool
Expand All @@ -44,10 +47,6 @@ func (c *commandeer) PathSpec() *helpers.PathSpec {
return c.pathSpec
}

func (c *commandeer) languages() helpers.Languages {
return c.Cfg.Get("languagesSorted").(helpers.Languages)
}

func (c *commandeer) initFs(fs *hugofs.Fs) error {
c.DepsCfg.Fs = fs
ps, err := helpers.NewPathSpec(fs, c.Cfg)
Expand All @@ -58,7 +57,8 @@ func (c *commandeer) initFs(fs *hugofs.Fs) error {
return nil
}

func newCommandeer(cfg *deps.DepsCfg) (*commandeer, error) {
func newCommandeer(cfg *deps.DepsCfg, watching bool) (*commandeer, error) {
cfg.Watching = watching
l := cfg.Language
if l == nil {
l = helpers.NewDefaultLanguage(cfg.Cfg)
Expand All @@ -68,5 +68,14 @@ func newCommandeer(cfg *deps.DepsCfg) (*commandeer, error) {
return nil, err
}

return &commandeer{DepsCfg: cfg, pathSpec: ps, visitedURLs: types.NewEvictingStringQueue(10)}, nil
c := &commandeer{DepsCfg: cfg, pathSpec: ps, visitedURLs: types.NewEvictingStringQueue(10)}

dirsConfig, err := c.createStaticDirsConfig()
if err != nil {
return nil, err
}
c.staticDirsConfig = dirsConfig
c.configured = false

return c, nil
}
Loading

0 comments on commit 04c1d0d

Please sign in to comment.