Merge branch 'master' into master

Author: wh0am1i

setup.py

@@ -24,7 +24,7 @@
     long_description=README,
     long_description_content_type='text/markdown',
     author='404 Team@Knownsec',
-    url='https://github.com/knownsec/zoomeye-python',
+    url='https://github.com/knownsec/zoomeye-python',  #
     packages=['zoomeye'],
     entry_points={'console_scripts': ['zoomeye=zoomeye.cli:main']},
     install_requires=DEPENDENCIES,

zoomeye/config.py

@@ -13,19 +13,19 @@
 
 seconds_of_fiveday = 60 * 60 * 24 * 5
 
-# save api key file and json web token file path
+# save api key file and json web token file path 保存API密钥文件和json web令牌文件路径
 ZOOMEYE_CONFIG_PATH = "~/.config/zoomeye/setting"
 
-# save search dork data path
+# save search dork data path 保存搜索节点数据路径
 ZOOMEYE_CACHE_PATH = "~/.config/zoomeye/cache"
 
-# cache expired time, five day
+# cache expired time, five day 缓存过期时间，5天
 EXPIRED_TIME = seconds_of_fiveday
 
-# print data max length
+# print data max length 打印数据
 STRING_MAX_LENGTH = 23
 
-# cache file name
+# cache file name缓存文件名
 FILE_NAME = "/{}_{}.json"
 
 

zoomeye/core.py

@@ -61,7 +61,7 @@ def init(args):
         init_key(api_key)
         return
     # invalid parameter
-    show.printf("input parameter error", color="red")
+    show.printf("input parameter error!", color="red")
     show.printf("please run <zoomeye init -h> for help.", color="red")
 
 

zoomeye/plotlib.py

@@ -12,12 +12,12 @@
 """
 import sys
 import math
-
+import re
 
 from zoomeye import config
 
 
-def char_by_atan(stat, at, color):
+def char_by_atan(stat, at, color):#用于根据给定的百分比值(at)和颜色(color)，返回相应的字符，用于绘制饼状图的每个部分
     """
     :param stat: list, all data and label
     :param at: float, percentage
@@ -31,7 +31,7 @@ def char_by_atan(stat, at, color):
     return char_by_atan(stat[1:], at - stat[0][1], color[1:])
 
 
-def show_pie_chart(stat):
+def show_pie_chart(stat):#用于显示饼状图
     """
     print pie chart in terminal
     :param stat: list, all data and label
@@ -65,7 +65,7 @@ def show_pie_chart(stat):
         count += 1
 
 
-def unicode_output():
+def unicode_output():#用于检查当前的标准输出是否支持Unicode
     """
     unicode standard output
     """
@@ -75,7 +75,7 @@ def unicode_output():
     )
 
 
-def trim_zeros(lst):
+def trim_zeros(lst):#用于去除列表(lst)末尾的零元素
     """
 
     """
@@ -87,7 +87,7 @@ def trim_zeros(lst):
     return lst[:-k] if k > 0 else lst
 
 
-def get_matrix(counts, max_size, bar_width):
+def get_matrix(counts, max_size, bar_width):#用于生成直方图的矩阵表示，用于绘制直方图
     """
     get the length of the histogram corresponding to each data
     :param counts: list, all data
@@ -117,7 +117,7 @@ def get_matrix(counts, max_size, bar_width):
     return out
 
 
-def generate_histogram(values, labels=None, force_ascii=False):
+def generate_histogram(values, labels=None, force_ascii=False):#用于生成直方图
     """
     print histogram in terminal
     take the largest data as the standard, that is, the largest data is the longest
@@ -134,20 +134,20 @@ def generate_histogram(values, labels=None, force_ascii=False):
     else:
         chars = [" ", "#", "#", "#", "#", "#", "#", "#", "#"]
 
-    ft = []
+    fmt = []
     if labels is not None:
         cfmt = "{{:{}s}}".format(max([len(str(label)) for label in labels]))
-        ft.append(cfmt)
+        fmt.append(cfmt)
     # show values
     all_int = all(val == int(val) for val in values)
     if all_int:
         cfmt = "{{:{}d}}".format(max([len(str(val)) for val in values]))
     else:
         cfmt = "{}"
-    ft.append("[" + cfmt + "]")
+    fmt.append("[" + cfmt + "]")
 
-    ft.append("{}")
-    ft = "  ".join(ft)
+    fmt.append("{}")
+    fmt = "  ".join(fmt)
 
     out = []
     for k, (val, row) in enumerate(zip(values, matrix)):
@@ -159,7 +159,7 @@ def generate_histogram(values, labels=None, force_ascii=False):
         # cut off trailing zeros
         r = trim_zeros(row)
         data.append("".join(chars[item] for item in r))
-        out.append(ft.format(*data))
+        out.append(fmt.format(*data))
     for item in out:
         print(' ' + item)
 

zoomeye/show.py

@@ -32,8 +32,8 @@ def printf(s, color="white"):
     }
 
     # default color
-    default = '\033[0m'  # item default color
-    print('{}{}{}'.format(colors.get(color, "WHITE"), s, default))
+    Default = '\033[0m'  # item default color
+    print('{}{}{}'.format(colors.get(color, "WHITE"), s, Default))
 
 
 def print_filter(keys, data_list, data_total, condition=None):