hugo

commit b08193971a821fc27e549a73120c15e5e5186775
parent 0a56f2af4e1969e76e94fdfb56d1bbed0e685625
Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date:   Mon, 14 Mar 2022 16:02:06 +0100

Revert "Revert "Some minor adjustments to the new static filesystem logic""

This reverts commit 5ef8a9f32c25a9b4cc821393c58733e57a7ad234.

Diffstat:
M
commands/commandeer.go
 | 
3
++-
M
commands/server.go
 | 
4
++--

2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/commands/commandeer.go b/commands/commandeer.go
@@ -419,8 +419,9 @@ func (c *commandeer) loadConfig() error {
 		}
 
 		if c.Cfg.GetBool("logPathWarnings") {
+			// Note that we only care about the "dynamic creates" here,
+			// so skip the static fs.
 			fs.Destination = hugofs.NewCreateCountingFs(fs.Destination)
-			fs.DestinationStatic = hugofs.NewCreateCountingFs(fs.DestinationStatic)
 		}
 
 		// To debug hard-to-find path issues.
diff --git a/commands/server.go b/commands/server.go
@@ -107,10 +107,10 @@ of a second, you will be able to save and see your changes nearly instantly.`,
 	cc.cmd.Flags().BoolVarP(&cc.serverAppend, "appendPort", "", true, "append port to baseURL")
 	cc.cmd.Flags().BoolVar(&cc.disableLiveReload, "disableLiveReload", false, "watch without enabling live browser reload on rebuild")
 	cc.cmd.Flags().BoolVar(&cc.navigateToChanged, "navigateToChanged", false, "navigate to changed content file on live browser reload")
-	cc.cmd.Flags().BoolVar(&cc.renderToDisk, "renderToDisk", false, "render to Destination path (default is render to memory & serve from there)")
+	cc.cmd.Flags().BoolVar(&cc.renderToDisk, "renderToDisk", false, "serve all files from disk (default is from memory)")
+	cc.cmd.Flags().BoolVar(&cc.renderStaticToDisk, "renderStaticToDisk", false, "serve static files from disk and dynamic files from memory")
 	cc.cmd.Flags().BoolVar(&cc.disableFastRender, "disableFastRender", false, "enables full re-renders on changes")
 	cc.cmd.Flags().BoolVar(&cc.disableBrowserError, "disableBrowserError", false, "do not show build errors in the browser")
-	cc.cmd.Flags().BoolVar(&cc.renderStaticToDisk, "renderStaticToDisk", false, "render static files to disk but dynamic files render to memory.")
 
 	cc.cmd.Flags().String("memstats", "", "log memory usage to this file")
 	cc.cmd.Flags().String("meminterval", "100ms", "interval to poll memory usage (requires --memstats), valid time units are \"ns\", \"us\" (or \"µs\"), \"ms\", \"s\", \"m\", \"h\".")