From f9d2dbbed944387d72c0d97a6f6470662ec57ae0 Mon Sep 17 00:00:00 2001
From: zu1k <i@lgf.im>
Date: Fri, 21 Aug 2020 09:05:17 +0800
Subject: [PATCH] remoe fanqiangdang num limit

---
 config/source.yaml             |  3 +--
 pkg/getter/web_fanqiangdang.go | 29 -----------------------------
 2 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/config/source.yaml b/config/source.yaml
index 8f12b07..ff88f42 100644
--- a/config/source.yaml
+++ b/config/source.yaml
@@ -24,10 +24,9 @@ sources:
       num: 200
 
   # 翻墙党论坛抓取
-  - type: web-fanqiangdang
+  - type: web-fanqiangdang-rss
     options:
       url: https://fanqiangdang.com/forum.php?mod=rss&fid=50&auth=0
-      num: 200
 
   # 某个网站抓取
   - type: web-freessrxyz
diff --git a/pkg/getter/web_fanqiangdang.go b/pkg/getter/web_fanqiangdang.go
index fd990f5..126ab5e 100644
--- a/pkg/getter/web_fanqiangdang.go
+++ b/pkg/getter/web_fanqiangdang.go
@@ -17,25 +17,11 @@ func init() {
 
 type WebFanqiangdang struct {
 	c         *colly.Collector
-	NumNeeded int
 	Url       string
 	results   proxy.ProxyList
 }
 
 func NewWebFanqiangdangGetter(options tool.Options) (getter Getter, err error) {
-	num, found := options["num"]
-
-	t := 200
-	switch num.(type) {
-	case int:
-		t = num.(int)
-	case float64:
-		t = int(num.(float64))
-	}
-
-	if !found || t <= 0 {
-		t = 200
-	}
 	urlInterface, found := options["url"]
 	if found {
 		url, err := AssertTypeStringNotNull(urlInterface)
@@ -44,7 +30,6 @@ func NewWebFanqiangdangGetter(options tool.Options) (getter Getter, err error) {
 		}
 		return &WebFanqiangdang{
 			c:         colly.NewCollector(),
-			NumNeeded: t,
 			Url:       url,
 		}, nil
 	}
@@ -64,7 +49,6 @@ func (w *WebFanqiangdang) Get() proxy.ProxyList {
 	w.c.OnHTML("th.new>a[href]", func(e *colly.HTMLElement) {
 		url := e.Attr("href")
 		if strings.HasPrefix(url, "https://fanqiangdang.com/thread") {
-			fmt.Println(url)
 			_ = e.Request.Visit(url)
 		}
 	})
@@ -94,19 +78,6 @@ type WebFanqiangdangRSS struct {
 }
 
 func NewWebFanqiangdangRSSGetter(options tool.Options) (getter Getter, err error) {
-	num, found := options["num"]
-
-	t := 200
-	switch num.(type) {
-	case int:
-		t = num.(int)
-	case float64:
-		t = int(num.(float64))
-	}
-
-	if !found || t <= 0 {
-		t = 200
-	}
 	urlInterface, found := options["url"]
 	if found {
 		url, err := AssertTypeStringNotNull(urlInterface)