Speed up toc and fixed /tags/#ref /categories/#ref links

wendal · Mar 11, 2013 · 4ab86f0 · 4ab86f0
1 parent 59d567f
commit 4ab86f0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/markdown.go b/markdown.go
@@ -57,11 +57,13 @@ func MarkdownToHtml(content string) (str string) {
 
 	str = string(Markdown([]byte(content), renderer, extensions))
 
-	found := navRegex.FindIndex([]byte(str))
-	if len(found) > 0 {
-		toc := str[found[0]:found[1]]
-		str = str[found[1]:]
-		str = strings.Replace(str, TOC_MARKUP, toc, -1)
+	if htmlFlags&HTML_TOC == 1 {
+		found := navRegex.FindIndex([]byte(str))
+		if len(found) > 0 {
+			toc := str[found[0]:found[1]]
+			str = str[found[1]:]
+			str = strings.Replace(str, TOC_MARKUP, toc, -1)
+		}
 	}
 	return str
 }
diff --git a/payload.go b/payload.go
@@ -243,7 +243,7 @@ func BuildPlayload(root string) (payload map[string]interface{}, err error) {
 		for _, _tag := range post.Tags() {
 			tag := tags[_tag]
 			if tag == nil {
-				tag = &Tag{0, _tag, make([]string, 0), "/tags#" + EncodePathInfo(_tag) + "-ref"}
+				tag = &Tag{0, _tag, make([]string, 0), "/tags/#" + EncodePathInfo(_tag) + "-ref"}
 				tags[_tag] = tag
 			}
 			tag.Count += 1
@@ -253,7 +253,7 @@ func BuildPlayload(root string) (payload map[string]interface{}, err error) {
 		for _, _catalog := range post.Categories() {
 			catalog := catalogs[_catalog]
 			if catalog == nil {
-				catalog = &Catalog{0, _catalog, make([]string, 0), "/categories#" + EncodePathInfo(_catalog) + "-ref"}
+				catalog = &Catalog{0, _catalog, make([]string, 0), "/categories/#" + EncodePathInfo(_catalog) + "-ref"}
 				catalogs[_catalog] = catalog
 			}
 			catalog.Count += 1
@@ -510,8 +510,8 @@ func AsStrings(v interface{}) (strs []string) {
 
 // 转为URL友好的路径
 func EncodePathInfo(pathinfo string) string {
-	pathinfo = strings.Replace(pathinfo, " ", "_", -1)
-	pathinfo = strings.Replace(pathinfo, ":", "_", -1)
+	pathinfo = strings.Replace(pathinfo, " ", "-", -1)
+	pathinfo = strings.Replace(pathinfo, ":", "-", -1)
 	return URL.QueryEscape(pathinfo)
 }
 

diff --git a/payload_v2.go b/payload_v2.go
@@ -234,7 +234,7 @@ func (webSite *WebSite) LoadPosts() {
 		for _, _tag := range post.Tags {
 			tag := tags[_tag]
 			if tag == nil {
-				tag = &Tag{0, _tag, make([]string, 0), "/tags#" + EncodePathInfo(_tag) + "-ref"}
+				tag = &Tag{0, _tag, make([]string, 0), "/tags/#" + EncodePathInfo(_tag) + "-ref"}
 				tags[_tag] = tag
 			}
 			tag.Count += 1
@@ -244,7 +244,7 @@ func (webSite *WebSite) LoadPosts() {
 		for _, _catalog := range post.Categories {
 			catalog := catalogs[_catalog]
 			if catalog == nil {
-				catalog = &Catalog{0, _catalog, make([]string, 0), "/categories#" + EncodePathInfo(_catalog) + "-ref"}
+				catalog = &Catalog{0, _catalog, make([]string, 0), "/categories/#" + EncodePathInfo(_catalog) + "-ref"}
 				catalogs[_catalog] = catalog
 			}
 			catalog.Count += 1