adil
/
BlueDucky-2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved logging

This commit is contained in:
D4MI4NX 2024-08-21 19:32:52 +02:00
parent 7a2704284a
commit f6f016a4cc
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
BlueDucky.py
View File

@ -51,6 +51,8 @@ def setup_logging():
# Set the logging level to INFO to filter out DEBUG messages # Set the logging level to INFO to filter out DEBUG messages
logging.basicConfig(level=logging.INFO, handlers=[handler]) logging.basicConfig(level=logging.INFO, handlers=[handler])
def print_error(msg):
print(f"{color.RESET}[{color.RED}!{color.RESET}] {color.RED}CRITICAL ERROR{color.RESET}:{color.RESET}", msg)
class ConnectionFailureException(Exception): class ConnectionFailureException(Exception):
pass pass
@ -263,12 +265,10 @@ class L2CAPClient:
error = True error = True
self.connected = False self.connected = False
log.error("ERROR connecting on port %d: %s" % (self.port, ex)) log.error("ERROR connecting on port %d: %s" % (self.port, ex))
raise ConnectionFailureException(f"Connection failure on port {self.port}")
if (error == True & self.port == 14): if (error == True & self.port == 14):
print(f"{color.RESET}[{color.RED}!{color.RESET}] {color.RED}CRITICAL ERROR{color.RESET}: {color.RESET}Attempted Connection to {color.RED}{target_address} {color.RESET}was {color.RED}denied{color.RESET}.") print_error(f"{color.RESET}Attempted Connection to {color.RED}{target_address} {color.RESET}was {color.RED}denied{color.RESET}.")
return self.connected return self.connected
raise ConnectionFailureException(f"Connection failure on port {self.port}")
return self.connected return self.connected
@ -632,20 +632,19 @@ def troubleshoot_bluetooth():
try: try:
subprocess.run(['bluetoothctl', '--version'], check=True, stdout=subprocess.PIPE) subprocess.run(['bluetoothctl', '--version'], check=True, stdout=subprocess.PIPE)
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
print(f"{color.RESET}[{color.RED}!{color.RESET}] {color.RED}CRITICAL{color.RESET}: {color.BLUE}bluetoothctl {color.RESET}is not installed or not working properly.") print_error(f"{color.BLUE}bluetoothctl {color.RESET}is not installed or not working properly.")
return False return False
# Check for Bluetooth adapters # Check for Bluetooth adapters
result = subprocess.run(['bluetoothctl', 'list'], capture_output=True, text=True) result = subprocess.run(['bluetoothctl', 'list'], capture_output=True, text=True)
if "Controller" not in result.stdout: if "Controller" not in result.stdout:
print(f"{color.RESET}[{color.RED}!{color.RESET}] {color.RED}CRITICAL{color.RESET}: No {color.BLUE}Bluetooth adapters{color.RESET} have been detected.") print_error(f"No {color.BLUE}Bluetooth adapters{color.RESET} have been detected.")
return False return False
# List devices to see if any are connected # List devices to see if any are connected
result = subprocess.run(['bluetoothctl', 'devices'], capture_output=True, text=True) result = subprocess.run(['bluetoothctl', 'devices'], capture_output=True, text=True)
if "Device" not in result.stdout: if "Device" not in result.stdout:
print(f"{color.RESET}[{color.RED}!{color.RESET}] {color.YELLOW}WARNING{color.RESET}: Your {color.BLUE}Bluetooth devices{color.RESET} might not be supported.") log.warning(f"{color.RESET}Your {color.BLUE}Bluetooth devices{color.RESET} might not be supported.")
time.sleep(2)
return True return True
@ -716,7 +715,7 @@ def main():
finally: finally:
# unpair the target device # unpair the target device
command = f'echo -e "remove {target_address}\n" | bluetoothctl' command = f'echo -e "\nremove {target_address}\n" | bluetoothctl'
subprocess.run(command, shell=True) subprocess.run(command, shell=True)
print(f"{color.BLUE}Successfully Removed device{color.RESET}: {color.BLUE}{target_address}{color.RESET}") print(f"{color.BLUE}Successfully Removed device{color.RESET}: {color.BLUE}{target_address}{color.RESET}")