模块优化

modules/search/google.py

@@ -12,13 +12,12 @@ class Google(Search):
         self.init = 'https://www.google.com/'
         self.addr = 'https://www.google.com/search'
 
-    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: 全量搜索
         """
         page_num = 1
         per_page_num = 50
@@ -38,13 +37,8 @@ class Google(Search):
             payload = {'q': word, 'start': page_num, 'num': per_page_num,
                        'filter': '0', 'btnG': 'Search', 'gbv': '1', 'hl': 'en'}
             resp = self.get(url=self.addr, params=payload)
-            if not resp:
-                return
-            subdomains = self.match_subdomains(resp.text, fuzzy=False)
-            if not subdomains:
-                break
-            if not full_search and subdomains.issubset(self.subdomains):
-                # 在全搜索中发现搜索出的结果有完全重复的结果就停止搜索
+            subdomains = self.match_subdomains(resp, fuzzy=False)
+            if not self.check_subdomains(subdomains):
                 break
             self.subdomains = self.subdomains.union(subdomains)
             page_num += per_page_num
@@ -59,7 +53,7 @@ class Google(Search):
         """
         self.begin()
 
-        self.search(self.domain, full_search=True)
+        self.search(self.domain)
 
         # 排除同一子域搜索结果过多的子域以发现新的子域
         for statement in self.filter(self.domain, self.subdomains):
@@ -67,13 +61,8 @@ class Google(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()