python/jc
1
0
Fork 0
mirror of https://github.com/kellyjonbrazil/jc.git synced 2025-06-19 00:17:51 +02:00
Code Issues Releases Activity

set magic_run_command_str in magic_parser

Browse Source
This commit is contained in:
Kelly Brazil
2022-10-04 11:48:36 -07:00
parent f652ccd4b1
commit d7684d39a8
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
jc/cli.py
View File

@ -414,12 +414,20 @@ class JcCli():
for entry in all_parser_info(): for entry in all_parser_info():
magic_dict.update({mc: entry['argument'] for mc in entry.get('magic_commands', [])}) magic_dict.update({mc: entry['argument'] for mc in entry.get('magic_commands', [])})
# find the command and parser # set the command list and string
self.magic_run_command = args_given self.magic_run_command = args_given
one_word_command = args_given[0]
two_word_command = ' '.join(args_given[0:2]) if self.magic_run_command:
try:
# python 3.8+
self.magic_run_command_str = shlex.join(self.magic_run_command)
except AttributeError:
# older python versions
self.magic_run_command_str = ' '.join(self.magic_run_command)
# try to get a parser for two_word_command, otherwise get one for one_word_command # try to get a parser for two_word_command, otherwise get one for one_word_command
one_word_command = self.magic_run_command[0]
two_word_command = ' '.join(self.magic_run_command[0:2])
self.magic_found_parser = magic_dict.get(two_word_command, magic_dict.get(one_word_command)) self.magic_found_parser = magic_dict.get(two_word_command, magic_dict.get(one_word_command))
@staticmethod @staticmethod
@ -452,14 +460,6 @@ class JcCli():
Supports running magic commands or opening /proc files to set the Supports running magic commands or opening /proc files to set the
output to magic_stdout. output to magic_stdout.
""" """
if self.magic_run_command:
try:
# python 3.8+
self.magic_run_command_str = shlex.join(self.magic_run_command)
except AttributeError:
# older python versions
self.magic_run_command_str = ' '.join(self.magic_run_command)
if self.magic_run_command_str.startswith('/proc'): if self.magic_run_command_str.startswith('/proc'):
try: try:
self.magic_found_parser = 'proc' self.magic_found_parser = 'proc'