lostecho/build-web-application-with-golang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/astaxie/build-web-application-with-golang

Browse Source 
Conflicts:
	2.3.md
This commit is contained in:
Oling Cat
2012-09-22 16:04:29 +08:00
parent 65aa4e36d2 707af97968
commit 06d36a5140
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
2.3.md
View File

@@ -384,7 +384,11 @@ Go里面有一个不错的设计，就是回调函数，有点类似面向对象
return false return false
} }
<<<<<<< HEAD
// 声明的函数类型在这个地方当做了一个参数 // 声明的函数类型在这个地方当做了一个参数
=======
//声明的函数类型在这个地方当做了一个参数
>>>>>>> 707af97968bca65f2f1ba6a95132911b25585603
func filter(slice []int, f testInt) []int { func filter(slice []int, f testInt) []int {
var result []int var result []int
for _, value := range slice { for _, value := range slice {

4
build.go
View File

@@ -21,7 +21,7 @@ func (self *Visitor) visit(path string, f os.FileInfo, err error) error {
} else if (f.Mode() & os.ModeSymlink) > 0 { } else if (f.Mode() & os.ModeSymlink) > 0 {
return nil return nil
} else { } else {
if strings.Contains(f.Name(), ".md") { if strings.HasSuffix(f.Name(), ".md") {
fmt.Println(f) fmt.Println(f)
file, err := os.Open(f.Name()) file, err := os.Open(f.Name())
if err != nil { if err != nil {
@@ -30,7 +30,7 @@ func (self *Visitor) visit(path string, f os.FileInfo, err error) error {
input, _ := ioutil.ReadAll(file) input, _ := ioutil.ReadAll(file)
output := blackfriday.MarkdownCommon(input) output := blackfriday.MarkdownCommon(input)
var out *os.File var out *os.File
if out, err = os.Create(f.Name() + ".html"); err != nil { if out, err = os.Create(strings.Replace(f.Name(),".md",".html",-1) ); err != nil {
fmt.Fprintf(os.Stderr, "Error creating %s: %v", f.Name(), err) fmt.Fprintf(os.Stderr, "Error creating %s: %v", f.Name(), err)
os.Exit(-1) os.Exit(-1)
} }