feat: now include key will check on tiile and content

internal/gui/gui.go

@@ -91,15 +91,15 @@ func Open(onStart func(p preference.Preference)) {
  hyperLink,
  widget.NewLabel("设置豆瓣群组链接："),
  groupUrlEntry,
- widget.NewLabel("设置Cookie（如果遇到nil请设置）："),
+ widget.NewLabel("设置Cookie（如果遇到\"nil\"请设置该项）："),
  cookieEntry,
  widget.NewLabel("设置爬取页数："),
  maxPageEntry,
  widget.NewLabel("设置最大价格："),
  maxPriceEntry,
- widget.NewLabel("设置标题爬取关键字（用|分隔，不写全爬）："),
+ widget.NewLabel("设置标题或内容爬取关键字（用|分隔，不写全爬）："),
  includeKeyEntry,
- widget.NewLabel("设置标题和内容排除关键字（用|分隔）："),
+ widget.NewLabel("设置标题或内容排除关键字（用|分隔，不写全爬）："),
  excludeKeyEntry,
  isIncludeNoContentPriceCheck,
  isSavePreferenceCheck,

main.go

@@ -26,7 +26,6 @@ var dataArray = make(markdown.DataArray, 0)
 var pre preference.Preference
 
 func main() {
- //handleArgs()
  gui.Open(func(p preference.Preference) {
  pre = p
  savePreference(&p)
@@ -89,9 +88,6 @@ func each(nodes xpath.Nodes, request request.Data) {
  hrefs := nodes.Attr("href")
  titles := nodes.Attr("title")
  for index, href := range hrefs {
- if !isIncludeContent(titles[index]) {
- continue
- }
  if isExcludeContent(titles[index]) {
  continue
  }
@@ -122,6 +118,17 @@ func isIncludeContent(content string) bool {
  return false
 }
 
+// 只要关键字在标题或内容中即返回真
+func checkTitleOrContentHaveKey(title string, content string) bool {
+ if isIncludeContent(title) {
+ return true
+ } else if isIncludeContent(content) {
+ return true
+ } else {
+ return false
+ }
+}
+
 func isExcludeContent(content string) bool {
  for _, key := range pre.ExcludeKeyArray {
  if strings.Contains(content, key) {
@@ -155,6 +162,9 @@ func content(nodes xpath.Nodes, request request.Data) {
  if isExcludeContent(content) {
  continue
  }
+ if !checkTitleOrContentHaveKey(title, content) {
+ continue
+ }
  // 处理图片
  imgArray := handleImages(node)
  // 处理时间
@@ -185,12 +195,16 @@ func contentWithTitleNoPrice(nodes xpath.Nodes, request request.Data) {
  if isExcludeContent(content) {
  continue
  }
+ // 处理标题
+ title := handleTitle(node)
+
+ if !checkTitleOrContentHaveKey(title, content) {
+ continue
+ }
  // 处理图片
  imgArray := handleImages(node)
  // 处理时间
  timeStr := handleTime(node)
- // 处理标题
- title := handleTitle(node)
 
  dataArray.Append(markdown.Data{
  TimeString: timeStr,