mirror of
https://github.com/gohugoio/hugo.git
synced 2024-12-22 16:02:13 +00:00
moving writeToDisk to helpers to make it more accessible
This commit is contained in:
parent
f271faea06
commit
58f8b43fee
3 changed files with 29 additions and 26 deletions
|
@ -15,12 +15,14 @@ package helpers
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"path"
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
"strings"
|
||||
"unicode"
|
||||
|
||||
"github.com/spf13/viper"
|
||||
)
|
||||
|
||||
|
@ -151,3 +153,24 @@ func FindCWD() (string, error) {
|
|||
|
||||
return path, nil
|
||||
}
|
||||
|
||||
func WriteToDisk(inpath string, r io.Reader) (err error) {
|
||||
dir, _ := filepath.Split(inpath)
|
||||
ospath := filepath.FromSlash(dir)
|
||||
|
||||
if ospath != "" {
|
||||
err = os.MkdirAll(ospath, 0777) // rwx, rw, r
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
}
|
||||
|
||||
file, err := os.Create(inpath)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
defer file.Close()
|
||||
|
||||
_, err = io.Copy(file, r)
|
||||
return
|
||||
}
|
||||
|
|
|
@ -3,9 +3,9 @@ package target
|
|||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"path"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/spf13/hugo/helpers"
|
||||
)
|
||||
|
||||
type Publisher interface {
|
||||
|
@ -34,28 +34,7 @@ func (fs *Filesystem) Publish(path string, r io.Reader) (err error) {
|
|||
return
|
||||
}
|
||||
|
||||
return writeToDisk(translated, r)
|
||||
}
|
||||
|
||||
func writeToDisk(translated string, r io.Reader) (err error) {
|
||||
path, _ := filepath.Split(translated)
|
||||
ospath := filepath.FromSlash(path)
|
||||
|
||||
if ospath != "" {
|
||||
err = os.MkdirAll(ospath, 0777) // rwx, rw, r
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
}
|
||||
|
||||
file, err := os.Create(translated)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
defer file.Close()
|
||||
|
||||
_, err = io.Copy(file, r)
|
||||
return
|
||||
return helpers.WriteToDisk(translated, r)
|
||||
}
|
||||
|
||||
func (fs *Filesystem) Translate(src string) (dest string, err error) {
|
||||
|
|
|
@ -2,10 +2,11 @@ package target
|
|||
|
||||
import (
|
||||
"bytes"
|
||||
"github.com/spf13/hugo/helpers"
|
||||
"html/template"
|
||||
"path"
|
||||
"strings"
|
||||
|
||||
"github.com/spf13/hugo/helpers"
|
||||
)
|
||||
|
||||
const ALIAS = "<!DOCTYPE html><html><head><link rel=\"canonical\" href=\"{{ .Permalink }}\"/><meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" /><meta http-equiv=\"refresh\" content=\"0;url={{ .Permalink }}\" /></head></html>"
|
||||
|
@ -67,5 +68,5 @@ func (h *HTMLRedirectAlias) Publish(path string, permalink template.HTML) (err e
|
|||
return
|
||||
}
|
||||
|
||||
return writeToDisk(path, buffer)
|
||||
return helpers.WriteToDisk(path, buffer)
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue