mirror of
https://github.com/gohugoio/hugo.git
synced 2025-03-19 10:31:20 +00:00
tpl: Do not write to cache when ignoring cache
Fixes #2067 Closes #2069
This commit is contained in:
parent
5d50c46482
commit
24cb0d1f58
5 changed files with 10 additions and 8 deletions
|
@ -222,7 +222,7 @@ func initHugoBuildCommonFlags(cmd *cobra.Command) {
|
||||||
cmd.Flags().StringVarP(&contentDir, "contentDir", "c", "", "filesystem path to content directory")
|
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(&layoutDir, "layoutDir", "l", "", "filesystem path to layout directory")
|
||||||
cmd.Flags().StringVarP(&cacheDir, "cacheDir", "", "", "filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/")
|
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(&destination, "destination", "d", "", "filesystem path to write files to")
|
||||||
cmd.Flags().StringVarP(&theme, "theme", "t", "", "theme to use (located in /themes/THEMENAME/)")
|
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/")
|
cmd.Flags().BoolVar(&uglyURLs, "uglyURLs", false, "if true, use /filename.html instead of /filename/")
|
||||||
|
|
|
@ -103,9 +103,8 @@ temporary directory.
|
||||||
With the command-line flag `--cacheDir`, you can specify any folder on
|
With the command-line flag `--cacheDir`, you can specify any folder on
|
||||||
your system as a caching directory.
|
your system as a caching directory.
|
||||||
|
|
||||||
If you don't like caching at all, you can fully disable to read from the
|
If you don't like caching at all, you can fully disable caching with the
|
||||||
cache with the command line flag `--ignoreCache`. However, Hugo will always
|
command line flag `--ignoreCache`.
|
||||||
write, on each build of the site, to the cache folder (silent backup).
|
|
||||||
|
|
||||||
### Authentication when using REST URLs
|
### Authentication when using REST URLs
|
||||||
|
|
||||||
|
|
|
@ -48,7 +48,7 @@ Flags:
|
||||||
--disableSitemap=false: Do not build Sitemap file
|
--disableSitemap=false: Do not build Sitemap file
|
||||||
--editor="": edit new content with this editor, if provided
|
--editor="": edit new content with this editor, if provided
|
||||||
-h, --help=false: help for hugo
|
-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
|
--log=false: Enable Logging
|
||||||
--logFile="": Log File path (if set, logging enabled automatically)
|
--logFile="": Log File path (if set, logging enabled automatically)
|
||||||
--noTimes=false: Don't sync modification time of files
|
--noTimes=false: Don't sync modification time of files
|
||||||
|
|
|
@ -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
|
// 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)
|
fID := getCacheFileID(id)
|
||||||
f, err := fs.Create(fID)
|
f, err := fs.Create(fID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -147,7 +150,7 @@ func resGetRemote(url string, fs afero.Fs, hc *http.Client) ([]byte, error) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
err = resWriteCache(url, c, fs)
|
err = resWriteCache(url, c, fs, viper.GetBool("IgnoreCache"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -58,7 +58,7 @@ func TestScpCache(t *testing.T) {
|
||||||
t.Errorf("There is content where there should not be anything: %s", string(c))
|
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 {
|
if err != nil {
|
||||||
t.Errorf("Error writing cache: %s", err)
|
t.Errorf("Error writing cache: %s", err)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue