Skip to content

Bulk asynchronous downloader for multiple file hosts

refactor: always use block style for config file (#1423)

NTFSvolume44d29219e8eb
diff --git a/cyberdrop_dl/utils/yaml.py b/cyberdrop_dl/utils/yaml.py
index d5830d798..eefc4b527 100644
--- a/cyberdrop_dl/utils/yaml.py
+++ b/cyberdrop_dl/utils/yaml.py
@@ -5,7 +5,7 @@ import sys
from datetime import date, timedelta
from enum import Enum
from pathlib import Path, PurePath
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
import yaml
from pydantic import BaseModel, ValidationError
@@ -22,7 +22,7 @@ class TimedeltaSerializer(BaseModel):
duration: timedelta
-def _save_as_str(dumper: yaml.Dumper, value):
+def _save_as_str(dumper: yaml.Dumper, value: object):
if isinstance(value, Enum):
return dumper.represent_str(value.name)
return dumper.represent_str(str(value))
@@ -44,25 +44,26 @@ yaml.add_representer(timedelta, _save_timedelta)
yaml.add_representer(URL, _save_as_str)
-def save(file: Path, data: BaseModel | dict) -> None:
+def save(file: Path, data: BaseModel | dict[str, Any]) -> None:
"""Saves a dict to a yaml file."""
if isinstance(data, BaseModel):
data = data.model_dump()
file.parent.mkdir(parents=True, exist_ok=True)
- with file.open("w", encoding="utf8") as yaml_file:
- yaml.dump(data, yaml_file)
+ file.write_text(
+ yaml.dump(data, default_flow_style=False),
+ encoding="utf8",
+ )
-def load(file: Path, *, create: bool = False) -> dict:
+def load(file: Path, *, create: bool = False) -> dict[str, Any]:
"""Loads a yaml file and returns it as a dict."""
if create:
file.parent.mkdir(parents=True, exist_ok=True)
if not file.is_file():
file.touch()
try:
- with file.open(encoding="utf8") as yaml_file:
- yaml_values = yaml.safe_load(yaml_file.read())
- return yaml_values if yaml_values else {}
+ yaml_values = yaml.safe_load(file.read_text(encoding="utf8"))
+ return yaml_values or {}
except KeyboardInterrupt:
raise
except Exception as e: