原文地址替换

TruthHun88 · TruthHun88 · commit 9f57cf370c2d · 2018-10-14T08:52:59.000+08:00
diff --git a/utils/util.go b/utils/util.go
@@ -117,6 +117,9 @@ func RenderDocumentById(id int) {
 
 //&#20351;&#29992;chrome&#37319;&#38598;&#32593;&#39029;HTML
 func CrawlByChrome(urlstr string) (b []byte, err error) {
+	if strings.Contains(urlstr, "bookstack") {
+		return
+	}
 	chrome := beego.AppConfig.DefaultString("chrome", "chromium-browser")
 	args := []string{"--headless", "--disable-gpu", "--dump-dom", "--no-sandbox", urlstr}
 	cmd := exec.Command(chrome, args...)
@@ -129,7 +132,10 @@ func CrawlByChrome(urlstr string) (b []byte, err error) {
 //intelligence:&#26159;&#21542;&#26159;&#26234;&#33021;&#25552;&#21462;&#65292;&#26234;&#33021;&#25552;&#21462;&#65292;&#20351;&#29992;html2article&#65292;&#21542;&#21017;&#25552;&#21462;body
 //diySelecter:&#33258;&#23450;&#20041;&#36873;&#25321;&#22120;
 //&#27880;&#24847;&#65306;&#30001;&#20110;&#21442;&#25968;&#38382;&#39064;&#65292;&#37319;&#38598;&#24182;&#19979;&#36733;&#22270;&#29255;&#30340;&#35805;&#65292;&#22312;headers&#20013;&#21152;&#19978;key&#20026;"project"&#30340;&#23383;&#27573;&#65292;&#20540;&#20026;&#25991;&#26723;&#39033;&#30446;&#30340;&#26631;&#35782;
-func CrawlHtml2Markdown(urlstr string, contType int, force bool, intelligence int, diySelecter string, headers ...map[string]string) (cont string, err error) {
+func CrawlHtml2Markdown(urlstr string, contType int, force bool, intelligence int, diySelector string, headers ...map[string]string) (cont string, err error) {
+	if strings.Contains(urlstr, "bookstack") {
+		return
+	}
 	if force { //&#24378;&#21147;&#27169;&#24335;
 		var b []byte
 		b, err = CrawlByChrome(urlstr)
@@ -175,7 +181,6 @@ func CrawlHtml2Markdown(urlstr string, contType int, force bool, intelligence in
 							}
 						}
 
-						//TODO:&#37319;&#38598;&#24182;&#19979;&#36733;&#22270;&#29255;
 						ext := strings.ToLower(filepath.Ext(src))
 						if strings.HasPrefix(ext, ".jpeg") {
 							ext = ".jpeg"
@@ -226,7 +231,7 @@ func CrawlHtml2Markdown(urlstr string, contType int, force bool, intelligence in
 					})
 				}
 
-				diySelecter = strings.TrimSpace(diySelecter)
+				diySelector = strings.TrimSpace(diySelector)
 
 				cont, err = doc.Html()
 
@@ -245,19 +250,19 @@ func CrawlHtml2Markdown(urlstr string, contType int, force bool, intelligence in
 					case 2: //=>text
 						cont = article.Content + fmt.Sprintf("\n&#21407;&#25991;&#65306;\n> %v", urlstr)
 					default: //0 && other=>markdown
-						cont = html2md.Convert(article.Html) + fmt.Sprintf("\n\r\n\r&#21407;&#25991;:\n> [%v](%v)", urlstr, urlstr)
+						cont = html2md.Convert(article.Html) + fmt.Sprintf("\n\r\n\r&#21407;&#25991;:\n> %v", urlstr)
 					}
-				} else if intelligence == 2 && diySelecter != "" { //&#33258;&#23450;&#20041;&#25552;&#21462;
-					if htmlstr, err := doc.Find(diySelecter).Html(); err != nil {
+				} else if intelligence == 2 && diySelector != "" { //&#33258;&#23450;&#20041;&#25552;&#21462;
+					if htmlstr, err := doc.Find(diySelector).Html(); err != nil {
 						return "", err
 					} else {
 						switch contType {
 						case 1: //=>html
 							cont = htmlstr + "\n\r\n\r> &#21407;&#25991;&#65306; " + urlstr
 						case 2: //=>text
-							cont = doc.Find(diySelecter).Text() + fmt.Sprintf("\n\r\n\r> &#21407;&#25991;: %v", urlstr)
+							cont = doc.Find(diySelector).Text() + fmt.Sprintf("\n\r\n\r> &#21407;&#25991;: %v", urlstr)
 						default: //0 && other=>markdown
-							cont = html2md.Convert(htmlstr) + fmt.Sprintf("\n\r\n\r> &#21407;&#25991;: [%v](%v)", urlstr, urlstr)
+							cont = html2md.Convert(htmlstr) + fmt.Sprintf("\n\r\n\r> &#21407;&#25991;: %v", urlstr)
 						}
 					}
 				} else { //&#20840;&#25991;
@@ -274,7 +279,7 @@ func CrawlHtml2Markdown(urlstr string, contType int, force bool, intelligence in
 						cont = doc.Find("body").Text() + fmt.Sprintf("\n\r\n\r> &#21407;&#25991;: %v", urlstr)
 					default: //0 && other=>markdown
 						htmlstr, _ := doc.Find("body").Html()
-						cont = html2md.Convert(htmlstr) + fmt.Sprintf("\n\r\n\r> &#21407;&#25991;: [%v](%v)", urlstr, urlstr)
+						cont = html2md.Convert(htmlstr) + fmt.Sprintf("\n\r\n\r> &#21407;&#25991;: %v", urlstr)
 					}
 				}
 
