blue
/
thefuck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix logs.py

This commit is contained in:
DashBing 2023-08-20 17:24:53 +08:00
parent 6991f14896
commit 7ed875861d
No known key found for this signature in database
GPG Key ID: D6ABB0FFF55D5230
1 changed files with 75 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
thefuck/logs.py
View File

@ -18,22 +18,29 @@ def color(color_):
def warn(title):
sys.stderr.write(u'{warn}[WARN] {title}{reset}\n'.format(
warn=color(colorama.Back.RED + colorama.Fore.WHITE
+ colorama.Style.BRIGHT),
reset=color(colorama.Style.RESET_ALL),
title=title))
sys.stderr.write(
u'{warn}[WARN] {title}{reset}\n'.format(
warn = color(colorama.Back.RED + colorama.Fore.WHITE
+ colorama.Style.BRIGHT),
reset = color(colorama.Style.RESET_ALL),
title = title
)
)
def exception(title, exc_info):
sys.stderr.write(
u'{warn}[WARN] {title}:{reset}\n{trace}'
u'{warn}----------------------------{reset}\n\n'.format(
warn=color(colorama.Back.RED + colorama.Fore.WHITE
+ colorama.Style.BRIGHT),
reset=color(colorama.Style.RESET_ALL),
title=title,
trace=''.join(format_exception(*exc_info))))
warn = color(
colorama.Back.RED + colorama.Fore.WHITE
+ colorama.Style.BRIGHT
),
reset = color(colorama.Style.RESET_ALL),
title = title,
trace = ''.join(format_exception(*exc_info))
)
)
def rule_failed(rule, exc_info):
@ -41,44 +48,57 @@ def rule_failed(rule, exc_info):
def failed(msg):
sys.stderr.write(u'{red}{msg}{reset}\n'.format(
msg=msg,
red=color(colorama.Fore.RED),
reset=color(colorama.Style.RESET_ALL)))
sys.stderr.write(
u'{red}{msg}{reset}\n'.format(
msg = msg,
red = color(colorama.Fore.RED),
reset = color(colorama.Style.RESET_ALL)
)
)
def show_corrected_command(corrected_command):
sys.stderr.write(u'{prefix}{bold}{script}{reset}{side_effect}\n'.format(
prefix=const.USER_COMMAND_MARK,
script=corrected_command.script,
side_effect=u' (+side effect)' if corrected_command.side_effect else u'',
bold=color(colorama.Style.BRIGHT),
reset=color(colorama.Style.RESET_ALL)))
sys.stderr.write(
u'{prefix}{bold}{script}{reset}{side_effect}\n'.format(
prefix = const.USER_COMMAND_MARK,
script = corrected_command.script,
side_effect = u' (+side effect)' if corrected_command.side_effect else u'',
bold = color(colorama.Style.BRIGHT),
reset = color(colorama.Style.RESET_ALL)
)
)
def confirm_text(corrected_command):
sys.stderr.write(
(u'{prefix}{clear}{bold}{script}{reset}{side_effect} '
u'[{green}enter{reset}/{blue}↑{reset}/{blue}↓{reset}'
u'/{red}ctrl+c{reset}]').format(
prefix=const.USER_COMMAND_MARK,
script=corrected_command.script,
side_effect=' (+side effect)' if corrected_command.side_effect else '',
clear='\033[1K\r',
bold=color(colorama.Style.BRIGHT),
green=color(colorama.Fore.GREEN),
red=color(colorama.Fore.RED),
reset=color(colorama.Style.RESET_ALL),
blue=color(colorama.Fore.BLUE)))
(
u'{prefix}{clear}{bold}{script}{reset}{side_effect} '
u'[{green}enter{reset}/{blue}↑{reset}/{blue}↓{reset}'
u'/{red}ctrl+c{reset}]'
).format(
prefix = const.USER_COMMAND_MARK,
script = corrected_command.script,
side_effect = ' (+side effect)' if corrected_command.side_effect else '',
clear = '\033[1K\r',
bold = color(colorama.Style.BRIGHT),
green = color(colorama.Fore.GREEN),
red = color(colorama.Fore.RED),
reset = color(colorama.Style.RESET_ALL),
blue = color(colorama.Fore.BLUE)
)
)
def debug(msg):
if settings.debug:
sys.stderr.write(u'{blue}{bold}DEBUG:{reset} {msg}\n'.format(
msg=msg,
reset=color(colorama.Style.RESET_ALL),
blue=color(colorama.Fore.BLUE),
bold=color(colorama.Style.BRIGHT)))
sys.stderr.write(
u'{blue}{bold}DEBUG:{reset} {msg}\n'.format(
msg = msg,
reset = color(colorama.Style.RESET_ALL),
blue = color(colorama.Fore.BLUE),
bold = color(colorama.Style.BRIGHT)
)
)
@contextmanager
@ -91,9 +111,12 @@ def debug_time(msg):
def how_to_configure_alias(configuration_details):
print(u"Seems like {bold}fuck{reset} alias isn't configured!".format(
bold=color(colorama.Style.BRIGHT),
reset=color(colorama.Style.RESET_ALL)))
print(
u"Seems like {bold}fuck{reset} alias isn't configured!".format(
bold=color(colorama.Style.BRIGHT),
reset=color(colorama.Style.RESET_ALL)
)
)
if configuration_details:
print(
@ -102,14 +125,18 @@ def how_to_configure_alias(configuration_details):
u"changes with {bold}{reload}{reset} or restart your shell.".format(
bold=color(colorama.Style.BRIGHT),
reset=color(colorama.Style.RESET_ALL),
**configuration_details._asdict()))
**configuration_details._asdict()
)
)
if configuration_details.can_configure_automatically:
print(
u"Or run {bold}fuck{reset} a second time to configure"
u" it automatically.".format(
bold=color(colorama.Style.BRIGHT),
reset=color(colorama.Style.RESET_ALL)))
reset=color(colorama.Style.RESET_ALL)
)
)
print(u'More details - https://github.com/nvbn/thefuck#manual-installation')
@ -121,7 +148,9 @@ def already_configured(configuration_details):
u" or restart your shell.".format(
bold=color(colorama.Style.BRIGHT),
reset=color(colorama.Style.RESET_ALL),
reload=configuration_details.reload))
reload=configuration_details.reload
)
)
def configured_successfully(configuration_details):
@ -131,7 +160,9 @@ def configured_successfully(configuration_details):
u" or restart your shell.".format(
bold=color(colorama.Style.BRIGHT),
reset=color(colorama.Style.RESET_ALL),
reload=configuration_details.reload))
reload=configuration_details.reload
)
)
def version(thefuck_version, python_version, shell_info):