Merge pull request astaxie#144 from guiquanz/master

astaxie · astaxie · commit 03d09f02f4d8 · 2013-01-16T02:14:33.000-08:00
解决浏览器打开html文件乱码问题等
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,4 @@
+*~
+pkg/*
+*.html
+
diff --git a/build.go b/build.go
@@ -6,8 +6,8 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	"strings"
 	"regexp"
+	"strings"
 )
 
 // 定义一个访问者结构体
@@ -37,10 +37,14 @@ func (self *Visitor) visit(path string, f os.FileInfo, err error) error {
 				os.Exit(-1)
 			}
 			defer out.Close()
+			header := "<!doctype html>\n<html lang=\"en\">\n<head>\n<meta charset=\"utf-8\"/>\n</head>\n"
+			footer := "</html>\n"
+			out.Write([]byte(header))
 			if _, err = out.Write(output); err != nil {
 				fmt.Fprintln(os.Stderr, "Error writing output:", err)
 				os.Exit(-1)
 			}
+			out.Write([]byte(footer))
 		}
 	}
 	return nil
diff --git a/build.sh b/build.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/sh
+
+rm -f *.html *~
+
+export GOPATH=`pwd`
+
+go get -u github.com/russross/blackfriday
+
+go run build.go
+

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +*~
 +pkg/*
 +*.html
++
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ import (`
`6`	`6`	`"io/ioutil"`
`7`	`7`	`"os"`
`8`	`8`	`"path/filepath"`
`9`		`- "strings"`
`10`	`9`	`"regexp"`
	`10`	`+ "strings"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`// 定义一个访问者结构体`
`@@ -37,10 +37,14 @@ func (self *Visitor) visit(path string, f os.FileInfo, err error) error {`
`37`	`37`	`os.Exit(-1)`
`38`	`38`	`}`
`39`	`39`	`defer out.Close()`
	`40`	`+ header := "<!doctype html>\n<html lang=\"en\">\n<head>\n<meta charset=\"utf-8\"/>\n</head>\n"`
	`41`	`+ footer := "</html>\n"`
	`42`	`+ out.Write([]byte(header))`
`40`	`43`	`if _, err = out.Write(output); err != nil {`
`41`	`44`	`fmt.Fprintln(os.Stderr, "Error writing output:", err)`
`42`	`45`	`os.Exit(-1)`
`43`	`46`	`}`
	`47`	`+ out.Write([]byte(footer))`
`44`	`48`	`}`
`45`	`49`	`}`
`46`	`50`	`return nil`