projects / brevno-suite / hugo / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f271fae)
moving writeToDisk to helpers to make it more accessible
authorspf13 <steve.francia@gmail.com>
Thu, 1 May 2014 17:13:11 +0000 (13:13 -0400)
committerspf13 <steve.francia@gmail.com>
Thu, 1 May 2014 17:13:11 +0000 (13:13 -0400)
helpers/path.go patch | blob | history
target/file.go patch | blob | history
target/htmlredirect.go patch | blob | history

diff --git a/helpers/path.go b/helpers/path.go
index 1573204e29477e5da84a83baae8c62f49e95c1d7..e71302617ac4d00b38a7358345f096ab2f48ea98 100644 (file)
--- a/helpers/path.go
+++ b/helpers/path.go
@@ -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
+}
diff --git a/target/file.go b/target/file.go
index f3d2b0b629f64def53f7342d0007f3aa9e026d64..f7055809825c4f31107620cb9e7969098236df92 100644 (file)
--- a/target/file.go
+++ b/target/file.go
@@ -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) {
diff --git a/target/htmlredirect.go b/target/htmlredirect.go
index 55f4896e1b5d5d9597c48497ed19f698c27d118b..73a769f87f62edd68ae32a294ab01ef68cea422b 100644 (file)
--- a/target/htmlredirect.go
+++ b/target/htmlredirect.go
@@ -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)
 }
Unnamed repository; edit this file 'description' to name the repository.