github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-19 12:59:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Allow override for PYTHONPATH in scripts

Browse source
This commit is contained in:
JonnyWong16 2018-08-15 20:17:48 -07:00
commit 53b361d410
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
plexpy/notifiers.py
View file

@ -2985,7 +2985,9 @@ class SCRIPTS(Notifier):
'.sh': '' '.sh': ''
} }
self.arg_overrides = ('python2', 'python3', 'python', 'pythonw', 'php', 'ruby', 'perl') self.pythonpath_override = 'nopythonpath'
self.pythonpath = True
self.prefix_overrides = ('python2', 'python3', 'python', 'pythonw', 'php', 'ruby', 'perl')
self.script_killed = False self.script_killed = False
def list_scripts(self): def list_scripts(self):
@ -3013,10 +3015,12 @@ class SCRIPTS(Notifier):
'PLEX_TOKEN': plexpy.CONFIG.PMS_TOKEN, 'PLEX_TOKEN': plexpy.CONFIG.PMS_TOKEN,
'TAUTULLI_URL': helpers.get_plexpy_url(hostname='localhost'), 'TAUTULLI_URL': helpers.get_plexpy_url(hostname='localhost'),
'TAUTULLI_APIKEY': plexpy.CONFIG.API_KEY, 'TAUTULLI_APIKEY': plexpy.CONFIG.API_KEY,
'TAUTULLI_ENCODING': plexpy.SYS_ENCODING, 'TAUTULLI_ENCODING': plexpy.SYS_ENCODING
'PYTHONPATH': os.pathsep.join([p for p in sys.path if p])
}) })
if self.pythonpath:
env['PYTHONPATH'] = os.pathsep.join([p for p in sys.path if p])
try: try:
process = subprocess.Popen(script, process = subprocess.Popen(script,
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
@ -3108,9 +3112,15 @@ class SCRIPTS(Notifier):
if script_args: # and os.name == 'nt': if script_args: # and os.name == 'nt':
script_args = [arg.encode(plexpy.SYS_ENCODING, 'ignore') for arg in script_args] script_args = [arg.encode(plexpy.SYS_ENCODING, 'ignore') for arg in script_args]
# Allow overrides for PYTHONPATH
if prefix and script_args:
if script_args[0] == self.pythonpath_override:
self.pythonpath = False
del script_args[0]
# Allow overrides for shitty systems # Allow overrides for shitty systems
if prefix and script_args: if prefix and script_args:
if script_args[0] in self.arg_overrides: if script_args[0] in self.prefix_overrides:
script[0] = script_args[0] script[0] = script_args[0]
del script_args[0] del script_args[0]