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

Remove unicode strings

Browse source
This commit is contained in:
JonnyWong16 2019-11-23 14:37:26 -08:00
commit c279057f91
28 changed files with 834 additions and 847 deletions
Download patch file Download diff file Expand all files Collapse all files

72
plexpy/plextv.py
View file

@ -31,7 +31,7 @@ import session
def get_server_resources(return_presence=False, return_server=False, **kwargs):
if not return_presence:
logger.info(u"Tautulli PlexTV :: Requesting resources for server...")
logger.info("Tautulli PlexTV :: Requesting resources for server...")
server = {'pms_name': plexpy.CONFIG.PMS_NAME,
'pms_version': plexpy.CONFIG.PMS_VERSION,
@ -97,17 +97,17 @@ def get_server_resources(return_presence=False, return_server=False, **kwargs):
conn = next((c for c in conns if c['address'] == server['pms_ip']
and c['port'] == str(server['pms_port'])), conns[0])
server['pms_url'] = conn['uri']
logger.info(u"Tautulli PlexTV :: Server URL retrieved.")
logger.info("Tautulli PlexTV :: Server URL retrieved.")
# get_server_urls() failed or PMS_URL not found, fallback url doesn't use SSL
if not server['pms_url']:
server['pms_url'] = fallback_url
logger.warn(u"Tautulli PlexTV :: Unable to retrieve server URLs. Using user-defined value without SSL.")
logger.warn("Tautulli PlexTV :: Unable to retrieve server URLs. Using user-defined value without SSL.")
# Not using SSL, remote has no effect
else:
server['pms_url'] = fallback_url
logger.info(u"Tautulli PlexTV :: Using user-defined URL.")
logger.info("Tautulli PlexTV :: Using user-defined URL.")
if return_server:
return server
@ -141,7 +141,7 @@ class PlexTV(object):
self.token = plexpy.CONFIG.PMS_TOKEN
if not self.token:
logger.error(u"Tautulli PlexTV :: PlexTV called, but no token provided.")
logger.error("Tautulli PlexTV :: PlexTV called, but no token provided.")
return
self.request_handler = http_handler.HTTPHandler(urls=self.urls,
@ -175,9 +175,9 @@ class PlexTV(object):
'user_id': xml_head[0].getAttribute('id')
}
else:
logger.warn(u"Tautulli PlexTV :: Could not get Plex authentication token.")
logger.warn("Tautulli PlexTV :: Could not get Plex authentication token.")
except Exception as e:
logger.warn(u"Tautulli PlexTV :: Unable to parse XML for get_token: %s." % e)
logger.warn("Tautulli PlexTV :: Unable to parse XML for get_token: %s." % e)
return None
return user
@ -186,27 +186,27 @@ class PlexTV(object):
def get_plexpy_pms_token(self, force=False):
if force:
logger.debug(u"Tautulli PlexTV :: Forcing refresh of Plex.tv token.")
logger.debug("Tautulli PlexTV :: Forcing refresh of Plex.tv token.")
devices_list = self.get_devices_list()
device_id = next((d for d in devices_list if d['device_identifier'] == plexpy.CONFIG.PMS_UUID), {}).get('device_id', None)
if device_id:
logger.debug(u"Tautulli PlexTV :: Removing Tautulli from Plex.tv devices.")
logger.debug("Tautulli PlexTV :: Removing Tautulli from Plex.tv devices.")
try:
self.delete_plextv_device(device_id=device_id)
except:
logger.error(u"Tautulli PlexTV :: Failed to remove Tautulli from Plex.tv devices.")
logger.error("Tautulli PlexTV :: Failed to remove Tautulli from Plex.tv devices.")
return None
else:
logger.warn(u"Tautulli PlexTV :: No existing Tautulli device found.")
logger.warn("Tautulli PlexTV :: No existing Tautulli device found.")
logger.info(u"Tautulli PlexTV :: Fetching a new Plex.tv token for Tautulli.")
logger.info("Tautulli PlexTV :: Fetching a new Plex.tv token for Tautulli.")
user = self.get_token()
if user:
token = user['auth_token']
plexpy.CONFIG.__setattr__('PMS_TOKEN', token)
plexpy.CONFIG.write()
logger.info(u"Tautulli PlexTV :: Updated Plex.tv token for Tautulli.")
logger.info("Tautulli PlexTV :: Updated Plex.tv token for Tautulli.")
return token
@ -217,7 +217,7 @@ class PlexTV(object):
try:
xml_head = servers.getElementsByTagName('Device')
except Exception as e:
logger.warn(u"Tautulli PlexTV :: Unable to parse XML for get_server_token: %s." % e)
logger.warn("Tautulli PlexTV :: Unable to parse XML for get_server_token: %s." % e)
return None
for a in xml_head:
@ -257,11 +257,11 @@ class PlexTV(object):
}
return pin
else:
logger.warn(u"Tautulli PlexTV :: Could not get Plex authentication pin.")
logger.warn("Tautulli PlexTV :: Could not get Plex authentication pin.")
return None
except Exception as e:
logger.warn(u"Tautulli PlexTV :: Unable to parse XML for get_pin: %s." % e)
logger.warn("Tautulli PlexTV :: Unable to parse XML for get_pin: %s." % e)
return None
else:
@ -388,7 +388,7 @@ class PlexTV(object):
try:
xml_head = own_account.getElementsByTagName('user')
except Exception as e:
logger.warn(u"Tautulli PlexTV :: Unable to parse own account XML for get_full_users_list: %s." % e)
logger.warn("Tautulli PlexTV :: Unable to parse own account XML for get_full_users_list: %s." % e)
return []
for a in xml_head:
@ -415,7 +415,7 @@ class PlexTV(object):
try:
xml_head = friends_list.getElementsByTagName('User')
except Exception as e:
logger.warn(u"Tautulli PlexTV :: Unable to parse friends list XML for get_full_users_list: %s." % e)
logger.warn("Tautulli PlexTV :: Unable to parse friends list XML for get_full_users_list: %s." % e)
return []
for a in xml_head:
@ -439,7 +439,7 @@ class PlexTV(object):
try:
xml_head = shared_servers.getElementsByTagName('SharedServer')
except Exception as e:
logger.warn(u"Tautulli PlexTV :: Unable to parse shared server list XML for get_full_users_list: %s." % e)
logger.warn("Tautulli PlexTV :: Unable to parse shared server list XML for get_full_users_list: %s." % e)
return []
user_map = {}
@ -484,7 +484,7 @@ class PlexTV(object):
try:
xml_head = sync_list.getElementsByTagName('SyncList')
except Exception as e:
logger.warn(u"Tautulli PlexTV :: Unable to parse XML for get_synced_items: %s." % e)
logger.warn("Tautulli PlexTV :: Unable to parse XML for get_synced_items: %s." % e)
return {}
for a in xml_head:
@ -596,13 +596,13 @@ class PlexTV(object):
return session.filter_session_info(synced_items, filter_key='user_id')
def delete_sync(self, client_id, sync_id):
logger.info(u"Tautulli PlexTV :: Deleting sync item '%s'." % sync_id)
logger.info("Tautulli PlexTV :: Deleting sync item '%s'." % sync_id)
self.delete_plextv_sync(client_id=client_id, sync_id=sync_id)
def get_server_connections(self, pms_identifier='', pms_ip='', pms_port=32400, include_https=True):
if not pms_identifier:
logger.error(u"Tautulli PlexTV :: Unable to retrieve server connections: no pms_identifier provided.")
logger.error("Tautulli PlexTV :: Unable to retrieve server connections: no pms_identifier provided.")
return {}
plextv_resources = self.get_plextv_resources(include_https=include_https,
@ -610,7 +610,7 @@ class PlexTV(object):
try:
xml_head = plextv_resources.getElementsByTagName('Device')
except Exception as e:
logger.warn(u"Tautulli PlexTV :: Unable to parse XML for get_server_urls: %s." % e)
logger.warn("Tautulli PlexTV :: Unable to parse XML for get_server_urls: %s." % e)
return {}
# Function to get all connections for a device
@ -671,7 +671,7 @@ class PlexTV(object):
try:
xml_head = servers.getElementsByTagName('Server')
except Exception as e:
logger.warn(u"Tautulli PlexTV :: Unable to parse XML for get_server_times: %s." % e)
logger.warn("Tautulli PlexTV :: Unable to parse XML for get_server_times: %s." % e)
return {}
for a in xml_head:
@ -713,7 +713,7 @@ class PlexTV(object):
try:
xml_head = servers.getElementsByTagName('MediaContainer')
except Exception as e:
logger.warn(u"Tautulli PlexTV :: Failed to get servers from plex: %s." % e)
logger.warn("Tautulli PlexTV :: Failed to get servers from plex: %s." % e)
return []
for a in xml_head:
@ -773,20 +773,20 @@ class PlexTV(object):
return clean_servers
def get_plex_downloads(self):
logger.debug(u"Tautulli PlexTV :: Retrieving current server version.")
logger.debug("Tautulli PlexTV :: Retrieving current server version.")
pms_connect = pmsconnect.PmsConnect()
pms_connect.set_server_version()
update_channel = pms_connect.get_server_update_channel()
logger.debug(u"Tautulli PlexTV :: Plex update channel is %s." % update_channel)
logger.debug("Tautulli PlexTV :: Plex update channel is %s." % update_channel)
plex_downloads = self.get_plextv_downloads(plexpass=(update_channel == 'beta'))
try:
available_downloads = json.loads(plex_downloads)
except Exception as e:
logger.warn(u"Tautulli PlexTV :: Unable to load JSON for get_plex_updates.")
logger.warn("Tautulli PlexTV :: Unable to load JSON for get_plex_updates.")
return {}
# Get the updates for the platform
@ -795,7 +795,7 @@ class PlexTV(object):
available_downloads.get('nas').get(pms_platform)
if not platform_downloads:
logger.error(u"Tautulli PlexTV :: Unable to retrieve Plex updates: Could not match server platform: %s."
logger.error("Tautulli PlexTV :: Unable to retrieve Plex updates: Could not match server platform: %s."
% pms_platform)
return {}
@ -803,11 +803,11 @@ class PlexTV(object):
v_new = helpers.cast_to_int("".join(v.zfill(4) for v in platform_downloads.get('version', '').split('-')[0].split('.')[:4]))
if not v_old:
logger.error(u"Tautulli PlexTV :: Unable to retrieve Plex updates: Invalid current server version: %s."
logger.error("Tautulli PlexTV :: Unable to retrieve Plex updates: Invalid current server version: %s."
% plexpy.CONFIG.PMS_VERSION)
return {}
if not v_new:
logger.error(u"Tautulli PlexTV :: Unable to retrieve Plex updates: Invalid new server version: %s."
logger.error("Tautulli PlexTV :: Unable to retrieve Plex updates: Invalid new server version: %s."
% platform_downloads.get('version'))
return {}
@ -838,7 +838,7 @@ class PlexTV(object):
try:
subscription = account_data.getElementsByTagName('subscription')
except Exception as e:
logger.warn(u"Tautulli PlexTV :: Unable to parse XML for get_plexpass_status: %s." % e)
logger.warn("Tautulli PlexTV :: Unable to parse XML for get_plexpass_status: %s." % e)
return False
if subscription and helpers.get_xml_attr(subscription[0], 'active') == '1':
@ -846,7 +846,7 @@ class PlexTV(object):
plexpy.CONFIG.write()
return True
else:
logger.debug(u"Tautulli PlexTV :: Plex Pass subscription not found.")
logger.debug("Tautulli PlexTV :: Plex Pass subscription not found.")
plexpy.CONFIG.__setattr__('PMS_PLEXPASS', 0)
plexpy.CONFIG.write()
return False
@ -857,7 +857,7 @@ class PlexTV(object):
try:
xml_head = devices.getElementsByTagName('Device')
except Exception as e:
logger.warn(u"Tautulli PlexTV :: Unable to parse XML for get_devices_list: %s." % e)
logger.warn("Tautulli PlexTV :: Unable to parse XML for get_devices_list: %s." % e)
return []
devices_list = []
@ -885,7 +885,7 @@ class PlexTV(object):
try:
status_info = cloud_status.getElementsByTagName('info')
except Exception as e:
logger.warn(u"Tautulli PlexTV :: Unable to parse XML for get_cloud_server_status: %s." % e)
logger.warn("Tautulli PlexTV :: Unable to parse XML for get_cloud_server_status: %s." % e)
return False
for info in status_info:
@ -903,7 +903,7 @@ class PlexTV(object):
try:
xml_head = account_data.getElementsByTagName('user')
except Exception as e:
logger.warn(u"Tautulli PlexTV :: Unable to parse XML for get_plex_account_details: %s." % e)
logger.warn("Tautulli PlexTV :: Unable to parse XML for get_plex_account_details: %s." % e)
return None
for a in xml_head: