Change

- attribute parameters according to the old version
- the merged sensor have the joined items of all other (separated sensors)

Author: Makhuta

custom_components/plex_recently_added/parser.py

@@ -19,11 +19,18 @@ def parse_library(root):
 
     return output
 
-def parse_data(data, max, base_url, token, identifier, section_key, images_base_url):
-    data = sorted(data, key=lambda i: i['addedAt'], reverse=True)[:max]
+def parse_data(data, max, base_url, token, identifier, section_key, images_base_url, is_all = False):
+    if is_all:
+        sorted_data = []
+        for k in data.keys():
+            type_sorted = sorted(data[k], key=lambda i: i['addedAt'], reverse=True)[:max]
+            sorted_data += type_sorted
+        sorted_data = sorted(sorted_data, key=lambda i: i['addedAt'], reverse=True)
+    else:
+        sorted_data = sorted(data, key=lambda i: i['addedAt'], reverse=True)[:max]
 
     output = []
-    for item in data:
+    for item in sorted_data:
         date = datetime.strptime(item.get("originallyAvailableAt", "1900-01-01"), "%Y-%m-%d").strftime('%Y-%m-%dT%H:%M:%SZ')
         thumb = item.get("thumb", item.get("parentThumb", item.get("grandparentThumb", None)))
         art = item.get("art", item.get("grandparentArt", None))
@@ -32,19 +39,22 @@ def parse_data(data, max, base_url, token, identifier, section_key, images_base_
             deep_link_position = -2
         deep_link = f'{base_url}/web/index.html#!/server/{identifier}/details?key=%2Flibrary%2Fmetadata%2F{item.get("key", "").split("/")[deep_link_position]}'
 
+        if not item.get("addedAt", None):
+            continue
+
         output.append(
             {
-                "airdate": date,
+                "airdate": datetime.utcfromtimestamp(int(item.get("addedAt", 0))).strftime('%Y-%m-%dT%H:%M:%SZ'),
                 "title": item.get("grandparentTitle", item.get("parentTitle", item.get("title", ""))),
-                "release": datetime.utcfromtimestamp(int(item.get("addedAt", 0))).strftime('%Y-%m-%dT%H:%M:%SZ'),
+                "release": '$day, $date $time',
                 "episode": item.get("title", ""),
                 "number": f'S{"{:0>2}".format(item.get("parentIndex", "1"))}E{"{:0>2}".format(item.get("index", "1"))}' if item.get("parentIndex", None) and item.get("index", None) else "",
                 "season_num": item.get("parentIndex", ""),
                 "season_num": item.get("parentIndex", "1"),
                 "episode_num": item.get("index", "1"),
                 "genres": ", ".join([genre['tag'] for genre in item.get('Genre', [])][:3]),
                 "rating": ('\N{BLACK STAR} ' + str(item.get("rating"))) if int(float(item.get("rating", 0))) > 0 else '',
-                "studio": item.get("grandparentTitle", ""),
+                "studio": item.get("studio", ""),
                 "aired": date,
                 "runtime": math.floor(int(item.get("duration", 0)) / 60000),
                 "poster": (f'{images_base_url}?path={thumb}') if thumb else "",

custom_components/plex_recently_added/plex_api.py

@@ -102,7 +102,7 @@ async def update(self):
 
         """ Looping through all libraries (sections) """
         data = {
-            'all': []
+            'all': {}
         }
         for s in self._section_types:
             data[s] = []
@@ -124,12 +124,14 @@ async def update(self):
             check_headers(sub_sec)
             root = ElementTree.fromstring(sub_sec.text)
             parsed_libs = parse_library(root)
-            data['all'] += parsed_libs
+            if library["type"] not in data['all']:
+                data['all'][library["type"]] = []
+            data['all'][library["type"]] += parsed_libs
             data[library["type"]] += parsed_libs
 
         data_out = {}
         for k in data.keys():
-            data_out[k] = {'data': [DEFAULT_PARSE_DICT] + parse_data(data[k], self._max, info_url, self._token, identifier, k, self._images_base_url)}
+            data_out[k] = {'data': [DEFAULT_PARSE_DICT] + parse_data(data[k], self._max, info_url, self._token, identifier, k, self._images_base_url, k == "all")}
 
         return {
             "data": {**data_out},