diff --git a/api/main.py b/api/main.py index 9f59a3a..048b581 100644 --- a/api/main.py +++ b/api/main.py @@ -60,8 +60,8 @@ app.add_middleware(middleware.UserDataMiddleware) TEMPLATES = Jinja2Templates(directory="resources") DELETE_ALL_META = schemas.Meta( **const.DELETE_ALL_WATCHLIST_META, - poster=f"{settings.host_url}/static/images/delete_all_poster.jpg", - background=f"{settings.host_url}/static/images/delete_all_background.png", + poster=f"{settings.poster_host_url}/static/images/delete_all_poster.jpg", + background=f"{settings.poster_host_url}/static/images/delete_all_background.png", ) DELETE_ALL_META_ITEM = { diff --git a/db/config.py b/db/config.py index 12ce490..61073e3 100644 --- a/db/config.py +++ b/db/config.py @@ -8,7 +8,8 @@ class Settings(BaseSettings): redis_url: str = "redis://redis-service:6379" # API and service URLs - host_url: str = "https://mediafusion.fun" + host_url: str + poster_host_url: str scraper_proxy_url: str | None = None torrentio_url: str = "https://torrentio.strem.fun" prowlarr_url: str = "http://prowlarr-service:9696" diff --git a/db/crud.py b/db/crud.py index 3cdc974..9455881 100644 --- a/db/crud.py +++ b/db/crud.py @@ -56,7 +56,7 @@ async def get_meta_list( else: query_filters = {"catalog": {"$in": [catalog]}} - poster_path = f"{settings.host_url}/poster/{catalog_type}/" + poster_path = f"{settings.poster_host_url}/poster/{catalog_type}/" meta_class = MediaFusionMetaData # Define the pipeline for aggregation @@ -139,7 +139,7 @@ async def get_tv_meta_list( ) for meta in tv_meta_list: - meta.poster = f"{settings.host_url}/poster/tv/{meta.id}.jpg" + meta.poster = f"{settings.poster_host_url}/poster/tv/{meta.id}.jpg" return tv_meta_list @@ -391,7 +391,7 @@ async def get_movie_meta(meta_id: str, redis: Redis): "_id": meta_id, "type": "movie", "title": movie_data.title, - "poster": f"{settings.host_url}/poster/movie/{meta_id}.jpg", + "poster": f"{settings.poster_host_url}/poster/movie/{meta_id}.jpg", "background": movie_data.poster, "description": movie_data.description, "runtime": movie_data.runtime, @@ -411,7 +411,7 @@ async def get_series_meta(meta_id: str): "_id": meta_id, "type": "series", "title": series_data.title, - "poster": f"{settings.host_url}/poster/series/{meta_id}.jpg", + "poster": f"{settings.poster_host_url}/poster/series/{meta_id}.jpg", "background": series_data.background or series_data.poster, "videos": [], } @@ -704,7 +704,7 @@ async def process_search_query( "$set": { "poster": { "$concat": [ - f"{settings.host_url}/poster/{catalog_type}/", + f"{settings.poster_host_url}/poster/{catalog_type}/", "$_id", ".jpg", ] @@ -753,7 +753,7 @@ async def process_tv_search_query(search_query: str) -> dict: "$set": { "poster": { "$concat": [ - f"{settings.host_url}/poster/tv/", + f"{settings.poster_host_url}/poster/tv/", "$_id", ".jpg", ] @@ -942,7 +942,9 @@ async def get_events_meta_list( events_json = await redis.get(key) if events_json: meta_data = schemas.Meta.model_validate_json(events_json) - meta_data.poster = f"{settings.host_url}/poster/events/{meta_data.id}.jpg" + meta_data.poster = ( + f"{settings.poster_host_url}/poster/events/{meta_data.id}.jpg" + ) events.append(meta_data) else: # Cleanup: Remove expired or missing event key from the index diff --git a/deployment/docker-compose/.env-sample b/deployment/docker-compose/.env-sample index c983405..355bef4 100644 --- a/deployment/docker-compose/.env-sample +++ b/deployment/docker-compose/.env-sample @@ -1,4 +1,5 @@ HOST_URL="https://mediafusion.local" +POSTER_HOST_URL="https://mediafusion.local" MONGO_URI="mongodb://mongodb:27017/mediafusion" REDIS_URL="redis://redis:6379" PROWLARR_URL="http://prowlarr:9696" diff --git a/deployment/k8s/local-deployment.yaml b/deployment/k8s/local-deployment.yaml index 1534d92..df6403b 100644 --- a/deployment/k8s/local-deployment.yaml +++ b/deployment/k8s/local-deployment.yaml @@ -54,6 +54,8 @@ spec: key: PROWLARR_API_KEY - name: HOST_URL value: "https://mediafusion.local" + - name: POSTER_HOST_URL + value: "https://mediafusion.local" - name: ENABLE_TAMILMV_SEARCH_SCRAPER value: "false" - name: PROWLARR_IMMEDIATE_MAX_PROCESS