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

This reverts commit 5ef8a9f32c25a9b4cc821393c58733e57a7ad234.

diff --git a/commands/commandeer.go b/commands/commandeer.go
index 6f74bf8640db4c602f2ca594150492aa6bebb26b..ced149e7a6e23c688d948f958110221093b1d030 100644 (file)
--- 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
index 23301d004f65f30a690c0c7c8134e4275d737262..da1918edefdb70ad4b986389e9edb79b8915ac2d 100644 (file)
--- 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\".")