@@ -64,6 +64,8 @@ def run():
64
64
elif keywords_input .lower () == "none" :
65
65
keywords_list = None
66
66
keywords_flag = 0
67
+ elif pagesearch_flag == 'N' :
68
+ keywords_flag = 0
67
69
report_filetype_lowered = report_filetype .lower ()
68
70
if report_filetype_lowered == 'pdf' or report_filetype_lowered == 'xlsx' :
69
71
if pagesearch_flag == 'Y' or pagesearch_flag == 'N' :
@@ -74,7 +76,10 @@ def run():
74
76
else :
75
77
pagesearch_ui_mark = 'Yes, without keywords search'
76
78
print (Fore .LIGHTMAGENTA_EX + "\n [PRE-SCAN SUMMARY]\n " + Style .RESET_ALL )
77
- print (Fore .GREEN + "Determined target: {}\n Case comment: {}\n Report file extension: {}\n PageSearch: {}\n " .format (short_domain , case_comment , report_filetype_lowered , pagesearch_ui_mark ) + Style .RESET_ALL )
79
+ print (Fore .GREEN + "Determined target: " + Fore .LIGHTCYAN_EX + Style .BRIGHT + short_domain + Style .RESET_ALL )
80
+ print (Fore .GREEN + "Report type: " + Fore .LIGHTCYAN_EX + Style .BRIGHT + report_filetype_lowered + Style .RESET_ALL )
81
+ print (Fore .GREEN + "PageSearch conduction: " + Fore .LIGHTCYAN_EX + Style .BRIGHT + pagesearch_ui_mark + Style .RESET_ALL )
82
+ print (Fore .GREEN + "Case comment: " + Fore .LIGHTCYAN_EX + Style .BRIGHT + case_comment + Style .RESET_ALL + "\n " )
78
83
print (Fore .LIGHTMAGENTA_EX + "[SCANNING PROCESS]\n " + Style .RESET_ALL )
79
84
spinner_thread = ProgressBar ()
80
85
spinner_thread .start ()
@@ -83,7 +88,7 @@ def run():
83
88
if pagesearch_flag == 'Y' :
84
89
data_array , report_info_array = data_processing .data_gathering (short_domain , url , report_filetype_lowered , pagesearch_flag .lower (), keywords_list , keywords_flag )
85
90
else :
86
- data_array , report_info_array = data_processing .data_gathering (short_domain , url , report_filetype_lowered , pagesearch_flag .lower (), '' )
91
+ data_array , report_info_array = data_processing .data_gathering (short_domain , url , report_filetype_lowered , pagesearch_flag .lower (), '' , keywords_flag )
87
92
pdf_rc .report_assembling (short_domain , url , case_comment , data_array , report_info_array )
88
93
finally :
89
94
spinner_thread .do_run = False
@@ -93,7 +98,7 @@ def run():
93
98
if pagesearch_flag == 'Y' :
94
99
data_array , report_info_array = data_processing .data_gathering (short_domain , url , report_filetype_lowered , pagesearch_flag .lower (), keywords_list , keywords_flag )
95
100
else :
96
- data_array , report_info_array = data_processing .data_gathering (short_domain , url , report_filetype_lowered , pagesearch_flag .lower (), '' )
101
+ data_array , report_info_array = data_processing .data_gathering (short_domain , url , report_filetype_lowered , pagesearch_flag .lower (), '' , keywords_flag )
97
102
xlsx_rc .create_report (short_domain , url , case_comment , data_array , report_info_array )
98
103
finally :
99
104
spinner_thread .do_run = False
0 commit comments