github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-11 15:56:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Helper function for splitting script args

Browse source
This commit is contained in:
JonnyWong16 2018-08-27 20:56:32 -07:00
parent f0e2355231
commit ae2584b6f6
3 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plexpy/notification_handler.py
View file

@ -23,7 +23,6 @@ import json
from operator import itemgetter
import os
import re
import shlex
from string import Formatter
import threading
import time
@ -337,12 +336,7 @@ def notify(notifier_id=None, notify_action=None, stream_data=None, timeline_data
if notify_action in ('test', 'api'):
subject = kwargs.pop('subject', 'Tautulli')
body = kwargs.pop('body', 'Test Notification')
script_args = kwargs.pop('script_args', [])
if script_args and isinstance(script_args, basestring):
# Attemps to format test script args for the user
script_args = [arg.decode(plexpy.SYS_ENCODING, 'ignore')
for arg in shlex.split(script_args.encode(plexpy.SYS_ENCODING, 'ignore'))]
script_args = helpers.split_args(kwargs.pop('script_args', []))
else:
# Get the subject and body strings
@ -1050,8 +1044,7 @@ def build_notify_text(subject='', body='', notify_action=None, parameters=None,
if agent_id == 15:
try:
script_args = [custom_formatter.format(arg.decode(plexpy.SYS_ENCODING, 'ignore'), **parameters)
for arg in shlex.split(subject.encode(plexpy.SYS_ENCODING, 'ignore'))]
script_args = [custom_formatter.format(arg, **parameters) for arg in helpers.split_args(subject)]
except LookupError as e:
logger.error(u"Tautulli NotificationHandler :: Unable to parse parameter %s in script argument. Using fallback." % e)
script_args = []