jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-10 06:47:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct backup date when reading a backup created by supervisor (#138860)

Browse Source
This commit is contained in:
Erik Montnemery 2025-02-19 22:40:03 +01:00 committed by GitHub
parent eb6993f0a8
commit ad7780291e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
homeassistant/components/backup/util.py
View File

@ -104,12 +104,15 @@ def read_backup(backup_path: Path) -> AgentBackup:
bool, homeassistant.get("exclude_database", False) bool, homeassistant.get("exclude_database", False)
) )
extra_metadata = cast(dict[str, bool | str], data.get("extra", {}))
date = extra_metadata.get("supervisor.backup_request_date", data["date"])
return AgentBackup( return AgentBackup(
addons=addons, addons=addons,
backup_id=cast(str, data["slug"]), backup_id=cast(str, data["slug"]),
database_included=database_included, database_included=database_included,
date=cast(str, data["date"]), date=cast(str, date),
extra_metadata=cast(dict[str, bool | str], data.get("extra", {})), extra_metadata=extra_metadata,
folders=folders, folders=folders,
homeassistant_included=homeassistant_included, homeassistant_included=homeassistant_included,
homeassistant_version=homeassistant_version, homeassistant_version=homeassistant_version,

22
tests/components/backup/test_util.py
View File

@ -89,6 +89,28 @@ from tests.common import get_fixture_path
size=1234, size=1234,
), ),
), ),
# Check the backup_request_date is used as date if present
(
b'{"compressed":true,"date":"2024-12-01T00:00:00.000000-00:00","homeassistant":'
b'{"exclude_database":true,"version":"2024.12.0.dev0"},"name":"test",'
b'"extra":{"supervisor.backup_request_date":"2025-12-01T00:00:00.000000-00:00"},'
b'"protected":true,"slug":"455645fe","type":"partial","version":2}',
AgentBackup(
addons=[],
backup_id="455645fe",
date="2025-12-01T00:00:00.000000-00:00",
database_included=False,
extra_metadata={
"supervisor.backup_request_date": "2025-12-01T00:00:00.000000-00:00"
},
folders=[],
homeassistant_included=True,
homeassistant_version="2024.12.0.dev0",
name="test",
protected=True,
size=1234,
),
),
], ],
) )
def test_read_backup(backup_json_content: bytes, expected_backup: AgentBackup) -> None: def test_read_backup(backup_json_content: bytes, expected_backup: AgentBackup) -> None: