diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2017-07-24 09:00:23 +0200 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2017-12-27 18:44:47 +0100 |
commit | 3cdf19e9b7e46c57a9bb43ff02199177feb55768 (patch) | |
tree | d05e3dc15824c8eeef3e5455193d2d6328621f47 /commands/server.go | |
parent | 02f2735f68e1bb2e2c412698755d52c4d396f237 (diff) |
: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
Diffstat (limited to 'commands/server.go')
-rw-r--r-- | commands/server.go | 151 |
1 files changed, 70 insertions, 81 deletions
diff --git a/commands/server.go b/commands/server.go index e1cc56749..21137619d 100644 --- a/commands/server.go +++ b/commands/server.go @@ -110,109 +110,94 @@ func init() { } func server(cmd *cobra.Command, args []string) error { - cfg, err := InitializeConfig(serverCmd) - if err != nil { - return err - } - - c, err := newCommandeer(cfg) - if err != nil { - return err - } - - if cmd.Flags().Changed("disableLiveReload") { - c.Set("disableLiveReload", disableLiveReload) - } - - if cmd.Flags().Changed("navigateToChanged") { - c.Set("navigateToChanged", navigateToChanged) + // If a Destination is provided via flag write to disk + if destination != "" { + renderToDisk = true } - if cmd.Flags().Changed("disableFastRender") { - c.Set("disableFastRender", disableFastRender) - } + cfgInit := func(c *commandeer) error { + c.Set("renderToMemory", !renderToDisk) + if cmd.Flags().Changed("navigateToChanged") { + c.Set("navigateToChanged", navigateToChanged) + } + if cmd.Flags().Changed("disableLiveReload") { + c.Set("disableLiveReload", disableLiveReload) + } + if cmd.Flags().Changed("disableFastRender") { + c.Set("disableFastRender", disableFastRender) + } + if serverWatch { + c.Set("watch", true) + } - if serverWatch { - c.Set("watch", true) - } + serverPorts := make([]int, 1) - if c.Cfg.GetBool("watch") { - serverWatch = true - c.watchConfig() - } + if c.languages.IsMultihost() { + if !serverAppend { + return newSystemError("--appendPort=false not supported when in multihost mode") + } + serverPorts = make([]int, len(c.languages)) + } - languages := c.languages() - serverPorts := make([]int, 1) + currentServerPort := serverPort + + for i := 0; i < len(serverPorts); i++ { + l, err := net.Listen("tcp", net.JoinHostPort(serverInterface, strconv.Itoa(currentServerPort))) + if err == nil { + l.Close() + serverPorts[i] = currentServerPort + } else { + if i == 0 && serverCmd.Flags().Changed("port") { + // port set explicitly by user -- he/she probably meant it! + return newSystemErrorF("Server startup failed: %s", err) + } + jww.ERROR.Println("port", serverPort, "already in use, attempting to use an available port") + sp, err := helpers.FindAvailablePort() + if err != nil { + return newSystemError("Unable to find alternative port to use:", err) + } + serverPorts[i] = sp.Port + } - if languages.IsMultihost() { - if !serverAppend { - return newSystemError("--appendPort=false not supported when in multihost mode") + currentServerPort = serverPorts[i] + 1 } - serverPorts = make([]int, len(languages)) - } - currentServerPort := serverPort + c.serverPorts = serverPorts - for i := 0; i < len(serverPorts); i++ { - l, err := net.Listen("tcp", net.JoinHostPort(serverInterface, strconv.Itoa(currentServerPort))) - if err == nil { - l.Close() - serverPorts[i] = currentServerPort + c.Set("port", serverPort) + if liveReloadPort != -1 { + c.Set("liveReloadPort", liveReloadPort) } else { - if i == 0 && serverCmd.Flags().Changed("port") { - // port set explicitly by user -- he/she probably meant it! - return newSystemErrorF("Server startup failed: %s", err) - } - jww.ERROR.Println("port", serverPort, "already in use, attempting to use an available port") - sp, err := helpers.FindAvailablePort() - if err != nil { - return newSystemError("Unable to find alternative port to use:", err) - } - serverPorts[i] = sp.Port + c.Set("liveReloadPort", serverPorts[0]) } - currentServerPort = serverPorts[i] + 1 - } - - c.serverPorts = serverPorts - - c.Set("port", serverPort) - if liveReloadPort != -1 { - c.Set("liveReloadPort", liveReloadPort) - } else { - c.Set("liveReloadPort", serverPorts[0]) - } - - if languages.IsMultihost() { - for i, language := range languages { - baseURL, err = fixURL(language, baseURL, serverPorts[i]) + if c.languages.IsMultihost() { + for i, language := range c.languages { + baseURL, err := fixURL(language, baseURL, serverPorts[i]) + if err != nil { + return err + } + language.Set("baseURL", baseURL) + } + } else { + baseURL, err := fixURL(c.Cfg, baseURL, serverPorts[0]) if err != nil { return err } - language.Set("baseURL", baseURL) - } - } else { - baseURL, err = fixURL(c.Cfg, baseURL, serverPorts[0]) - if err != nil { - return err + c.Set("baseURL", baseURL) } - c.Set("baseURL", baseURL) + + return nil + } if err := memStats(); err != nil { jww.ERROR.Println("memstats error:", err) } - // If a Destination is provided via flag write to disk - if destination != "" { - renderToDisk = true - } - - // Hugo writes the output to memory instead of the disk - if !renderToDisk { - cfg.Fs.Destination = new(afero.MemMapFs) - // Rendering to memoryFS, publish to Root regardless of publishDir. - c.Set("publishDir", "/") + c, err := InitializeConfig(true, cfgInit, serverCmd) + if err != nil { + return err } if err := c.build(serverWatch); err != nil { @@ -223,6 +208,10 @@ func server(cmd *cobra.Command, args []string) error { s.RegisterMediaTypes() } + if serverWatch { + c.watchConfig() + } + // Watch runs its own server as part of the routine if serverWatch { |