diff --git a/unshackle/commands/dl.py b/unshackle/commands/dl.py index ad54d60b..a00a1322 100644 --- a/unshackle/commands/dl.py +++ b/unshackle/commands/dl.py @@ -567,6 +567,13 @@ class dl: self.log = logging.getLogger("download") + if not config.output_template: + raise click.ClickException( + "No 'output_template' configured in your unshackle.yaml.\n" + "Please add an 'output_template' section with movies, series, and songs templates.\n" + "See unshackle-example.yaml for examples." + ) + self.service = Services.get_tag(ctx.invoked_subcommand) service_dl_config = config.services.get(self.service, {}).get("dl", {}) if service_dl_config: diff --git a/unshackle/commands/serve.py b/unshackle/commands/serve.py index 2bfff33b..179e81e9 100644 --- a/unshackle/commands/serve.py +++ b/unshackle/commands/serve.py @@ -130,6 +130,8 @@ def serve( @web.middleware async def api_key_authentication(request: web.Request, handler) -> web.Response: """Authenticate API requests using X-Secret-Key header.""" + if request.path == "/api/health": + return await handler(request) secret_key = request.headers.get("X-Secret-Key") if not secret_key: return web.json_response({"status": 401, "message": "Secret Key is Empty."}, status=401) diff --git a/unshackle/core/api/routes.py b/unshackle/core/api/routes.py index 6abe6e98..c4ee10e1 100644 --- a/unshackle/core/api/routes.py +++ b/unshackle/core/api/routes.py @@ -29,7 +29,7 @@ async def cors_middleware(request: web.Request, handler): # Add CORS headers response.headers["Access-Control-Allow-Origin"] = "*" response.headers["Access-Control-Allow-Methods"] = "GET, POST, PUT, DELETE, OPTIONS" - response.headers["Access-Control-Allow-Headers"] = "Content-Type, X-API-Key, Authorization" + response.headers["Access-Control-Allow-Headers"] = "Content-Type, X-Secret-Key, Authorization" response.headers["Access-Control-Max-Age"] = "3600" return response diff --git a/unshackle/core/config.py b/unshackle/core/config.py index 2b36185d..0999218f 100644 --- a/unshackle/core/config.py +++ b/unshackle/core/config.py @@ -108,14 +108,8 @@ class Config: "See unshackle-example.yaml for examples." ) - if not self.output_template: - raise SystemExit( - "ERROR: No 'output_template' configured in your unshackle.yaml.\n" - "Please add an 'output_template' section with movies, series, and songs templates.\n" - "See unshackle-example.yaml for examples." - ) - - self._validate_output_templates() + if self.output_template: + self._validate_output_templates() self.unicode_filenames: bool = kwargs.get("unicode_filenames", False)