yeray/gobyexample
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Mark McGranaghan 2012-10-07 08:37:04 -07:00
parent b16f814be0
commit fd02173b9a
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/collection-functions/collection-functions.go
View File

@ -37,13 +37,13 @@ func All(elems []string, f func(string) bool) bool {
}
func Filter(vs []string, f func(string) bool) []string {
filtered := []string{}
vsf := make([]string, 0)
for _, v := range elems {
if f(v) {
filtered = append(filtered, v)
vsf = append(vsf, v)
}
}
return filtered
return vsf
}
func Map(strs []string, f func(string) string) []string {

33
tool/build-html.go
View File

@ -19,6 +19,16 @@ func check(err error) {
}
}
func filterStrings(vs []string, f func(string) bool) []string {
vsf := make([]string, 0)
for _, v := range vs {
if f(v) {
vsf = append(vsf, v)
}
}
return vsf
}
func render(bin string, arg []string, src string) []byte {
cmd := exec.Command(bin, arg...)
in, _ := cmd.StdinPipe()
@ -65,9 +75,8 @@ func ensureCache() {
}
func readLines(path string) []string {
srcBytes, err := ioutil.ReadFile(path)
check(err)
return strings.Split(string(srcBytes), "\n")
src := mustReadFile(path)
return strings.Split(src, "\n")
}
func mustGlob(glob string) []string {
@ -187,23 +196,17 @@ func main() {
</head>
<body>`)
indexBytes, err := ioutil.ReadFile("src/index.txt")
check(err)
indexLines := strings.Split(string(indexBytes), "\n")
indexNames := make([]string, 0)
for _, indexLine := range indexLines {
if indexLine != "" {
indexNames = append(indexNames, indexLine)
}
}
indexLines := readLines("src/index.txt")
indexNames := filterStrings(indexLines, func(s string) bool {
return s != ""
})
for _, indexName := range indexNames {
fmt.Fprintf(outF, `<div id="%s">`, indexName)
if (indexName == "title") || (indexName == "contents") || (indexName == "introduction") {
sourcePath := "src/" + indexName + "/" + indexName + ".html"
sourceBytes, err := ioutil.ReadFile(sourcePath)
check(err)
_, err = outF.Write(sourceBytes)
source := mustReadFile(sourcePath)
_, err = outF.WriteString(source)
check(err)
} else {
chapterPath := "src/" + indexName