diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2016-03-22 02:28:42 +0300 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2016-03-31 22:24:18 +0300 |
| commit | 4f66f790b168005efb835b2499c4a502e492b747 (patch) | |
| tree | 2e5f808bf10ac18ff1735dd743aa63e5513737d5 /target | |
| parent | a89035bdaaa8bb1525a74d82e068ef80bfa28aed (diff) | |
Add readFile template func
This also includes a refactor of the hugofs package and its usage.
The motivation for that is:
The Afero filesystems are brilliant. Hugo's way of adding a dozen of global variables for the different filesystems was a mistake. In readFile (and also in some other places in Hugo today) we need a way to restrict the access inside the working dir. We could use ioutil.ReadFile and implement the path checking, checking the base path and the dots ("..") etc. But it is obviously better to use an Afero BasePathFs combined witha ReadOnlyFs. We could create a use-once-filesystem and handle the initialization ourselves, but since this is also useful to others and the initialization depends on some other global state (which would mean to create a new file system on every invocation), we might as well do it properly and encapsulate the predefined set of filesystems. This change also leads the way, if needed, to encapsulate the file systems in a struct, making it possible to have several file system sets in action at once (parallel multilanguage site building? With Moore's law and all...)
Fixes #1551
Diffstat (limited to 'target')
| -rw-r--r-- | target/file.go | 4 | ||||
| -rw-r--r-- | target/htmlredirect.go | 4 | ||||
| -rw-r--r-- | target/page.go | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/target/file.go b/target/file.go index 41fa00255..740741bba 100644 --- a/target/file.go +++ b/target/file.go @@ -1,4 +1,4 @@ -// Copyright 2015 The Hugo Authors. All rights reserved. +// Copyright 2016 The Hugo Authors. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -49,7 +49,7 @@ func (fs *Filesystem) Publish(path string, r io.Reader) (err error) { return } - return helpers.WriteToDisk(translated, r, hugofs.DestinationFS) + return helpers.WriteToDisk(translated, r, hugofs.Destination()) } func (fs *Filesystem) Translate(src string) (dest string, err error) { diff --git a/target/htmlredirect.go b/target/htmlredirect.go index b5b47a889..1e2abec40 100644 --- a/target/htmlredirect.go +++ b/target/htmlredirect.go @@ -1,4 +1,4 @@ -// Copyright 2015 The Hugo Authors. All rights reserved. +// Copyright 2016 The Hugo Authors. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -144,5 +144,5 @@ func (h *HTMLRedirectAlias) Publish(path string, permalink string) (err error) { return } - return helpers.WriteToDisk(path, buffer, hugofs.DestinationFS) + return helpers.WriteToDisk(path, buffer, hugofs.Destination()) } diff --git a/target/page.go b/target/page.go index 9e7efdb61..d67d678f9 100644 --- a/target/page.go +++ b/target/page.go @@ -1,4 +1,4 @@ -// Copyright 2015 The Hugo Authors. All rights reserved. +// Copyright 2016 The Hugo Authors. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -41,7 +41,7 @@ func (pp *PagePub) Publish(path string, r io.Reader) (err error) { return } - return helpers.WriteToDisk(translated, r, hugofs.DestinationFS) + return helpers.WriteToDisk(translated, r, hugofs.Destination()) } func (pp *PagePub) Translate(src string) (dest string, err error) { |