Merge pull request #1686 from sherlock-project/code-clean-up

Cleaned code to suite flake8's specifications
pull/1687/head
Siddharth Dushantha 2 years ago committed by GitHub
commit 5eb05ce265
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -6,7 +6,10 @@ results of queries.
from result import QueryStatus
from colorama import Fore, Style
import webbrowser
globvar = 0 # global variable to count the number of results.
# Global variable to count the number of results.
globvar = 0
class QueryNotify:
"""Query Notify Object.
@ -104,6 +107,7 @@ class QueryNotify:
"""
return str(self.result)
class QueryNotifyPrint(QueryNotify):
"""Query Notify Print Object.
@ -161,32 +165,6 @@ class QueryNotifyPrint(QueryNotify):
return
def finish(self, message="The processing has been finished."):
"""Notify Start.
Will print the last line to the standard output.
Keyword Arguments:
self -- This object.
message -- The last phrase.
Return Value:
Nothing.
"""
title = "End"
print('\r') # An empty line between last line of main output and last line(more clear output)
print(Style.BRIGHT + Fore.GREEN + "[" +
Fore.YELLOW + "!" +
Fore.GREEN + f"] {title}" +
Fore.GREEN + ": " +
Fore.WHITE + f" {message}" )
# An empty line between first line and the result(more clear output)
# return
def countResults(self):
"""This function counts the number of results. Every time the function is called,
the number of results is increasing.
@ -217,7 +195,7 @@ class QueryNotifyPrint(QueryNotify):
self.result = result
response_time_text = ""
if self.result.query_time is not None and self.verbose == True:
if self.result.query_time is not None and self.verbose is True:
response_time_text = f" [{round(self.result.query_time * 1000)}ms]"
# Output to the terminal is desired.
@ -232,7 +210,7 @@ class QueryNotifyPrint(QueryNotify):
Style.RESET_ALL +
f"{self.result.site_url_user}")
if self.browse:
webbrowser.open(self.result.site_url_user,2)
webbrowser.open(self.result.site_url_user, 2)
elif result.status == QueryStatus.AVAILABLE:
if self.print_all:
@ -250,7 +228,7 @@ class QueryNotifyPrint(QueryNotify):
Fore.WHITE + "]" +
Fore.GREEN + f" {self.result.site_name}:" +
Fore.RED + f" {self.result.context}" +
Fore.YELLOW + f" ")
Fore.YELLOW + " ")
elif result.status == QueryStatus.ILLEGAL:
if self.print_all:
@ -285,18 +263,17 @@ class QueryNotifyPrint(QueryNotify):
print(Style.BRIGHT + Fore.GREEN + "[" +
Fore.YELLOW + "*" +
Fore.GREEN + f"] {title}" +
Fore.WHITE + f" {NumberOfResults}" )
Fore.WHITE + f" {NumberOfResults}")
title = "End"
print('\r') # An empty line between last line of main output and last line(more clear output)
# An empty line between last line of main output and last line(more clear output)
print('\r')
print(Style.BRIGHT + Fore.GREEN + "[" +
Fore.YELLOW + "!" +
Fore.GREEN + f"] {title}" +
Fore.GREEN + ": " +
Fore.WHITE + f" {message}" )
# An empty line between first line and the result(more clear output)
Fore.WHITE + f" {message}")
return

@ -145,7 +145,7 @@ def interpolate_string(object, username):
def CheckForParameter(username):
'''checks if {?} exists in the username
if exist it means that sherlock is looking for more multiple username'''
return("{?}" in username)
return ("{?}" in username)
checksymbols = []
@ -671,7 +671,7 @@ def main():
all_usernames = []
for username in args.username:
if(CheckForParameter(username)):
if (CheckForParameter(username)):
for name in MultipleUsernames(username):
all_usernames.append(name)
else:
@ -747,10 +747,7 @@ def main():
http_status = []
response_time_s = []
for site in results:
if response_time_s is None:
response_time_s.append("")
else:
@ -762,11 +759,9 @@ def main():
exists.append(str(results[site]["status"].status))
http_status.append(results[site]["http_status"])
DataFrame=pd.DataFrame({"username":usernames , "name":names , "url_main":url_main , "url_user":url_user , "exists" : exists , "http_status":http_status , "response_time_s":response_time_s})
DataFrame = pd.DataFrame({"username": usernames, "name": names, "url_main": url_main, "url_user": url_user, "exists": exists, "http_status": http_status, "response_time_s": response_time_s})
DataFrame.to_excel(f'{username}.xlsx', sheet_name='sheet1', index=False)
print()
query_notify.finish()

@ -3,9 +3,9 @@
This module contains various tests.
"""
from tests.base import SherlockBaseTest
import unittest
import secrets
class SherlockDetectTests(SherlockBaseTest):
def test_detect_true_via_message(self):
"""Test Username Does Exist (Via Message).
@ -24,7 +24,7 @@ class SherlockDetectTests(SherlockBaseTest):
site = "AllMyLinks"
site_data = self.site_data_all[site]
#Ensure that the site's detection method has not changed.
# Ensure that the site's detection method has not changed.
self.assertEqual("message", site_data["errorType"])
self.username_check([site_data["username_claimed"]],
@ -51,7 +51,7 @@ class SherlockDetectTests(SherlockBaseTest):
site = "AllMyLinks"
site_data = self.site_data_all[site]
#Ensure that the site's detection method has not changed.
# Ensure that the site's detection method has not changed.
self.assertEqual("message", site_data["errorType"])
self.username_check([secrets.token_urlsafe(10)],
@ -78,7 +78,7 @@ class SherlockDetectTests(SherlockBaseTest):
site = "9GAG"
site_data = self.site_data_all[site]
#Ensure that the site's detection method has not changed.
# Ensure that the site's detection method has not changed.
self.assertEqual("status_code", site_data["errorType"])
self.username_check([site_data["username_claimed"]],
@ -105,7 +105,7 @@ class SherlockDetectTests(SherlockBaseTest):
site = "9GAG"
site_data = self.site_data_all[site]
#Ensure that the site's detection method has not changed.
# Ensure that the site's detection method has not changed.
self.assertEqual("status_code", site_data["errorType"])
self.username_check([secrets.token_urlsafe(10)],
@ -116,7 +116,6 @@ class SherlockDetectTests(SherlockBaseTest):
return
class SherlockSiteCoverageTests(SherlockBaseTest):
def test_coverage_false_via_response_url(self):
"""Test Username Does Not Exist Site Coverage (Via Response URL).

Loading…
Cancel
Save