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

Fix scripts to work with both Python 2 and 3

Browse source
This commit is contained in:
JonnyWong16 2020-04-02 00:03:41 -07:00
parent b9f614c66f
commit 573ff3f2a6
2 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

9
plexpy/helpers.py
View file

@ -18,7 +18,6 @@
from __future__ import division from __future__ import division
from __future__ import unicode_literals from __future__ import unicode_literals
from past.builtins import cmp from past.builtins import cmp
from future import standard_library
from future.builtins import zip from future.builtins import zip
from future.builtins import str from future.builtins import str
@ -1262,8 +1261,12 @@ def split_args(args=None):
if isinstance(args, list): if isinstance(args, list):
return args return args
elif isinstance(args, str): elif isinstance(args, str):
return [arg.decode(plexpy.SYS_ENCODING, 'ignore') if plexpy.PYTHON_VERSION < 3:
for arg in shlex.split(args.encode(plexpy.SYS_ENCODING, 'ignore'))] args = args.encode('utf-8')
args = shlex.split(args)
if plexpy.PYTHON_VERSION < 3:
args = [a.decode('utf-8') for a in args]
return args
return [] return []

35
plexpy/notifiers.py
View file

@ -2796,8 +2796,7 @@ class SCRIPTS(Notifier):
def run_script(self, script, user_id): def run_script(self, script, user_id):
# Common environment variables # Common environment variables
env = os.environ.copy() custom_env = {
env.update({
'PLEX_URL': plexpy.CONFIG.PMS_URL, 'PLEX_URL': plexpy.CONFIG.PMS_URL,
'PLEX_TOKEN': plexpy.CONFIG.PMS_TOKEN, 'PLEX_TOKEN': plexpy.CONFIG.PMS_TOKEN,
'PLEX_USER_TOKEN': '', 'PLEX_USER_TOKEN': '',
@ -2805,15 +2804,21 @@ class SCRIPTS(Notifier):
'TAUTULLI_PUBLIC_URL': plexpy.CONFIG.HTTP_BASE_URL + plexpy.HTTP_ROOT, 'TAUTULLI_PUBLIC_URL': plexpy.CONFIG.HTTP_BASE_URL + plexpy.HTTP_ROOT,
'TAUTULLI_APIKEY': plexpy.CONFIG.API_KEY, 'TAUTULLI_APIKEY': plexpy.CONFIG.API_KEY,
'TAUTULLI_ENCODING': plexpy.SYS_ENCODING 'TAUTULLI_ENCODING': plexpy.SYS_ENCODING
}) }
if user_id: if user_id:
user_tokens = users.Users().get_tokens(user_id=user_id) user_tokens = users.Users().get_tokens(user_id=user_id)
if user_tokens and user_tokens['server_token']: if user_tokens and user_tokens['server_token']:
env['PLEX_USER_TOKEN'] = str(user_tokens['server_token']) custom_env['PLEX_USER_TOKEN'] = str(user_tokens['server_token'])
if self.pythonpath: if self.pythonpath:
env['PYTHONPATH'] = os.pathsep.join([p for p in sys.path if p]) custom_env['PYTHONPATH'] = os.pathsep.join([p for p in sys.path if p])
if plexpy.PYTHON_VERSION < 3:
custom_env = {k.encode('utf-8'): v.encode('utf-8') for k, v in custom_env.items()}
env = os.environ.copy()
env.update(custom_env)
try: try:
process = subprocess.Popen(script, process = subprocess.Popen(script,
@ -2843,11 +2848,11 @@ class SCRIPTS(Notifier):
return False return False
if error: if error:
err = '\n '.join([l for l in error.splitlines()]) err = '\n '.join(error.decode('utf-8').splitlines())
logger.error("Tautulli Notifiers :: Script error: \n %s" % err) logger.error("Tautulli Notifiers :: Script error: \n %s" % err)
if output: if output:
out = '\n '.join([l for l in output.splitlines()]) out = '\n '.join(output.decode('utf-8').splitlines())
logger.debug("Tautulli Notifiers :: Script returned: \n %s" % out) logger.debug("Tautulli Notifiers :: Script returned: \n %s" % out)
if not self.script_killed: if not self.script_killed:
@ -2890,24 +2895,11 @@ class SCRIPTS(Notifier):
name, ext = os.path.splitext(script) name, ext = os.path.splitext(script)
prefix = self.script_exts.get(ext, '') prefix = self.script_exts.get(ext, '')
if os.name == 'nt':
script = script.encode(plexpy.SYS_ENCODING, 'ignore')
if prefix: if prefix:
script = prefix.split() + [script] script = prefix.split() + [script]
else: else:
script = [script] script = [script]
# For manual notifications
# if script_args and isinstance(script_args, basestring):
# # attemps for format it for the user
# script_args = [arg for arg in shlex.split(script_args.encode(plexpy.SYS_ENCODING, 'ignore'))]
# Windows handles unicode very badly.
# https://bugs.python.org/issue19264
if script_args: # and os.name == 'nt':
script_args = [arg.encode(plexpy.SYS_ENCODING, 'ignore') for arg in script_args]
# Allow overrides for PYTHONPATH # Allow overrides for PYTHONPATH
if prefix and script_args: if prefix and script_args:
if script_args[0] == self.pythonpath_override: if script_args[0] == self.pythonpath_override:
@ -2922,6 +2914,9 @@ class SCRIPTS(Notifier):
script.extend(script_args) script.extend(script_args)
if plexpy.PYTHON_VERSION < 3:
script = [s.encode(plexpy.SYS_ENCODING, 'ignore') for s in script]
logger.debug("Tautulli Notifiers :: Full script is: %s" % script) logger.debug("Tautulli Notifiers :: Full script is: %s" % script)
logger.debug("Tautulli Notifiers :: Executing script in a new thread.") logger.debug("Tautulli Notifiers :: Executing script in a new thread.")
thread = threading.Thread(target=self.run_script, args=(script, user_id)).start() thread = threading.Thread(target=self.run_script, args=(script, user_id)).start()