|
|
@ -254,6 +254,39 @@ class Apprise(object):
|
|
|
|
# Apply Markdown
|
|
|
|
# Apply Markdown
|
|
|
|
conversion_map[server.notify_format] = markdown(body)
|
|
|
|
conversion_map[server.notify_format] = markdown(body)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
elif body_format == NotifyFormat.TEXT and \
|
|
|
|
|
|
|
|
server.notify_format == NotifyFormat.HTML:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Basic TEXT to HTML format map; supports keys only
|
|
|
|
|
|
|
|
re_map = {
|
|
|
|
|
|
|
|
# Support Ampersand
|
|
|
|
|
|
|
|
r'&': '&',
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Spaces to for formatting purposes since
|
|
|
|
|
|
|
|
# multiple spaces are treated as one an this may not
|
|
|
|
|
|
|
|
# be the callers intention
|
|
|
|
|
|
|
|
r' ': ' ',
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Tab support
|
|
|
|
|
|
|
|
r'\t': ' ',
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Greater than and Less than Characters
|
|
|
|
|
|
|
|
r'>': '>',
|
|
|
|
|
|
|
|
r'<': '<',
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Compile our map
|
|
|
|
|
|
|
|
re_table = re.compile(
|
|
|
|
|
|
|
|
r'(' + '|'.join(map(re.escape, re_map.keys())) + r')',
|
|
|
|
|
|
|
|
re.IGNORECASE,
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Execute our map against our body in addition to swapping
|
|
|
|
|
|
|
|
# out new lines and replacing them with <br/>
|
|
|
|
|
|
|
|
conversion_map[server.notify_format] = \
|
|
|
|
|
|
|
|
re.sub(r'\r*\n', '<br/>\r\n',
|
|
|
|
|
|
|
|
re_table.sub(lambda x: re_map[x.group()], body))
|
|
|
|
|
|
|
|
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
# Store entry directly
|
|
|
|
# Store entry directly
|
|
|
|
conversion_map[server.notify_format] = body
|
|
|
|
conversion_map[server.notify_format] = body
|
|
|
|