Narcissus/meshbook
2
0
Fork 0
mirror of https://github.com/DaanSelen/meshbook.git synced 2026-02-20 08:22:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: catch wrong keywords better

Browse Source
This commit is contained in:
DaanSelen
2026-01-02 15:54:04 +01:00
parent a652ea99d3
commit cd10645056
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
meshbook.py
View File

@@ -259,18 +259,22 @@ async def main():
Console.print_text(args.silent, "Writing to file...") Console.print_text(args.silent, "Writing to file...")
history.write_history(formatted_history) history.write_history(formatted_history)
await session.close()
except OSError as message: except OSError as message:
Console.print_text(args.silent, Console.print_text(
Console.text_color.red + f'{message}') args.silent,
Console.text_color.red + f'{message}'
)
except asyncio.CancelledError: except asyncio.CancelledError:
Console.print_text(args.silent, Console.print_text(
Console.text_color.red + "Received SIGINT, Aborting - (Tasks may still be running on targets).") args.silent,
await session.close() Console.text_color.red + "Received SIGINT, Aborting - (Tasks may still be running on targets)."
)
raise raise
finally:
await session.close()
if __name__ == "__main__": if __name__ == "__main__":
try: try:
asyncio.run(main()) asyncio.run(main())

22
modules/utilities.py
View File

@@ -117,7 +117,12 @@ class Utilities:
) )
case {"groups": pseudo_target}: case {"groups": pseudo_target}:
if isinstance(pseudo_target, list): if isinstance(pseudo_target, str) or (isinstance(pseudo_target, list) and len(pseudo_target) == 1):
Console.print_text(
silent,
Console.text_color.yellow + "The 'groups' key is being used, but only one group seems to be given. Did you mean 'group'?"
)
elif isinstance(pseudo_target, list):
for sub_group in pseudo_target: for sub_group in pseudo_target:
sub_group = sub_group.lower() sub_group = sub_group.lower()
if sub_group in group_list: if sub_group in group_list:
@@ -125,11 +130,6 @@ class Utilities:
elif isinstance(pseudo_target, str) and pseudo_target.lower() == "all": elif isinstance(pseudo_target, str) and pseudo_target.lower() == "all":
for group in group_list.values(): for group in group_list.values():
await process_group_helper(group) await process_group_helper(group)
elif isinstance(pseudo_target, str):
Console.print_text(
silent,
Console.text_color.yellow + "The 'groups' key is being used, but only one string is given. Did you mean 'group'?"
)
else: else:
Console.print_text( Console.print_text(
silent, silent,
@@ -151,14 +151,14 @@ class Utilities:
) )
case {"devices": pseudo_target}: case {"devices": pseudo_target}:
if isinstance(pseudo_target, list): if isinstance(pseudo_target, str) or (isinstance(pseudo_target, list) and len(pseudo_target) == 1):
for sub_device in pseudo_target:
await process_device_helper(sub_device)
elif isinstance(pseudo_target, str):
Console.print_text( Console.print_text(
silent, silent,
Console.text_color.yellow + "The 'devices' key is being used, but only one string is given. Did you mean 'device'?" Console.text_color.yellow + "The 'devices' key is being used, but only one device seems to be given. Did you mean 'device'?"
) )
elif isinstance(pseudo_target, list):
for sub_device in pseudo_target:
await process_device_helper(sub_device)
else: else:
Console.print_text( Console.print_text(
silent, silent,