Skip to content

Commit

Permalink
tpl: Do not write to cache when ignoring cache
Browse files Browse the repository at this point in the history
Fixes #2067
Closes #2069
  • Loading branch information
robertbasic authored and bep committed Apr 14, 2016
1 parent 5d50c46 commit 24cb0d1
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion commands/hugo.go
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ func initHugoBuildCommonFlags(cmd *cobra.Command) {
cmd.Flags().StringVarP(&contentDir, "contentDir", "c", "", "filesystem path to content directory")
cmd.Flags().StringVarP(&layoutDir, "layoutDir", "l", "", "filesystem path to layout directory")
cmd.Flags().StringVarP(&cacheDir, "cacheDir", "", "", "filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/")
cmd.Flags().BoolVarP(&ignoreCache, "ignoreCache", "", false, "Ignores the cache directory for reading but still writes to it")
cmd.Flags().BoolVarP(&ignoreCache, "ignoreCache", "", false, "Ignores the cache directory")
cmd.Flags().StringVarP(&destination, "destination", "d", "", "filesystem path to write files to")
cmd.Flags().StringVarP(&theme, "theme", "t", "", "theme to use (located in /themes/THEMENAME/)")
cmd.Flags().BoolVar(&uglyURLs, "uglyURLs", false, "if true, use /filename.html instead of /filename/")
Expand Down
5 changes: 2 additions & 3 deletions docs/content/extras/datadrivencontent.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,8 @@ temporary directory.
With the command-line flag `--cacheDir`, you can specify any folder on
your system as a caching directory.

If you don't like caching at all, you can fully disable to read from the
cache with the command line flag `--ignoreCache`. However, Hugo will always
write, on each build of the site, to the cache folder (silent backup).
If you don't like caching at all, you can fully disable caching with the
command line flag `--ignoreCache`.

### Authentication when using REST URLs

Expand Down
2 changes: 1 addition & 1 deletion docs/content/overview/usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Flags:
--disableSitemap=false: Do not build Sitemap file
--editor="": edit new content with this editor, if provided
-h, --help=false: help for hugo
--ignoreCache=false: Ignores the cache directory for reading but still writes to it
--ignoreCache=false: Ignores the cache directory
--log=false: Enable Logging
--logFile="": Log File path (if set, logging enabled automatically)
--noTimes=false: Don't sync modification time of files
Expand Down
7 changes: 5 additions & 2 deletions tpl/template_resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,10 @@ func resGetCache(id string, fs afero.Fs, ignoreCache bool) ([]byte, error) {
}

// resWriteCache writes bytes to an ID into the file cache
func resWriteCache(id string, c []byte, fs afero.Fs) error {
func resWriteCache(id string, c []byte, fs afero.Fs, ignoreCache bool) error {
if ignoreCache {
return nil
}
fID := getCacheFileID(id)
f, err := fs.Create(fID)
if err != nil {
Expand Down Expand Up @@ -147,7 +150,7 @@ func resGetRemote(url string, fs afero.Fs, hc *http.Client) ([]byte, error) {
if err != nil {
return nil, err
}
err = resWriteCache(url, c, fs)
err = resWriteCache(url, c, fs, viper.GetBool("IgnoreCache"))
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion tpl/template_resources_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func TestScpCache(t *testing.T) {
t.Errorf("There is content where there should not be anything: %s", string(c))
}

err = resWriteCache(test.path, test.content, fs)
err = resWriteCache(test.path, test.content, fs, test.ignore)
if err != nil {
t.Errorf("Error writing cache: %s", err)
}
Expand Down

0 comments on commit 24cb0d1

Please sign in to comment.