txt去除不必要的空格

polaris1119 · polaris1119 · commit dcc8887b0a35 · 2014-10-08T22:12:22.000+08:00
diff --git a/websites/code/studygolang/src/model/document.go b/websites/code/studygolang/src/model/document.go
@@ -52,7 +52,8 @@ func NewDocument(object interface{}, objectExt interface{}) *Document {
 	return document
 }
 
-var re = regexp.MustCompile("[\r\n\t\v ]+")
+var docRe = regexp.MustCompile("[\r　\n  \t\v]+")
+var docSpaceRe = regexp.MustCompile("[ ]+")
 
 // 文本过滤（预处理）
 func filterTxt(txt string) string {
@@ -61,7 +62,8 @@ func filterTxt(txt string) string {
 	txt = strings.TrimSpace(strings.TrimPrefix(txt, "顶"))
 	txt = strings.TrimSpace(strings.TrimPrefix(txt, "转"))
 
-	return re.ReplaceAllLiteralString(txt, " ")
+	txt = docRe.ReplaceAllLiteralString(txt, " ")
+	return docSpaceRe.ReplaceAllLiteralString(txt, " ")
 }
 
 type AddCommand struct {
diff --git a/websites/code/studygolang/src/service/article.go b/websites/code/studygolang/src/service/article.go
@@ -24,6 +24,9 @@ var domainPatch = map[string]string{
 	"blog.51cto.com": "blog.51cto.com",
 }
 
+var articleRe = regexp.MustCompile("[\r　\n  \t\v]+")
+var articleSpaceRe = regexp.MustCompile("[ ]+")
+
 // 获取url对应的文章并根据规则进行解析
 func ParseArticle(articleUrl string, auto bool) (*model.Article, error) {
 	articleUrl = strings.TrimSpace(articleUrl)
@@ -124,6 +127,8 @@ func ParseArticle(articleUrl string, auto bool) (*model.Article, error) {
 	}
 	content = strings.TrimSpace(content)
 	txt := strings.TrimSpace(contentSelection.Text())
+	txt = articleRe.ReplaceAllLiteralString(txt, " ")
+	txt = articleSpaceRe.ReplaceAllLiteralString(txt, " ")
 
 	// 自动抓取，内容长度不能少于 300 字
 	if auto && len(txt) < 300 {
diff --git a/websites/code/studygolang/static/css/main.css b/websites/code/studygolang/static/css/main.css
@@ -79,7 +79,7 @@ html, body { background: #F2F2F2; font-family: "Helvetica Neue", Helvetica, Aria
 .sidebar .sb-content .cmt-list ul li .word .w-page { padding-top: 2px;font-family: "simsun";font-size: 12px;font-size: 1.2rem;color: #c1c1c1; }
 .sidebar .sb-content .cmt-list ul li .word .w-page a { color: #5f5e5e;margin-left: 5px;margin-right: 5px; }
 .sidebar .sb-content .cmt-list ul li .word .w-page a:hover { text-decoration: none; color: #F2733C; }
-.sidebar .sb-content .cmt-list ul li .word .w-comment { line-height: 18px;max-height: 36px;_height: 36px;color: #db6d4c;font-family: "simsun";font-size: 12px;font-size: 1.2rem;overflow: hidden;padding-top: 2px; }
+.sidebar .sb-content .cmt-list ul li .word .w-comment { line-height: 18px;max-height: 54px;_height: 54px;color: #db6d4c;font-family: "simsun";font-size: 12px;font-size: 1.2rem;overflow: hidden;padding-top: 2px; }
 .sidebar .sb-content .user-list ul li {width: 92px;text-align: center;margin-bottom: 8px;}
 .sidebar .sb-content .user-list ul li .name {text-overflow: clip;}
 
