Skip to content

Commit 9146a5a

Browse files
Updated dpulse.py [fixed bug when DPULSE process cant end if PageSearch was set to N]
1 parent 94d9d58 commit 9146a5a

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

dpulse.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ def run():
5656
case_comment = input(Fore.YELLOW + "Enter case comment (or enter '-' if you don't need comment to the case) >> ")
5757
report_filetype = input(Fore.YELLOW + "Enter report file extension [xlsx/pdf] >> ")
5858
pagesearch_flag = input(Fore.YELLOW + "Would you like to use PageSearch [BETA] function? [Y/N] >> ")
59+
if pagesearch_flag == 'Y':
60+
keywords_input = input(Fore.YELLOW + "Enter keywords to search in files during PageSearch process >> ")
61+
keywords_list = [keyword.strip() for keyword in keywords_input.split(',')]
5962
report_filetype_lowered = report_filetype.lower()
6063
if report_filetype_lowered == 'pdf' or report_filetype_lowered == 'xlsx':
6164
if pagesearch_flag == 'Y' or pagesearch_flag == 'N':
@@ -66,20 +69,26 @@ def run():
6669
spinner_thread.start()
6770
if report_filetype_lowered == 'pdf':
6871
try:
69-
data_array, report_info_array = data_processing.data_gathering(short_domain, url, report_filetype_lowered, pagesearch_flag.lower())
72+
if pagesearch_flag == 'Y':
73+
data_array, report_info_array = data_processing.data_gathering(short_domain, url, report_filetype_lowered, pagesearch_flag.lower(), keywords_list)
74+
else:
75+
data_array, report_info_array = data_processing.data_gathering(short_domain, url, report_filetype_lowered, pagesearch_flag.lower(), '')
7076
pdf_rc.report_assembling(short_domain, url, case_comment, data_array, report_info_array)
7177
finally:
7278
spinner_thread.do_run = False
7379
spinner_thread.join()
7480
elif report_filetype_lowered == 'xlsx':
7581
try:
76-
data_array, report_info_array = data_processing.data_gathering(short_domain, url, report_filetype_lowered, pagesearch_flag.lower())
82+
if pagesearch_flag == 'Y':
83+
data_array, report_info_array = data_processing.data_gathering(short_domain, url, report_filetype_lowered, pagesearch_flag.lower(), keywords_list)
84+
else:
85+
data_array, report_info_array = data_processing.data_gathering(short_domain, url, report_filetype_lowered, pagesearch_flag.lower(), '')
7786
xlsx_rc.create_report(short_domain, url, case_comment, data_array, report_info_array)
7887
finally:
7988
spinner_thread.do_run = False
8089
spinner_thread.join()
8190
else:
82-
print(Fore.RED + "Unsupported IntelliSearch mode. Please choose between Y, N")
91+
print(Fore.RED + "Unsupported PageSearch mode. Please choose between Y, N")
8392
else:
8493
print(Fore.RED + "Unsupported report file extension. Please choose between xlsx or pdf.")
8594

0 commit comments

Comments
 (0)