Merge pull request #91 from Makhuta/master

Fix

Author: mkanet

custom_components/plex_recently_added/parser.py

@@ -1,9 +1,20 @@
 from xml.etree import ElementTree
 import os
+import hashlib
+from urllib.parse import urlparse
+import aiohttp
+import aiofiles
 import re
 import math
 from datetime import datetime
 
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
+CACHE_FOLDER = os.path.join(SCRIPT_DIR, "images_cache")
+os.makedirs(CACHE_FOLDER, exist_ok=True)
+
+import logging
+_LOGGER = logging.getLogger(__name__)
+
 def parse_library(root):
     output = []
     for medium in root.findall("Video"):
@@ -19,19 +30,34 @@ def parse_library(root):
 
     return output
 
-def extract_metadata_and_type(path):
-    pattern = re.compile(r"/library/metadata/(\d+)/(thumb|art)/(\d+)")
-    match = pattern.search(path)
-    
-    if match:
-        metadata_id = match.group(1)
-        art_type = match.group(2)
-        art_id = match.group(3)
-        return metadata_id, art_type, art_id
-    
+def get_image_filename(url):
+    """Generate a unique filename from the URL while keeping the original extension."""
+    parsed_url = urlparse(url)
+    ext = os.path.splitext(parsed_url.path)[-1]
+    if not ext:
+        ext = ".jpg"
+    return hashlib.md5(url.encode()).hexdigest() + ext
+
+async def download_image(url):
+    """Download an image asynchronously and save it to the cache folder without blocking the event loop."""
+    filename = get_image_filename(url)
+    file_path = os.path.join(CACHE_FOLDER, filename)
+
+    async with aiohttp.ClientSession() as session:
+        async with session.get(url) as response:
+            if response.status == 200:
+                async with aiofiles.open(file_path, "wb") as file:  # ✅ Non-blocking file write
+                    await file.write(await response.read())  # ✅ Async file writing
+                return filename
     return None
 
-def parse_data(data, max, base_url, token, identifier, section_key, images_base_url, is_all = False):
+def cleanup_old_images(valid_filenames):
+    """Delete images that are not in the updated list."""
+    for filename in os.listdir(CACHE_FOLDER):
+        if filename not in valid_filenames:
+            os.remove(os.path.join(CACHE_FOLDER, filename))
+
+async 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():
@@ -42,6 +68,7 @@ def parse_data(data, max, base_url, token, identifier, section_key, images_base_
         sorted_data = sorted(data, key=lambda i: i['addedAt'], reverse=True)[:max]
 
     output = []
+    valid_images = set()
     for item in sorted_data:
         media_type_map = {'movie': ('thumb', 'art'), 'episode': ('grandparentThumb', 'grandparentArt')}
         thumb_key, art_key = media_type_map.get(item['type'], ('thumb', 'grandparentArt'))
@@ -80,10 +107,20 @@ def parse_data(data, max, base_url, token, identifier, section_key, images_base_
         data_output["rating"] = ('\N{BLACK STAR} ' + str(item.get("rating"))) if int(float(item.get("rating", 0))) > 0 else ''
         data_output['summary'] = item.get('summary', '')
         data_output['trailer'] = item.get('trailer')
-        thumb_IDs = extract_metadata_and_type(thumb)
-        data_output["poster"] = (f'{images_base_url}?metadata={thumb_IDs[0]}&thumb={thumb_IDs[2]}') if thumb_IDs else ""
-        art_IDs = extract_metadata_and_type(art)
-        data_output["fanart"] = (f'{images_base_url}?metadata={art_IDs[0]}&art={art_IDs[2]}') if art_IDs else ""
+
+
+        thumb_filename = await download_image(f'{base_url}{thumb}?X-Plex-Token={token}')
+        if thumb_filename:
+            valid_images.add(thumb_filename)
+        data_output["poster"] = (f'{images_base_url}?filename={thumb_filename}') if thumb_filename else ""
+
+
+        art_filename = await download_image(f'{base_url}{art}?X-Plex-Token={token}')
+        if art_filename:
+            valid_images.add(art_filename)
+        data_output["fanart"] = (f'{images_base_url}?filename={art_filename}') if art_filename else ""
+
+
         data_output["deep_link"] = deep_link if identifier else None
 
         output.append(data_output)

custom_components/plex_recently_added/plex_api.py

@@ -129,7 +129,7 @@ async def update(self):
 
         data_out = {}
         for k in data.keys():
-            parsed_data = parse_data(data[k], self._max, info_url, self._token, identifier, k, self._images_base_url, k == "all")
+            parsed_data = await parse_data(data[k], self._max, info_url, self._token, identifier, k, self._images_base_url, k == "all")
 
             # Ensure trailer URLs are correctly set for the "all" sensor
             if k == "all":

custom_components/plex_recently_added/redirect.py

@@ -2,6 +2,10 @@
 from homeassistant.config_entries import ConfigEntry
 from aiohttp import web, ClientSession
 import requests
+import os
+
+from .parser import CACHE_FOLDER
+os.makedirs(CACHE_FOLDER, exist_ok=True)
 
 from homeassistant.const import (
     CONF_API_KEY, 
@@ -19,20 +23,18 @@ class ImagesRedirect(HomeAssistantView):
     def __init__(self, config_entry: ConfigEntry):
         super().__init__()
         self._token = config_entry.data[CONF_API_KEY]
-        self._base_url = f'http{'s' if config_entry.data[CONF_SSL] else ''}://{config_entry.data[CONF_HOST]}:{config_entry.data[CONF_PORT]}'
         self.name = f'{self._token}_Plex_Recently_Added'
         self.url = f'/{config_entry.data[CONF_NAME].lower() + "_" if len(config_entry.data[CONF_NAME]) > 0 else ""}plex_recently_added'
 
     async def get(self, request):
-        metadataId = int(request.query.get("metadata", 0))
-        thumbId = int(request.query.get("thumb", 0))
-        artId = int(request.query.get("art", 0))
-        url = f'{self._base_url}/library/metadata/{metadataId}/{"thumb" if thumbId != 0 else "art"}/{thumbId if thumbId != 0 else artId if artId != 0 else ""}?X-Plex-Token={self._token}'
-
-        async with ClientSession() as session:
-            async with session.get(url) as res:
-                if res.ok:
-                    content = await res.read()
-                    return web.Response(body=content, content_type=res.content_type)
-
-                return web.HTTPNotFound()
+        filename = request.query.get("filename")
+        if not filename:
+            return web.Response(status=404)
+        file_path = os.path.join(CACHE_FOLDER, filename)
+
+        if not os.path.isfile(file_path):
+            return web.Response(status=404)
+
+        return web.FileResponse(file_path)
+
+