support blog translate

Author: chai2010

blog.go

@@ -6,18 +6,16 @@ package main
 
 import (
 	"fmt"
-	"go/build"
 	"log"
 	"net/http"
 	"os"
-	"path/filepath"
-	"runtime"
 	"strings"
 	"sync"
 
 	"golang.org/x/tools/godoc/redirect"
 
 	"github.com/chai2010/golangdoc/blog"
+	"github.com/chai2010/golangdoc/local"
 )
 
 const (
@@ -41,27 +39,22 @@ func init() {
 }
 
 func blogInit() {
-	// Binary distributions will include the blog content in "/blog".
-	root := filepath.Join(runtime.GOROOT(), "blog")
-
-	// Prefer content from go.blog repository if present.
-	if pkg, err := build.Import(blogRepo, "", build.FindOnly); err == nil {
-		root = pkg.Dir
-	}
+	blogFS := local.BlogFS(*lang)
 
 	// If content is not available fall back to redirect.
-	if fi, err := os.Stat(root); err != nil || !fi.IsDir() {
+	if fi, err := blogFS.Lstat("/"); err != nil || !fi.IsDir() {
 		fmt.Fprintf(os.Stderr, "Blog content not available locally. "+
 			"To install, run \n\tgo get %v\n", blogRepo)
 		blogServer = http.HandlerFunc(blogRedirectHandler)
 		return
 	}
 
 	s, err := blog.NewServer(blog.Config{
+		RootFS:       blogFS,
 		BaseURL:      blogPath,
 		BasePath:     strings.TrimSuffix(blogPath, "/"),
-		ContentPath:  filepath.Join(root, "content"),
-		TemplatePath: filepath.Join(root, "template"),
+		ContentPath:  "content",
+		TemplatePath: "template",
 		HomeArticles: 5,
 		PlayEnabled:  playEnabled,
 	})

local/init.go

@@ -6,6 +6,7 @@ package local
 
 import (
 	"archive/zip"
+	"go/build"
 	"log"
 	"os"
 	"path/filepath"
@@ -59,11 +60,13 @@ func Init(goRoot, goZipFile, goTemplateDir, goPath string) {
 
 		defaultRootFS = getNameSpace(zipfs.New(rc, goZipFile), goRoot)
 		defaultDocFS = getNameSpace(defaultRootFS, "/doc")
+		defaultBlogFS = getNameSpace(defaultRootFS, "/blog")
 		defaultLocalFS = getNameSpace(defaultRootFS, "/"+Default)
 	} else {
 		if goRoot != "" && goRoot != runtime.GOROOT() {
 			defaultRootFS = getNameSpace(vfs.OS(goRoot), "/")
 			defaultDocFS = getNameSpace(defaultRootFS, "/doc")
+			defaultBlogFS = getNameSpace(defaultRootFS, "/blog")
 			defaultLocalFS = getNameSpace(defaultRootFS, "/"+Default)
 		}
 	}
@@ -76,6 +79,14 @@ func Init(goRoot, goZipFile, goTemplateDir, goPath string) {
 	for _, p := range filepath.SplitList(goPath) {
 		defaultRootFS.Bind("/src", vfs.OS(p), "/src", vfs.BindAfter)
 	}
+
+	// Prefer content from go.blog repository if present.
+	if _, err := defaultBlogFS.Lstat("/"); err != nil {
+		const blogRepo = "golang.org/x/blog"
+		if pkg, err := build.Import(blogRepo, "", build.FindOnly); err == nil {
+			defaultBlogFS = getNameSpace(defaultRootFS, pkg.Dir)
+		}
+	}
 }
 
 func getNameSpace(fs vfs.FileSystem, ns string) vfs.NameSpace {