diff --git a/XMLConverter.py b/XMLConverter.py index 9de3616e5..5de2e7477 100755 --- a/XMLConverter.py +++ b/XMLConverter.py @@ -322,18 +322,13 @@ def XML_PMS2aTV(PMS_baseURL, path, options): elif path.startswith('/search?'): XMLtemplate = 'Search_Results.xml' - elif path=='/library/sections': + elif path=='/library/sections': # from PlexConnect.xml -> for //local, //myplex XMLtemplate = 'Library.xml' - path = '' elif path=='/channels/all': XMLtemplate = 'Channels.xml' path = '' - elif path=='/myplex': - XMLtemplate = 'MyPlex.xml' - path = '' - # request PMS XML if not path=='': if 'PlexConnectUDID' in options: @@ -343,7 +338,13 @@ def XML_PMS2aTV(PMS_baseURL, path, options): else: auth_token = '' - PMS = PlexAPI.getXMLFromPMS(PMS_baseURL, path, options, authtoken=auth_token) + if PMS_baseURL.startswith('//'): # //local, //myplex + UDID = options['PlexConnectUDID'] + type = PMS_baseURL[2:] + PMS = PlexAPI.getXMLFromMultiplePMS(UDID, path, type, options) + else: + PMS = PlexAPI.getXMLFromPMS(PMS_baseURL, path, options, authtoken=auth_token) + if PMS==False: return XML_Error('PlexConnect', 'No Response from Plex Media Server') diff --git a/assets/templates/Library.xml b/assets/templates/Library.xml index 3209d308d..f728caee6 100755 --- a/assets/templates/Library.xml +++ b/assets/templates/Library.xml @@ -4,8 +4,6 @@ - {{ADDXML(LocalSections:://local/library/sections)}} - {{VAR(sections:NoKey:FALSE)}} @@ -19,13 +17,13 @@ - {{COPY(@LocalSections/Server:size::0=|1=COPY)}} + {{COPY(Server:size::0=|1=COPY)}}
{{VAL(name)}} -
{{CUT(@LocalSections/size:CUT:0=CUT|1=CUT|2=)}} + {{CUT(size:CUT:0=CUT|1=CUT|2=)}} diff --git a/assets/templates/MyPlex.xml b/assets/templates/MyPlex.xml deleted file mode 100755 index 4c65926bb..000000000 --- a/assets/templates/MyPlex.xml +++ /dev/null @@ -1,67 +0,0 @@ - - -