模块优化

modules/search/yahoo.py

@@ -14,13 +14,12 @@ class Yahoo(Search):
         self.delay = 2
         self.per_page_num = 30  # Yahoo每次搜索最大条数
 
-    def search(self, domain, filtered_subdomain='', full_search=False):
+    def search(self, domain, filtered_subdomain=''):
         """
         发送搜索请求并做子域匹配
 
         :param str domain: 域名
         :param str filtered_subdomain: 过滤的子域
-        :param bool full_search: 全量搜索
         """
         resp = self.get(self.init)
         if not resp:
@@ -37,10 +36,7 @@ class Yahoo(Search):
                 return
             text = resp.text.replace('<b>', '').replace('</b>', '')
             subdomains = self.match_subdomains(text, fuzzy=False)
-            if not subdomains:  # 搜索没有发现子域名则停止搜索
-                break
-            if not full_search and subdomains.issubset(self.subdomains):
-                # 在全搜索过程中发现搜索出的结果有完全重复的结果就停止搜索
+            if not self.check_subdomains(subdomains):
                 break
             self.subdomains = self.subdomains.union(subdomains)
             if '>Next</a>' not in resp.text:  # 搜索页面没有出现下一页时停止搜索
@@ -54,8 +50,7 @@ class Yahoo(Search):
         类执行入口
         """
         self.begin()
-
-        self.search(self.domain, full_search=True)
+        self.search(self.domain)
 
         # 排除同一子域搜索结果过多的子域以发现新的子域
         for statement in self.filter(self.domain, self.subdomains):
@@ -63,13 +58,8 @@ class Yahoo(Search):
 
         # 递归搜索下一层的子域
         if self.recursive_search:
-            # 从1开始是之前已经做过1层子域搜索了,当前实际递归层数是layer+1
-            for layer_num in range(1, self.recursive_times):
-                for subdomain in self.subdomains:
-                    # 进行下一层子域搜索的限制条件
-                    count = subdomain.count('.') - self.domain.count('.')
-                    if count == layer_num:
-                        self.search(subdomain)
+            for subdomain in self.recursive_subdomain():
+                self.search(subdomain)
         self.finish()
         self.save_json()
         self.gen_result()