移除txt导出格式

README.en.md

@@ -49,7 +49,7 @@ At present, OneForAll is still under development, there must be a lot of problem
 * **Support subdomain blasting**，This module has both conventional dictionary blasting and custom fuzz mode. It supports batch blasting and recursive blasting, and automatically judges pan-parsing and processing.
 * **Support subdmain verification**，default to enable subdomain verification, automatically resolve subdomain DNS, automatically request subdomain to obtain title and banner, and comprehensively determine subdomain survival.
 * **Support subdomain takeover**，By default, subdomain takeover risk checking is enabled. Automatic subdomain takeover is supported (only Github, remains to be improved at present), and batch inspection is supported.
-* **Powerful processing feature**，The found subdomain results support automatic removal, automatic DNS parsing, HTTP request detection, automatic filtering of valid subdomains, and expansion of Banner information for subdomains. The final supported export formats are `txt`, `rst`, `csv`, `tsv`, `json`, `yaml`, `html`, `xls`, `xlsx`, `dbf`, `latex`, `ods`.
+* **Powerful processing feature**，The found subdomain results support automatic removal, automatic DNS parsing, HTTP request detection, automatic filtering of valid subdomains, and expansion of Banner information for subdomains. The final supported export formats are `rst`, `csv`, `tsv`, `json`, `yaml`, `html`, `xls`, `xlsx`, `dbf`, `latex`, `ods`.
 * **Very fast**，[collection module](https://github.com/shmilylty/OneForAll/tree/master/oneforall//collect.py) uses multithreaded calls, [blasting module](https://github.com/shmilylty/OneForAll/tree/master/oneforall/aiobrute.py) uses asynchronous multiprocess and multiprogramming, and DNS parsing and HTTP requests use asynchronous multiprogramming in subdomain verification. Multithreaded check [subdomain takeover](https://github.com/shmilylty/OneForAll/tree/master/oneforall/takeover.py) risk.
 * **Good experience**，Each module has a progress bar, and the results of each module are saved asynchronously.
 
@@ -207,7 +207,7 @@ The OneForAll command line interface is based on [Fire](https://github.com/googl
            valid, invalid, and all subdomains, respectively.
            Parameter port have optional values 'default' 'small', 'large',
            See config.py configuration for details.
-           Parameter format have optional values 'txt', 'rst', 'csv', 'tsv', 'json', 
+           Parameter format have optional values 'rst', 'csv', 'tsv', 'json', 
            'yaml', 'html', 'jira', 'xls', 'xlsx', 'dbf', 'latex', 'ods'.
            If the parameter path is None, the appropriate file is generated in the 
            project result directory based on the format parameter and the domain 

README.md

@@ -49,7 +49,7 @@
 * **支持子域爆破**，该模块有常规的字典爆破，也有自定义的fuzz模式，支持批量爆破和递归爆破，自动判断泛解析并处理。
 * **支持子域验证**，默认开启子域验证，自动解析子域DNS，自动请求子域获取title和banner，并综合判断子域存活情况。
 * **支持子域接管**，默认开启子域接管风险检查，支持子域自动接管（目前只有Github，有待完善），支持批量检查。
-* **处理功能强大**，发现的子域结果支持自动去除，自动DNS解析，HTTP请求探测，自动筛选出有效子域，拓展子域的Banner信息，最终支持的导出格式有`txt`, `rst`, `csv`, `tsv`, `json`, `yaml`, `html`, `xls`, `xlsx`, `dbf`, `latex`, `ods`。
+* **处理功能强大**，发现的子域结果支持自动去除，自动DNS解析，HTTP请求探测，自动筛选出有效子域，拓展子域的Banner信息，最终支持的导出格式有`rst`, `csv`, `tsv`, `json`, `yaml`, `html`, `xls`, `xlsx`, `dbf`, `latex`, `ods`。
 * **速度极快**，[收集模块](https://github.com/shmilylty/OneForAll/tree/master/oneforall//collect.py)使用多线程调用，[爆破模块](https://github.com/shmilylty/OneForAll/tree/master/oneforall/aiobrute.py)使用异步多进程多协程，子域验证中DNS解析和HTTP请求使用异步多协程，多线程检查[子域接管](https://github.com/shmilylty/OneForAll/tree/master/oneforall/takeover.py)风险。
 * **体验良好**，日志和终端输出全使用中文，各模块都有进度条，异步保存各模块结果。
 
@@ -204,7 +204,7 @@ OneForAll命令行界面基于[Fire](https://github.com/google/python-fire/)实
         Note:
             参数valid可选值1，0，None分别表示导出有效，无效，全部子域
             参数port可选值有'default', 'small', 'large', 详见config.py配置
-            参数format可选格式有'txt', 'rst', 'csv', 'tsv', 'json', 'yaml', 'html',
+            参数format可选格式有'rst', 'csv', 'tsv', 'json', 'yaml', 'html',
                               'jira', 'xls', 'xlsx', 'dbf', 'latex', 'ods'
             参数path默认None使用OneForAll结果目录生成路径
 

oneforall/common/utils.py

@@ -185,7 +185,7 @@ def check_format(format, count):
     :param count: 数量
     :return: 导出格式
     """
-    formats = ['txt', 'rst', 'csv', 'tsv', 'json', 'yaml', 'html',
+    formats = ['rst', 'csv', 'tsv', 'json', 'yaml', 'html',
                'jira', 'xls', 'xlsx', 'dbf', 'latex', 'ods']
     if format == 'xls' and count > 65000:
         logger.log('ALERT', 'xls文件限制为最多65000行')

oneforall/dbexport.py

@@ -42,9 +42,6 @@ def export(table, db=None, valid=False, path=None, format='csv', show=False):
     path = utils.check_path(path, table, format)
     if show:
         print(rows.dataset)
-    if format == 'txt':
-        data = str(rows.dataset)
-    else:
     data = rows.export(format)
     database.close()
     utils.save_data(path, data)

oneforall/oneforall.py

@@ -63,7 +63,7 @@ class OneForAll(object):
     Note:
         # 参数valid可选值True，False分别表示导出有效，全部子域结果
         参数port可选值有'default', 'small', 'large', 详见config.py配置
-        参数format可选格式有'txt', 'rst', 'csv', 'tsv', 'json', 'yaml', 'html',
+        参数format可选格式有'rst', 'csv', 'tsv', 'json', 'yaml', 'html',
                           'jira', 'xls', 'xlsx', 'dbf', 'latex', 'ods'
         参数path默认None使用OneForAll结果目录自动生成路径