优化summery.md的排序功能

TruthHun88 · TruthHun88 · commit f3b447cabd92 · 2018-06-18T16:21:01.000+08:00
diff --git a/change.md b/change.md
@@ -13,9 +13,13 @@
 ## V1.4 &#21319;&#32423;&#26085;&#24535;
 - [x] &#20462;&#22797;&#65306;&#30001;&#20110;js&#20351;&#29992;&#20005;&#26684;&#27169;&#24335;(`use strict`)&#65292;&#23548;&#33268;&#25991;&#26723;&#30446;&#24405;&#25910;&#36215;&#20043;&#21518;&#26080;&#27861;&#23637;&#24320;
 - [x] &#20248;&#21270;&#65306;&#20070;&#31821;&#31163;&#32447;&#25991;&#26723;&#29983;&#25104;&#21152;&#38145;&#20248;&#21270;&#65292;&#31227;&#38500;`app.conf`&#20013;&#30340;`GenerateInterval`&#37197;&#32622;&#39033;
+- [x] &#20248;&#21270;&#65306;PDF&#12289;epub&#21644;mobi&#31561;&#30005;&#23376;&#20070;&#29983;&#25104;&#20248;&#21270;
+- [x] &#20248;&#21270;&#65306;&#24378;&#21270;&#29228;&#34411;&#37319;&#38598;&#21151;&#33021;&#65292;&#19968;&#38190;&#37319;&#38598;&#25991;&#26723;&#39033;&#30446;&#30340;&#25152;&#26377;&#31456;&#33410;
+- [ ] &#20248;&#21270;&#65306;`<bookstack-summary>`&#26631;&#31614;&#30340;&#19968;&#38190;&#25490;&#24207;&#21151;&#33021;
+- [x] &#26032;&#22686;&#65306;Docker&#38236;&#20687;&#65292;&#26041;&#20415;&#37096;&#32626;
 
 <a name="v1.3"></a>
-## V1.3 &#24320;&#21457;&#21319;&#32423;&#39044;&#21578;(&#36816;&#33829;&#22686;&#24378;&#21644;&#38405;&#35835;&#20307;&#39564;&#20248;&#21270;&#21319;&#32423;&#12290;&#35745;&#21010;&#20110;5&#26376;&#20221;&#23436;&#25104;)
+## V1.3 &#24320;&#21457;&#21319;&#32423;&#39044;&#21578;
 - [x] &#26032;&#22686;&#65306;&#29992;&#25143;&#38405;&#35835;&#35760;&#24405;&#21644;&#38405;&#35835;&#36827;&#24230;
 - [x] &#26032;&#22686;&#65306;&#38405;&#35835;&#20070;&#31614;&#21151;&#33021;&#65292;&#20197;&#20415;&#35835;&#32773;&#26631;&#35760;&#38405;&#35835;&#20301;&#32622;
 - [x] &#26032;&#22686;&#65306;&#20070;&#31821;&#35814;&#24773;&#39029;&#21644;&#25991;&#26723;&#20869;&#23481;&#39029;&#22686;&#21152;&#20998;&#20139;&#21151;&#33021;&#65288;&#30001;&#20110;&#30334;&#24230;&#20998;&#20139;&#31561;&#29616;&#26377;&#20998;&#20139;&#20195;&#30721;&#19981;&#25903;&#25345;`https`&#65292;&#25152;&#20197;&#20351;&#29992;&#26412;&#22320;&#21270;&#30334;&#24230;&#20998;&#20139;&#28304;&#30721;&#35299;&#20915;&#26041;&#26696; https://github.com/hrwhisper/baiduShare &#65289;
diff --git a/controllers/BaseController.go b/controllers/BaseController.go
@@ -238,7 +238,7 @@ func (this *BaseController) loginByMemberId(memberId int) (err error) {
 }
 
 //&#22312;markdown&#22836;&#37096;&#21152;&#19978;<bookstack></bookstack>&#25110;&#32773;<bookstack/>&#65292;&#21363;&#35299;&#26512;markdown&#20013;&#30340;ul>li>a&#38142;&#25509;&#20316;&#20026;&#30446;&#24405;
-func (this *BaseController) sortBySummary(htmlstr string, book_id int) {
+func (this *BaseController) sortBySummary(bookIdentify, htmlstr string, book_id int) {
 	debug := beego.AppConfig.String("runmod") != "prod"
 	o := orm.NewOrm()
 	qs := o.QueryTable("md_documents").Filter("book_id", book_id)
@@ -292,17 +292,18 @@ func (this *BaseController) sortBySummary(htmlstr string, book_id int) {
 				})
 			}
 		}
+
 	}
 
 	doc.Find("a").Each(func(i int, selection *goquery.Selection) {
 		doc_name := selection.Text()
-		if docid, exist := selection.Attr("data-bookstack"); exist {
+		pid := 0
+		if docid, exist := selection.Attr("data-pid"); exist {
 			doc_id, _ := strconv.Atoi(docid)
 			eleParent := selection.Parent().Parent().Parent()
-			pid := 0
 			if eleParent.Is("li") {
 				fst := eleParent.Find("a").First()
-				pidstr, _ := fst.Attr("data-bookstack")
+				pidstr, _ := fst.Attr("data-pid")
 				//&#22914;&#26524;&#36825;&#37324;&#30340;pid&#20026;0&#65292;&#34920;&#31034;&#25968;&#25454;&#24211;&#36824;&#27809;&#23384;&#22312;&#36825;&#20010;&#26631;&#35782;&#65292;&#38656;&#35201;&#21019;&#24314;
 				pid, _ = strconv.Atoi(pidstr)
 			}
@@ -314,7 +315,6 @@ func (this *BaseController) sortBySummary(htmlstr string, book_id int) {
 			}
 		} else if href, ok := selection.Attr("href"); ok && strings.HasPrefix(href, "$") {
 			identify := strings.TrimPrefix(href, "$") //&#25991;&#26723;&#26631;&#35782;
-			pid := 0                                  //&#40664;&#35748;&#19978;&#19968;&#32423;id&#65292;&#21363;pid
 			eleParent := selection.Parent().Parent().Parent()
 			if eleParent.Is("li") {
 				if parentHref, ok := eleParent.Find("a").First().Attr("href"); ok {
@@ -333,6 +333,9 @@ func (this *BaseController) sortBySummary(htmlstr string, book_id int) {
 		}
 		idx++
 	})
+	if len(hrefs) > 0 { //&#22914;&#26524;&#26377;&#26032;&#21019;&#24314;&#30340;&#25991;&#26723;&#65292;&#21017;&#20877;&#35843;&#29992;&#19968;&#36941;&#65292;&#29992;&#20110;&#22788;&#29702;&#25490;&#24207;
+		this.replaceLinks(bookIdentify, htmlstr, true)
+	}
 }
 
 //&#25490;&#24207;
@@ -375,13 +378,13 @@ func (this *BaseController) replaceLinks(book_identify string, doc_html string,
 							if newHref, ok := Links[strings.ToLower(slice[0])]; ok {
 								arr := strings.Split(newHref, "||") //&#25972;&#29702;&#30340;arr&#25968;&#32452;&#38271;&#24230;&#65292;&#32943;&#23450;&#20026;2&#65292;&#25152;&#20197;&#19981;&#20570;&#25968;&#32452;&#38271;&#24230;&#21028;&#26029;
 								selection.SetAttr("href", arr[0]+"#"+strings.Join(slice[1:], "#"))
-								selection.SetAttr("data-bookstack", arr[1])
+								selection.SetAttr("data-pid", arr[1])
 							}
 						} else {
 							if newHref, ok := Links[strings.ToLower(href)]; ok {
 								arr := strings.Split(newHref, "||") //&#25972;&#29702;&#30340;arr&#25968;&#32452;&#38271;&#24230;&#65292;&#32943;&#23450;&#20026;2&#65292;&#25152;&#20197;&#19981;&#20570;&#25968;&#32452;&#38271;&#24230;&#21028;&#26029;
 								selection.SetAttr("href", arr[0])
-								selection.SetAttr("data-bookstack", arr[1])
+								selection.SetAttr("data-pid", arr[1])
 							}
 						}
 					}
@@ -390,7 +393,7 @@ func (this *BaseController) replaceLinks(book_identify string, doc_html string,
 				if newHtml, err := gq.Find("body").Html(); err == nil {
 					doc_html = newHtml
 					if len(is_summary) > 0 && is_summary[0] == true { //&#26356;&#26032;&#25490;&#24207;
-						this.sortBySummary(doc_html, book.BookId) //&#26356;&#26032;&#25490;&#24207;
+						this.sortBySummary(book_identify, doc_html, book.BookId) //&#26356;&#26032;&#25490;&#24207;
 					}
 				}
 			} else {

-Original file line number
+Diff line change
 ## V1.4 升级日志
 - [x] 修复：由于js使用严格模式(`use strict`)，导致文档目录收起之后无法展开
 - [x] 优化：书籍离线文档生成加锁优化，移除`app.conf`中的`GenerateInterval`配置项
 +- [x] 优化：PDF、epub和mobi等电子书生成优化
 +- [x] 优化：强化爬虫采集功能，一键采集文档项目的所有章节
 +- [ ] 优化：`<bookstack-summary>`标签的一键排序功能
 +- [x] 新增：Docker镜像，方便部署
 <a name="v1.3"></a>
 -## V1.3 开发升级预告(运营增强和阅读体验优化升级。计划于5月份完成)
 +## V1.3 开发升级预告
 - [x] 新增：用户阅读记录和阅读进度
 - [x] 新增：阅读书签功能，以便读者标记阅读位置
 - [x] 新增：书籍详情页和文档内容页增加分享功能（由于百度分享等现有分享代码不支持`https`，所以使用本地化百度分享源码解决方案 https://github.com/hrwhisper/baiduShare ）
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ func (this *BaseController) loginByMemberId(memberId int) (err error) {`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`//在markdown头部加上<bookstack></bookstack>或者<bookstack/>，即解析markdown中的ul>li>a链接作为目录`
`241`		`-func (this *BaseController) sortBySummary(htmlstr string, book_id int) {`
	`241`	`+func (this *BaseController) sortBySummary(bookIdentify, htmlstr string, book_id int) {`
`242`	`242`	`debug := beego.AppConfig.String("runmod") != "prod"`
`243`	`243`	`o := orm.NewOrm()`
`244`	`244`	`qs := o.QueryTable("md_documents").Filter("book_id", book_id)`
`@@ -292,17 +292,18 @@ func (this *BaseController) sortBySummary(htmlstr string, book_id int) {`
`292`	`292`	`})`
`293`	`293`	`}`
`294`	`294`	`}`
	`295`	`+`
`295`	`296`	`}`
`296`	`297`
`297`	`298`	`doc.Find("a").Each(func(i int, selection *goquery.Selection) {`
`298`	`299`	`doc_name := selection.Text()`
`299`		`- if docid, exist := selection.Attr("data-bookstack"); exist {`
	`300`	`+ pid := 0`
	`301`	`+ if docid, exist := selection.Attr("data-pid"); exist {`
`300`	`302`	`doc_id, _ := strconv.Atoi(docid)`
`301`	`303`	`eleParent := selection.Parent().Parent().Parent()`
`302`		`- pid := 0`
`303`	`304`	`if eleParent.Is("li") {`
`304`	`305`	`fst := eleParent.Find("a").First()`
`305`		`- pidstr, _ := fst.Attr("data-bookstack")`
	`306`	`+ pidstr, _ := fst.Attr("data-pid")`
`306`	`307`	`//如果这里的pid为0，表示数据库还没存在这个标识，需要创建`
`307`	`308`	`pid, _ = strconv.Atoi(pidstr)`
`308`	`309`	`}`
`@@ -314,7 +315,6 @@ func (this *BaseController) sortBySummary(htmlstr string, book_id int) {`
`314`	`315`	`}`
`315`	`316`	`} else if href, ok := selection.Attr("href"); ok && strings.HasPrefix(href, "$") {`
`316`	`317`	`identify := strings.TrimPrefix(href, "$") //文档标识`
`317`		`- pid := 0 //默认上一级id，即pid`
`318`	`318`	`eleParent := selection.Parent().Parent().Parent()`
`319`	`319`	`if eleParent.Is("li") {`
`320`	`320`	`if parentHref, ok := eleParent.Find("a").First().Attr("href"); ok {`
`@@ -333,6 +333,9 @@ func (this *BaseController) sortBySummary(htmlstr string, book_id int) {`
`333`	`333`	`}`
`334`	`334`	`idx++`
`335`	`335`	`})`
	`336`	`+ if len(hrefs) > 0 { //如果有新创建的文档，则再调用一遍，用于处理排序`
	`337`	`+ this.replaceLinks(bookIdentify, htmlstr, true)`
	`338`	`+ }`
`336`	`339`	`}`
`337`	`340`
`338`	`341`	`//排序`
`@@ -375,13 +378,13 @@ func (this *BaseController) replaceLinks(book_identify string, doc_html string,`
`375`	`378`	`if newHref, ok := Links[strings.ToLower(slice[0])]; ok {`
`376`	`379`	`arr := strings.Split(newHref, "\|\|") //整理的arr数组长度，肯定为2，所以不做数组长度判断`
`377`	`380`	`selection.SetAttr("href", arr[0]+"#"+strings.Join(slice[1:], "#"))`
`378`		`- selection.SetAttr("data-bookstack", arr[1])`
	`381`	`+ selection.SetAttr("data-pid", arr[1])`
`379`	`382`	`}`
`380`	`383`	`} else {`
`381`	`384`	`if newHref, ok := Links[strings.ToLower(href)]; ok {`
`382`	`385`	`arr := strings.Split(newHref, "\|\|") //整理的arr数组长度，肯定为2，所以不做数组长度判断`
`383`	`386`	`selection.SetAttr("href", arr[0])`
`384`		`- selection.SetAttr("data-bookstack", arr[1])`
	`387`	`+ selection.SetAttr("data-pid", arr[1])`
`385`	`388`	`}`
`386`	`389`	`}`
`387`	`390`	`}`
`@@ -390,7 +393,7 @@ func (this *BaseController) replaceLinks(book_identify string, doc_html string,`
`390`	`393`	`if newHtml, err := gq.Find("body").Html(); err == nil {`
`391`	`394`	`doc_html = newHtml`
`392`	`395`	`if len(is_summary) > 0 && is_summary[0] == true { //更新排序`
`393`		`- this.sortBySummary(doc_html, book.BookId) //更新排序`
	`396`	`+ this.sortBySummary(book_identify, doc_html, book.BookId) //更新排序`
`394`	`397`	`}`
`395`	`398`	`}`
`396`	`399`	`} else {`