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

Fix SSL url discovery bug.

Browse source
This commit is contained in:
Tim 2015-07-24 23:44:17 +02:00
commit dc86297ee5
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
plexpy/plextv.py
View file

@ -50,6 +50,8 @@ def get_real_pms_url():
plexpy.CONFIG.__setattr__('PMS_URL', '') plexpy.CONFIG.__setattr__('PMS_URL', '')
plexpy.CONFIG.write() plexpy.CONFIG.write()
fallback_url = 'http://' + plexpy.CONFIG.PMS_IP + ':' + str(plexpy.CONFIG.PMS_PORT)
if plexpy.CONFIG.PMS_SSL: if plexpy.CONFIG.PMS_SSL:
result = PlexTV().get_server_urls(include_https=True) result = PlexTV().get_server_urls(include_https=True)
process_urls = True process_urls = True
@ -57,27 +59,25 @@ def get_real_pms_url():
result = PlexTV().get_server_urls(include_https=False) result = PlexTV().get_server_urls(include_https=False)
process_urls = True process_urls = True
else: else:
real_url = 'http://' + plexpy.CONFIG.PMS_IP + ':' + str(plexpy.CONFIG.PMS_PORT)
process_urls = False process_urls = False
if process_urls: if process_urls:
if len(result) > 0: if len(result) > 0:
for item in result: for item in result:
if plexpy.CONFIG.PMS_IS_REMOTE and item['local'] == '0': if plexpy.CONFIG.PMS_IS_REMOTE and item['local'] == '0':
real_url = item['uri'] plexpy.CONFIG.__setattr__('PMS_URL', item['uri'])
else: plexpy.CONFIG.write()
real_url = item['uri'] logger.info("Server URL retrieved.")
if not plexpy.CONFIG.PMS_IS_REMOTE and item['local'] == '1':
plexpy.CONFIG.__setattr__('PMS_URL', real_url) plexpy.CONFIG.__setattr__('PMS_URL', item['uri'])
plexpy.CONFIG.write() plexpy.CONFIG.write()
logger.info("Server URL retrieved.") logger.info("Server URL retrieved.")
else: else:
fallback_url = 'http://' + plexpy.CONFIG.PMS_IP + ':' + str(plexpy.CONFIG.PMS_PORT)
plexpy.CONFIG.__setattr__('PMS_URL', fallback_url) plexpy.CONFIG.__setattr__('PMS_URL', fallback_url)
plexpy.CONFIG.write() plexpy.CONFIG.write()
logger.warn("Unable to retrieve server URLs. Using user-defined value.") logger.warn("Unable to retrieve server URLs. Using user-defined value.")
else: else:
plexpy.CONFIG.__setattr__('PMS_URL', real_url) plexpy.CONFIG.__setattr__('PMS_URL', fallback_url)
plexpy.CONFIG.write() plexpy.CONFIG.write()
class PlexTV(object): class PlexTV(object):