Skip to content

Commit cb48933

Browse files
OSINT-TECHNOLOGIESOSINT-TECHNOLOGIES
authored
Code cleaned-up, minor cosmetical fixes
1 parent 8c1630b commit cb48933

File tree

1 file changed

+19
-21
lines changed

1 file changed

+19
-21
lines changed

‎dpulse.py

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -45,68 +45,66 @@ def run():
4545
cli.print_main_menu()
4646
choice = input(Fore.YELLOW + "Enter your choice >> ")
4747
if choice == "1":
48-
print('\n')
4948
while True:
5049
short_domain = input(Fore.YELLOW + "\nEnter target's domain name (or 'back' to return to the menu) >> ")
5150
if short_domain.lower() == "back":
5251
print(Fore.RED + "\nReturned to main menu")
5352
break
5453
else:
5554
url = "http://" + short_domain + "/"
56-
case_comment = input(Fore.YELLOW + "Enter case comment (or enter '-' if you don't need comment to the case) >> ")
55+
case_comment = input(Fore.YELLOW + "Enter case comment >> ")
5756
report_filetype = input(Fore.YELLOW + "Enter report file extension [xlsx/pdf] >> ")
5857
pagesearch_flag = input(Fore.YELLOW + "Would you like to use PageSearch [BETA] function? [Y/N] >> ")
59-
if pagesearch_flag == 'Y':
58+
if pagesearch_flag.lower() == 'y':
6059
keywords_input = input(Fore.YELLOW + "Enter keywords (separate by comma) to search in files during PageSearch process (or write None if you don't need it) >> ")
6160
if keywords_input.lower() != "none":
6261
keywords_list = [keyword.strip() for keyword in keywords_input.split(',')]
6362
keywords_flag = 1
6463
elif keywords_input.lower() == "none":
6564
keywords_list = None
6665
keywords_flag = 0
67-
elif pagesearch_flag == 'N':
66+
elif pagesearch_flag.lower() == 'n':
6867
keywords_flag = 0
69-
report_filetype_lowered = report_filetype.lower()
70-
if report_filetype_lowered == 'pdf' or report_filetype_lowered == 'xlsx':
71-
if pagesearch_flag == 'Y' or pagesearch_flag == 'N':
72-
if pagesearch_flag == "N":
68+
if report_filetype.lower() == 'pdf' or report_filetype.lower() == 'xlsx':
69+
if pagesearch_flag.lower() == 'y' or pagesearch_flag.lower() == 'n':
70+
if pagesearch_flag.lower() == "n":
7371
pagesearch_ui_mark = 'No'
74-
elif pagesearch_flag == 'Y' and keywords_flag == 1:
72+
elif pagesearch_flag.lower() == 'y' and keywords_flag == 1:
7573
pagesearch_ui_mark = f'Yes, with {keywords_list} keywords search'
7674
else:
7775
pagesearch_ui_mark = 'Yes, without keywords search'
7876
print(Fore.LIGHTMAGENTA_EX + "\n[PRE-SCAN SUMMARY]\n" + Style.RESET_ALL)
7977
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)
78+
print(Fore.GREEN + "Report type: " + Fore.LIGHTCYAN_EX + Style.BRIGHT + report_filetype.lower() + Style.RESET_ALL)
8179
print(Fore.GREEN + "PageSearch conduction: " + Fore.LIGHTCYAN_EX + Style.BRIGHT + pagesearch_ui_mark + Style.RESET_ALL)
8280
print(Fore.GREEN + "Case comment: " + Fore.LIGHTCYAN_EX + Style.BRIGHT + case_comment + Style.RESET_ALL + "\n")
8381
print(Fore.LIGHTMAGENTA_EX + "[SCANNING PROCESS]\n" + Style.RESET_ALL)
8482
spinner_thread = ProgressBar()
8583
spinner_thread.start()
86-
if report_filetype_lowered == 'pdf':
84+
if report_filetype.lower() == 'pdf':
8785
try:
88-
if pagesearch_flag == 'Y':
89-
data_array, report_info_array = data_processing.data_gathering(short_domain, url, report_filetype_lowered, pagesearch_flag.lower(), keywords_list, keywords_flag)
86+
if pagesearch_flag.lower() == 'y':
87+
data_array, report_info_array = data_processing.data_gathering(short_domain, url, report_filetype.lower(), pagesearch_flag.lower(), keywords_list, keywords_flag)
9088
else:
91-
data_array, report_info_array = data_processing.data_gathering(short_domain, url, report_filetype_lowered, pagesearch_flag.lower(), '', keywords_flag)
89+
data_array, report_info_array = data_processing.data_gathering(short_domain, url, report_filetype.lower(), pagesearch_flag.lower(), '', keywords_flag)
9290
pdf_rc.report_assembling(short_domain, url, case_comment, data_array, report_info_array, pagesearch_ui_mark)
9391
finally:
9492
spinner_thread.do_run = False
9593
spinner_thread.join()
96-
elif report_filetype_lowered == 'xlsx':
94+
elif report_filetype.lower() == 'xlsx':
9795
try:
98-
if pagesearch_flag == 'Y':
99-
data_array, report_info_array = data_processing.data_gathering(short_domain, url, report_filetype_lowered, pagesearch_flag.lower(), keywords_list, keywords_flag)
96+
if pagesearch_flag.lower() == 'y':
97+
data_array, report_info_array = data_processing.data_gathering(short_domain, url, report_filetype.lower(), pagesearch_flag.lower(), keywords_list, keywords_flag)
10098
else:
101-
data_array, report_info_array = data_processing.data_gathering(short_domain, url, report_filetype_lowered, pagesearch_flag.lower(), '', keywords_flag)
99+
data_array, report_info_array = data_processing.data_gathering(short_domain, url, report_filetype.lower(), pagesearch_flag.lower(), '', keywords_flag)
102100
xlsx_rc.create_report(short_domain, url, case_comment, data_array, report_info_array, pagesearch_ui_mark)
103101
finally:
104102
spinner_thread.do_run = False
105103
spinner_thread.join()
106104
else:
107-
print(Fore.RED + "Unsupported PageSearch mode. Please choose between Y, N")
105+
print(Fore.RED + "Unsupported PageSearch mode. Please choose between Y and N")
108106
else:
109-
print(Fore.RED + "Unsupported report file extension. Please choose between xlsx or pdf.")
107+
print(Fore.RED + "Unsupported report file extension. Please choose between XLSX and PDF")
110108

111109
elif choice == "2":
112110
cli.print_settings_menu()
@@ -154,7 +152,7 @@ def run():
154152
pass
155153
else:
156154
print(Fore.LIGHTMAGENTA_EX + "\n[DATABASE'S CONTENT]\n" + Style.RESET_ALL)
157-
cursor, sqlite_connection = db.db_select()
155+
db.db_select()
158156
id_to_extract = int(input(Fore.YELLOW + "\nEnter report ID you want to extract >> "))
159157
extracted_folder_name = 'report_recreated_ID#{}'.format(id_to_extract)
160158
try:

0 commit comments

Comments
 (0)