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

Fix get_server_friendly_name

Browse source
This commit is contained in:
Jonathan Wong 2015-11-16 22:51:21 -08:00
parent 69a3b5134f
commit 1983597cf1
4 changed files with 22 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plexpy/__init__.py
View file

@ -169,7 +169,7 @@ def initialize(config_file):
# Get the real PMS urls for SSL and remote access # Get the real PMS urls for SSL and remote access
if CONFIG.PMS_TOKEN and CONFIG.PMS_IP and CONFIG.PMS_PORT: if CONFIG.PMS_TOKEN and CONFIG.PMS_IP and CONFIG.PMS_PORT:
plextv.get_real_pms_url() plextv.get_real_pms_url()
pmsconnect.PmsConnect().get_server_friendly_name() pmsconnect.get_server_friendly_name()
# Refresh the users list on startup # Refresh the users list on startup
if CONFIG.PMS_TOKEN and CONFIG.REFRESH_USERS_ON_STARTUP: if CONFIG.PMS_TOKEN and CONFIG.REFRESH_USERS_ON_STARTUP:
@ -283,7 +283,7 @@ def initialize_scheduler():
if CONFIG.PMS_IP and CONFIG.PMS_TOKEN: if CONFIG.PMS_IP and CONFIG.PMS_TOKEN:
schedule_job(plextv.get_real_pms_url, 'Refresh Plex Server URLs', schedule_job(plextv.get_real_pms_url, 'Refresh Plex Server URLs',
hours=12, minutes=0, seconds=0) hours=12, minutes=0, seconds=0)
schedule_job(pmsconnect.PmsConnect().get_server_friendly_name, 'Refresh Plex Server Name', schedule_job(pmsconnect.get_server_friendly_name, 'Refresh Plex Server Name',
hours=12, minutes=0, seconds=0) hours=12, minutes=0, seconds=0)
schedule_job(activity_pinger.check_recently_added, 'Check for recently added items', schedule_job(activity_pinger.check_recently_added, 'Check for recently added items',
hours=0, minutes=0, seconds=seconds) hours=0, minutes=0, seconds=seconds)

4
plexpy/notification_handler.py
View file

@ -261,12 +261,10 @@ def set_notify_state(session, state, agent_info):
def build_notify_text(session=None, timeline=None, state=None): def build_notify_text(session=None, timeline=None, state=None):
from plexpy import pmsconnect, helpers
import re import re
# Get the server name # Get the server name
pms_connect = pmsconnect.PmsConnect() server_name = plexpy.CONFIG.PMS_NAME
server_name = pms_connect.get_server_friendly_name()
# Get metadata feed for item # Get metadata feed for item
if session: if session:

37
plexpy/pmsconnect.py
View file

@ -19,6 +19,23 @@ from urlparse import urlparse
import plexpy import plexpy
import urllib2 import urllib2
def get_server_friendly_name():
logger.info("Requesting name from server...")
server_name = PmsConnect().get_server_pref(pref='FriendlyName')
# If friendly name is blank
if not server_name:
servers_info = PmsConnect().get_servers_info()
for server in servers_info:
if server['machine_identifier'] == plexpy.CONFIG.PMS_IDENTIFIER:
server_name = server['name']
break
if server_name and server_name != plexpy.CONFIG.PMS_NAME:
plexpy.CONFIG.__setattr__('PMS_NAME', server_name)
plexpy.CONFIG.write()
return server_name
class PmsConnect(object): class PmsConnect(object):
""" """
@ -1631,22 +1648,4 @@ class PmsConnect(object):
'children': parents} 'children': parents}
} }
return key_list return key_list
def get_server_friendly_name(self):
server_name = self.get_server_pref(pref='FriendlyName')
# If friendly name is blank
if not server_name:
servers_info = self.get_servers_info()
for server in servers_info:
if server['machine_identifier'] == plexpy.CONFIG.PMS_IDENTIFIER:
server_name = server['name']
break
if server_name != plexpy.CONFIG.PMS_NAME:
plexpy.CONFIG.__setattr__('PMS_NAME', server_name)
plexpy.CONFIG.write()
return server_name

3
plexpy/webserve.py
View file

@ -1143,8 +1143,7 @@ class WebInterface(object):
@cherrypy.expose @cherrypy.expose
def get_server_friendly_name(self, **kwargs): def get_server_friendly_name(self, **kwargs):
pms_connect = pmsconnect.PmsConnect() result = pmsconnect.get_server_friendly_name()
result = pms_connect.get_server_friendly_name()
if result: if result:
cherrypy.response.headers['Content-type'] = 'application/json' cherrypy.response.headers['Content-type'] = 'application/json'