Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

autosort.py 3.5: Add ${info:autosort_escape,...} hook. #341

Merged
merged 1 commit into from
Jun 6, 2019
Merged

autosort.py 3.5: Add ${info:autosort_escape,...} hook. #341

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions python/autosort.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@

#
# Changelog:
# 3.5:
# * Add ${info:autosort_escape,...} to escape arguments for other info hooks.
# 3.4:
# * Fix rate-limit of sorting to prevent high CPU load and lock-ups.
# * Fix bug in parsing empty arguments for info hooks.
Expand Down Expand Up @@ -76,7 +78,7 @@

SCRIPT_NAME = 'autosort'
SCRIPT_AUTHOR = 'Maarten de Vries <maarten@de-vri.es>'
SCRIPT_VERSION = '3.4'
SCRIPT_VERSION = '3.5'
SCRIPT_LICENSE = 'GPL3'
SCRIPT_DESC = 'Flexible automatic (or manual) buffer sorting based on eval expressions.'

Expand Down Expand Up @@ -184,7 +186,7 @@ class Config:
'irc_last': '${if:${buffer.plugin.name}==irc}',
'irc_raw_first': '${if:${buffer.full_name}!=irc.irc_raw}',
'irc_raw_last': '${if:${buffer.full_name}==irc.irc_raw}',
'hashless_name': '${info:autosort_replace,#,,${buffer.name}}',
'hashless_name': '${info:autosort_replace,#,,${info:autosort_escape,${buffer.name}}}',
})

default_signal_delay = 5
Expand Down Expand Up @@ -746,6 +748,17 @@ def parse_args(args, max = None):
if args is None: break
return result, args

def on_info_escape(pointer, name, arguments):
result = ''
for c in arguments:
if c == '\\':
result += '\\\\'
elif c == ',':
result += '\\,'
else:
result +=c
return result

def on_info_replace(pointer, name, arguments):
arguments, rest = parse_args(arguments, 3)
if rest or len(arguments) < 3:
Expand Down Expand Up @@ -973,6 +986,9 @@ def on_autosort_complete(data, name, buffer, completion):

command_completion = '%(plugin_autosort) %(plugin_autosort) %(plugin_autosort) %(plugin_autosort) %(plugin_autosort)'

info_escape_description = 'Escape commas and backslashes in the input so it can be passed as argument to other autosort info hooks.'
info_escape_arguments = 'text'

info_replace_description = 'Replace all occurences of `from` with `to` in the string `text`.'
info_replace_arguments = 'from,to,text'

Expand Down Expand Up @@ -1014,6 +1030,7 @@ def on_autosort_complete(data, name, buffer, completion):
weechat.hook_config('autosort.*', 'on_config_changed', '')
weechat.hook_completion('plugin_autosort', '', 'on_autosort_complete', '')
weechat.hook_command('autosort', command_description.format(**colors), '', '', command_completion, 'on_autosort_command', '')
weechat.hook_info('autosort_escape', info_escape_description, info_escape_arguments, 'on_info_escape', '')
weechat.hook_info('autosort_replace', info_replace_description, info_replace_arguments, 'on_info_replace', '')
weechat.hook_info('autosort_order', info_order_description, info_order_arguments, 'on_info_order', '')

Expand Down