fixed conflicts

plexpy/datafactory.py

@@ -55,6 +55,7 @@ class DataFactory(object):
                    (CASE WHEN session_history_metadata.duration IS NULL THEN 1.0 ELSE \
                     session_history_metadata.duration * 1.0 END) * 100) as percent_complete',
                    'session_history.grandparent_rating_key as grandparent_rating_key',
+                   'session_history.parent_rating_key as parent_rating_key',
                    'session_history.rating_key as rating_key',
                    'session_history.user',
                    'session_history_metadata.media_type',
@@ -112,6 +113,7 @@ class DataFactory(object):
                    "duration": item["duration"],
                    "percent_complete": item["percent_complete"],
                    "grandparent_rating_key": item["grandparent_rating_key"],
+                   "parent_rating_key": item["parent_rating_key"],
                    "rating_key": item["rating_key"],
                    "user": item["user"],
                    "media_type": item["media_type"],

plexpy/pmsconnect.py

@@ -89,6 +89,23 @@ class PmsConnect(object):
 
         return request
 
+    """
+    Return list of seasons in requested show.
+
+    Parameters required:    rating_key { ratingKey of parent }
+    Optional parameters:    output_format { dict, json }
+
+    Output: array
+    """
+    def get_season_list(self, rating_key='', output_format=''):
+        uri = '/library/metadata/' + rating_key + '/children'
+        request = self.request_handler.make_request(uri=uri,
+                                                    proto=self.protocol,
+                                                    request_type='GET',
+                                                    output_format=output_format)
+        
+        return request
+
     """
     Return list of episodes in requested season.
 
@@ -103,7 +120,7 @@ class PmsConnect(object):
                                                     proto=self.protocol,
                                                     request_type='GET',
                                                     output_format=output_format)
-
+        
         return request
 
     """
@@ -798,6 +815,49 @@ class PmsConnect(object):
 
         return session_output
 
+    """
+    Return processed and validated season list.
+
+    Output: array
+    """
+    def get_show_children(self, rating_key=''):
+        season_data = self.get_season_list(rating_key, output_format='xml')
+
+        try:
+            xml_head = season_data.getElementsByTagName('MediaContainer')
+        except:
+            logger.warn("Unable to parse XML for get_season_list.")
+            return []
+
+        season_list = []
+
+        for a in xml_head:
+            if a.getAttribute('size'):
+                if a.getAttribute('size') == '0':
+                    logger.debug(u"No season data.")
+                    episode_list = {'season_count': '0',
+                                    'season_list': []
+                                    }
+                    return season_list
+
+            if a.getElementsByTagName('Directory'):
+                result_data = a.getElementsByTagName('Directory')
+                for result in result_data:
+                    season_output = {'rating_key': helpers.get_xml_attr(result, 'ratingKey'),
+                                      'index': helpers.get_xml_attr(result, 'index'),
+                                      'title': helpers.get_xml_attr(result, 'title'),
+                                      'thumb': helpers.get_xml_attr(result, 'thumb'),
+                                      'parent_thumb': helpers.get_xml_attr(a, 'thumb')
+                                      }
+                    season_list.append(season_output)
+
+        output = {'season_count': helpers.get_xml_attr(xml_head[0], 'size'),
+                  'title': helpers.get_xml_attr(xml_head[0], 'title2'),
+                  'season_list': season_list
+                  }
+
+        return output
+
     """
     Return processed and validated episode list.
 

plexpy/webserve.py

@@ -569,6 +569,9 @@ class WebInterface(object):
         if 'rating_key' in kwargs:
             rating_key = kwargs.get('rating_key', "")
             custom_where = [['rating_key', rating_key]]
+        if 'parent_rating_key' in kwargs:
+            rating_key = kwargs.get('parent_rating_key', "")
+            custom_where = [['parent_rating_key', rating_key]]
         if 'grandparent_rating_key' in kwargs:
             rating_key = kwargs.get('grandparent_rating_key', "")
             custom_where = [['grandparent_rating_key', rating_key]]
@@ -806,7 +809,19 @@ class WebInterface(object):
             return serve_template(templatename="user_platform_stats.html", data=None, title="Platform Stats")
 
     @cherrypy.expose
-    def get_children(self, rating_key='', **kwargs):
+    def get_show_children(self, rating_key='', **kwargs):
+
+        pms_connect = pmsconnect.PmsConnect()
+        result = pms_connect.get_show_children(rating_key)
+
+        if result:
+            return serve_template(templatename="info_season_list.html", data=result, title="Season List")
+        else:
+            logger.warn('Unable to retrieve data.')
+            return serve_template(templatename="info_season_list.html", data=None, title="Season List")
+
+    @cherrypy.expose
+    def get_season_children(self, rating_key='', **kwargs):
 
         pms_connect = pmsconnect.PmsConnect()
         result = pms_connect.get_season_children(rating_key)