抓取支持覆盖

polaris1119 · polaris1119 · commit 6c5d18f8b5a3 · 2019-05-04T21:57:56.000+08:00
diff --git a/src/logic/article.go b/src/logic/article.go
@@ -56,7 +56,7 @@ func (self ArticleLogic) ParseArticle(ctx context.Context, articleUrl string, au
 
 	tmpArticle := &model.Article{}
 	_, err := MasterDB.Where("url=?", articleUrl).Get(tmpArticle)
-	if err != nil || tmpArticle.Id != 0 {
+	if err != nil || (tmpArticle.Id != 0 && auto) {
 		logger.Infoln(articleUrl, "has exists:", err)
 		return nil, errors.New("has exists!")
 	}
@@ -79,7 +79,7 @@ func (self ArticleLogic) ParseArticle(ctx context.Context, articleUrl string, au
 	}
 
 	if rule.Id == 0 {
-		return self.ParseArticleByAccuracy(articleUrl)
+		return self.ParseArticleByAccuracy(articleUrl, tmpArticle, auto)
 	}
 
 	// 知乎特殊处理
@@ -222,6 +222,15 @@ func (self ArticleLogic) ParseArticle(ctx context.Context, articleUrl string, au
 		}
 	}
 
+	if !auto && tmpArticle.Id > 0 {
+		_, err = MasterDB.Id(tmpArticle.Id).Update(article)
+		if err != nil {
+			logger.Errorln("upadate article error:", err)
+			return nil, err
+		}
+		return article, nil
+	}
+
 	_, err = MasterDB.Insert(article)
 	if err != nil {
 		logger.Errorln("insert article error:", err)
diff --git a/src/logic/html2article.go b/src/logic/html2article.go
@@ -18,7 +18,7 @@ import (
 	"github.com/sundy-li/html2article"
 )
 
-func (self ArticleLogic) ParseArticleByAccuracy(articleUrl string) (*model.Article, error) {
+func (self ArticleLogic) ParseArticleByAccuracy(articleUrl string, tmpArticle *model.Article, auto bool) (*model.Article, error) {
 	htmlArticle, err := html2article.FromUrl(articleUrl)
 	if err != nil {
 		logger.Errorln("html2article from url:", articleUrl, "error:", err)
@@ -61,6 +61,15 @@ func (self ArticleLogic) ParseArticleByAccuracy(articleUrl string) (*model.Artic
 		Url:       articleUrl,
 	}
 
+	if !auto && tmpArticle.Id > 0 {
+		_, err = MasterDB.Id(tmpArticle.Id).Update(article)
+		if err != nil {
+			logger.Errorln("upadate article error:", err)
+			return nil, err
+		}
+		return article, nil
+	}
+
 	_, err = MasterDB.Insert(article)
 	if err != nil {
 		logger.Errorln("insert article error:", err)

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ func (self ArticleLogic) ParseArticle(ctx context.Context, articleUrl string, au`
`56`	`56`
`57`	`57`	`tmpArticle := &model.Article{}`
`58`	`58`	`_, err := MasterDB.Where("url=?", articleUrl).Get(tmpArticle)`
`59`		`- if err != nil \|\| tmpArticle.Id != 0 {`
	`59`	`+ if err != nil \|\| (tmpArticle.Id != 0 && auto) {`
`60`	`60`	`logger.Infoln(articleUrl, "has exists:", err)`
`61`	`61`	`return nil, errors.New("has exists!")`
`62`	`62`	`}`
`@@ -79,7 +79,7 @@ func (self ArticleLogic) ParseArticle(ctx context.Context, articleUrl string, au`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`if rule.Id == 0 {`
`82`		`- return self.ParseArticleByAccuracy(articleUrl)`
	`82`	`+ return self.ParseArticleByAccuracy(articleUrl, tmpArticle, auto)`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`// 知乎特殊处理`
`@@ -222,6 +222,15 @@ func (self ArticleLogic) ParseArticle(ctx context.Context, articleUrl string, au`
`222`	`222`	`}`
`223`	`223`	`}`
`224`	`224`
	`225`	`+ if !auto && tmpArticle.Id > 0 {`
	`226`	`+ _, err = MasterDB.Id(tmpArticle.Id).Update(article)`
	`227`	`+ if err != nil {`
	`228`	`+ logger.Errorln("upadate article error:", err)`
	`229`	`+ return nil, err`
	`230`	`+ }`
	`231`	`+ return article, nil`
	`232`	`+ }`
	`233`	`+`
`225`	`234`	`_, err = MasterDB.Insert(article)`
`226`	`235`	`if err != nil {`
`227`	`236`	`logger.Errorln("insert article error:", err)`