From d91903610b815980b9c06112044ea1099e45d782 Mon Sep 17 00:00:00 2001
From: brees <breeser.t@gmail.com>
Date: Tue, 31 Oct 2023 00:04:05 -0400
Subject: [PATCH] working search

---
 .../default/info_search_results_list.html     | 32 ++++++++---------
 plexpy/pmsconnect.py                          | 36 ++++++++++++-------
 plexpy/webserve.py                            | 27 +++++++++-----
 3 files changed, 59 insertions(+), 36 deletions(-)

diff --git a/data/interfaces/default/info_search_results_list.html b/data/interfaces/default/info_search_results_list.html
index e368efde..3f7e9697 100644
--- a/data/interfaces/default/info_search_results_list.html
+++ b/data/interfaces/default/info_search_results_list.html
@@ -65,9 +65,9 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['collection']:
         <li>
-            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
+            <a href="${page('info', child['rating_key'], server_id=child['server_id'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
                 <div class="item-children-poster">
-                    <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster')});"></div>
+                    <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster', server_id=child['server_id'])});"></div>
                     % if _session['user_group'] == 'admin':
                     <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
                     % endif
@@ -90,9 +90,9 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['movie']:
         <li>
-            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
+            <a href="${page('info', child['rating_key'], server_id=child['server_id'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
                 <div class="item-children-poster">
-                    <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster')});"></div>
+                    <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster', server_id=child['server_id'])});"></div>
                     % if _session['user_group'] == 'admin':
                     <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
                     % endif
@@ -115,9 +115,9 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['show']:
         <li>
-            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
+            <a href="${page('info', child['rating_key'], server_id=child['server_id'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
                 <div class="item-children-poster">
-                    <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster')});"></div>
+                    <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster', server_id=child['server_id'])});"></div>
                     % if _session['user_group'] == 'admin':
                     <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
                     % endif
@@ -140,9 +140,9 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['season']:
         <li>
-            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
+            <a href="${page('info', child['rating_key'], server_id=child['server_id'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
                 <div class="item-children-poster">
-                    <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster')});"></div>
+                    <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster', server_id=child['server_id'])});"></div>
                     % if _session['user_group'] == 'admin':
                     <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
                     % endif
@@ -165,9 +165,9 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['episode']:
         <li>
-            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
+            <a href="${page('info', child['rating_key'], server_id=child['server_id'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
                 <div class="item-children-poster">
-                    <div class="item-children-poster-face episode-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 500, 280, fallback='art')});"></div>
+                    <div class="item-children-poster-face episode-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 500, 280, fallback='art', server_id=child['server_id'])});"></div>
                     % if _session['user_group'] == 'admin':
                     <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
                     % endif
@@ -191,9 +191,9 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['artist']:
         <li>
-            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
+            <a href="${page('info', child['rating_key'], server_id=child['server_id'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
                 <div class="item-children-poster">
-                    <div class="item-children-poster-face cover-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 300, fallback='cover')});"></div>
+                    <div class="item-children-poster-face cover-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 300, fallback='cover', server_id=child['server_id'])});"></div>
                     % if _session['user_group'] == 'admin':
                     <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
                     % endif
@@ -215,9 +215,9 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['album']:
         <li>
-            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
+            <a href="${page('info', child['rating_key'], server_id=child['server_id'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
                 <div class="item-children-poster">
-                    <div class="item-children-poster-face cover-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 300, fallback='cover')});"></div>
+                    <div class="item-children-poster-face cover-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 300, fallback='cover', server_id=child['server_id'])});"></div>
                     % if _session['user_group'] == 'admin':
                     <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
                     % endif
@@ -240,9 +240,9 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['track']:
         <li>
-            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
+            <a href="${page('info', child['rating_key'], server_id=child['server_id'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
                 <div class="item-children-poster">
-                    <div class="item-children-poster-face cover-item" style="background-image: url(${page('pms_image_proxy', child['parent_thumb'], child['parent_rating_key'], 300, 300, fallback='cover')});">
+                    <div class="item-children-poster-face cover-item" style="background-image: url(${page('pms_image_proxy', child['parent_thumb'], child['parent_rating_key'], 300, 300, fallback='cover', server_id=child['server_id'])});">
                         <div class="item-children-card-overlay">
                             <div class="item-children-overlay-text">
                                 Track ${child['media_index']}
diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py
index 41d0b8dd..7d778026 100644
--- a/plexpy/pmsconnect.py
+++ b/plexpy/pmsconnect.py
@@ -849,7 +849,8 @@ class PmsConnect(object):
                         'grandparent_guids': [],
                         'full_title': helpers.get_xml_attr(metadata_main, 'title'),
                         'children_count': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'leafCount')),
-                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1')
+                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1'),
+                        'server_id': self.server_id
                         }
 
         elif metadata_type == 'show':
@@ -909,7 +910,8 @@ class PmsConnect(object):
                         'grandparent_guids': [],
                         'full_title': helpers.get_xml_attr(metadata_main, 'title'),
                         'children_count': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'leafCount')),
-                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1')
+                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1'),
+                        'server_id': self.server_id
                         }
 
         elif metadata_type == 'season':
@@ -973,7 +975,8 @@ class PmsConnect(object):
                         'full_title': '{} - {}'.format(helpers.get_xml_attr(metadata_main, 'parentTitle'),
                                                        helpers.get_xml_attr(metadata_main, 'title')),
                         'children_count': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'leafCount')),
-                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1')
+                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1'),
+                        'server_id': self.server_id
                         }
 
         elif metadata_type == 'episode':
@@ -1053,7 +1056,8 @@ class PmsConnect(object):
                         'full_title': '{} - {}'.format(helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
                                                        helpers.get_xml_attr(metadata_main, 'title')),
                         'children_count': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'leafCount')),
-                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1')
+                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1'),
+                        'server_id': self.server_id
                         }
 
         elif metadata_type == 'artist':
@@ -1108,7 +1112,8 @@ class PmsConnect(object):
                         'grandparent_guids': [],
                         'full_title': helpers.get_xml_attr(metadata_main, 'title'),
                         'children_count': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'leafCount')),
-                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1')
+                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1'),
+                        'server_id': self.server_id
                         }
 
         elif metadata_type == 'album':
@@ -1166,7 +1171,8 @@ class PmsConnect(object):
                         'full_title': '{} - {}'.format(helpers.get_xml_attr(metadata_main, 'parentTitle'),
                                                        helpers.get_xml_attr(metadata_main, 'title')),
                         'children_count': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'leafCount')),
-                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1')
+                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1'),
+                        'server_id': self.server_id
                         }
 
         elif metadata_type == 'track':
@@ -1226,7 +1232,8 @@ class PmsConnect(object):
                         'full_title': '{} - {}'.format(helpers.get_xml_attr(metadata_main, 'title'),
                                                        track_artist),
                         'children_count': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'leafCount')),
-                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1')
+                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1'),
+                        'server_id': self.server_id
                         }
 
         elif metadata_type == 'photo_album':
@@ -1281,7 +1288,8 @@ class PmsConnect(object):
                         'grandparent_guids': [],
                         'full_title': helpers.get_xml_attr(metadata_main, 'title'),
                         'children_count': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'leafCount')),
-                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1')
+                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1'),
+                        'server_id': self.server_id
                         }
 
         elif metadata_type == 'photo':
@@ -1339,7 +1347,8 @@ class PmsConnect(object):
                         'full_title': '{} - {}'.format(helpers.get_xml_attr(metadata_main, 'parentTitle') or library_name,
                                                        helpers.get_xml_attr(metadata_main, 'title')),
                         'children_count': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'leafCount')),
-                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1')
+                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1'),
+                        'server_id': self.server_id
                         }
 
         elif metadata_type == 'collection':
@@ -1399,7 +1408,8 @@ class PmsConnect(object):
                         'full_title': helpers.get_xml_attr(metadata_main, 'title'),
                         'children_count': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'childCount')),
                         'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1'),
-                        'smart': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'smart'))
+                        'smart': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'smart')),
+                        'server_id': self.server_id
                         }
 
         elif metadata_type == 'playlist':
@@ -1419,7 +1429,8 @@ class PmsConnect(object):
                         'children_count': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'leafCount')),
                         'smart': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'smart')),
                         'playlist_type': helpers.get_xml_attr(metadata_main, 'playlistType'),
-                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1')
+                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1'),
+                        'server_id': self.server_id
                         }
 
         elif metadata_type == 'clip':
@@ -1474,7 +1485,8 @@ class PmsConnect(object):
                         'full_title': helpers.get_xml_attr(metadata_main, 'title'),
                         'extra_type': helpers.get_xml_attr(metadata_main, 'extraType'),
                         'sub_type': helpers.get_xml_attr(metadata_main, 'subtype'),
-                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1')
+                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1'),
+                        'server_id': self.server_id
                         }
 
         else:
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 3670a66f..52e86344 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -5223,15 +5223,26 @@ class WebInterface(object):
     def get_search_results_children(self, query='', limit='', media_type=None, season_index=None, server_id=None, **kwargs):
 
         result ={}
-        pms_connect = server_manager.ServerManger().get_server(server_id=server_id)
-        if pms_connect:
-            result = pms_connect.get_search_results(query=query, limit=limit)
+        if server_id is not None:
+            pms_connect = server_manager.ServerManger().get_server(server_id=server_id)
+            if pms_connect:
+                result = pms_connect.get_search_results(query=query, limit=limit)
+        else:
+            result['results_list']={}
+            result['results_count'] = 0
+            for pms_connect in server_manager.ServerManger().get_server_list():
+                tempResult = pms_connect.get_search_results(query=query, limit=limit)
+                for key in set(tempResult['results_list']):
+                    if key not in result['results_list']:
+                        result['results_list'][key]=[]
+                    result['results_list'][key]+=tempResult['results_list'][key]
+                result['results_count']+=tempResult['results_count']
 
-            if media_type:
-                result['results_list'] = {media_type: result['results_list'][media_type]}
-            if media_type == 'season' and season_index:
-                result['results_list']['season'] = [season for season in result['results_list']['season']
-                                                    if season['media_index'] == season_index]
+        if media_type:
+            result['results_list'] = {media_type: result['results_list'][media_type]}
+        if media_type == 'season' and season_index:
+            result['results_list']['seasson'] = [season for season in result['results_list']['season']
+                                                if season['media_index'] == season_index]
 
         if result:
             return serve_template(template_name="info_search_results_list.html", data=result, title="Search Result List")