allow aTV to request from multiple PMSs: /PMS(//<type>) - recombine M…

…yPlex into Library.xml - enable search on shared servers
atti187 · Nov 8, 2013 · c813dd4 · c813dd4
1 parent a2aa155
commit c813dd4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 80 deletions.
diff --git 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
@@ -4,8 +4,6 @@
   </head>
 
   <body>
-    {{ADDXML(LocalSections:://local/library/sections)}}
-
     {{VAR(sections:NoKey:FALSE)}}  <!--this sets the var to FALSE-->
 
     <listWithPreview id="com.sample.menu-items-with-sections">
@@ -19,13 +17,13 @@
 
           <!-- local servers -->
           <menuSection>
-          {{COPY(@LocalSections/Server:size::0=|1=COPY)}}
+          {{COPY(Server:size::0=|1=COPY)}}
 
             <header>
               <horizontalDivider alignment="left">
                 <title>{{VAL(name)}}</title>
               </horizontalDivider>
-            </header>{{CUT(@LocalSections/size:CUT:0=CUT|1=CUT|2=)}}
+            </header>{{CUT(size:CUT:0=CUT|1=CUT|2=)}}
 
             <items>
               <!-- /library/sections -->

diff --git a/assets/templates/MyPlex.xml b/assets/templates/MyPlex.xml
diff --git a/assets/templates/PlexConnect.xml b/assets/templates/PlexConnect.xml
@@ -8,15 +8,15 @@
       <navigation>
         <navigationItem id="Library">
           <title>{{TEXT(Library)}}</title>
-          <url>{{URL(:/library/sections)}}</url>
+          <url>{{URL(:/PMS(//local)/library/sections)}}</url>
         </navigationItem>
         <navigationItem id="Channels">
           <title>{{TEXT(Channels)}}</title>
           <url>{{URL(:/channels/all)}}</url>
         </navigationItem>
         <navigationItem id="MyPlex">
           <title>{{TEXT(MyPlex)}}</title>
-          <url>{{URL(:/myplex)}}</url>
+          <url>{{URL(:/PMS(//myplex)/library/sections)}}</url>
         </navigationItem>
         <navigationItem id="Settings">
           <title>{{TEXT(Settings)}}</title>