Only grab the defined file for zip releases (#3274)

* Only grab the defined file for zip releases * typo * move validation * lint
hacs · Sep 25, 2023 · 98eeb42 · 98eeb42
1 parent 6f2ba69
commit 98eeb42
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 3 deletions.
diff --git a/custom_components/hacs/repositories/base.py b/custom_components/hacs/repositories/base.py
@@ -579,8 +579,17 @@ async def download_zip_files(self, validate) -> None:
             download_queue = QueueManager(hass=self.hacs.hass)
 
             for content in contents or []:
+                if (
+                    self.repository_manifest.zip_release
+                    and content.name != self.repository_manifest.filename
+                ):
+                    continue
                 download_queue.add(self.async_download_zip_file(content, validate))
 
+            if download_queue.pending_tasks == 0:
+                validate.errors.append("Nothing to download")
+                return
+
             await download_queue.execute()
         except BaseException:  # lgtm [py/catch-base-exception] pylint: disable=broad-except
             validate.errors.append("Download was not completed")

diff --git a/custom_components/hacs/validate/hacsjson.py b/custom_components/hacs/validate/hacsjson.py
@@ -2,8 +2,8 @@
 
 from voluptuous.error import Invalid
 
-from ..enums import RepositoryFile
-from ..repositories.base import HacsRepository
+from ..enums import HacsCategory, RepositoryFile
+from ..repositories.base import HacsManifest, HacsRepository
 from ..utils.validate import HACS_MANIFEST_JSON_SCHEMA
 from .base import ActionValidationBase, ValidationException
 
@@ -25,6 +25,10 @@ async def async_validate(self):
 
         content = await self.repository.async_get_hacs_json(self.repository.ref)
         try:
-            HACS_MANIFEST_JSON_SCHEMA(content)
+            hacsjson = HacsManifest.from_dict(HACS_MANIFEST_JSON_SCHEMA(content))
         except Invalid as exception:
             raise ValidationException(exception) from exception
+
+        if self.repository.data.category == HacsCategory.INTEGRATION:
+            if hacsjson.zip_release and not hacsjson.filename:
+                raise ValidationException("zip_release is True, but filename is not set")
diff --git a/tests/validate/test_hacsjson_check.py b/tests/validate/test_hacsjson_check.py
@@ -45,3 +45,26 @@ async def _async_get_hacs_json(_):
     check = Validator(repository)
     await check.execute_validation()
     assert check.failed
+
+
+@pytest.mark.asyncio
+async def test_hacs_manifest_with_missing_filename(repository, caplog):
+    repository.tree = [
+        AIOGitHubAPIRepositoryTreeContent(
+            {"path": "hacs.json", "type": "file"}, "test/test", "main"
+        )
+    ]
+    repository.data.category = "integration"
+
+    async def _async_get_hacs_json(_):
+        return {"name": "test", "zip_release": True}
+
+    repository.async_get_hacs_json = _async_get_hacs_json
+
+    check = Validator(repository)
+    await check.execute_validation()
+    assert check.failed
+    assert (
+        "<Validation hacsjson> failed:  zip_release is True, but filename is not set (More info: https://hacs.xyz/docs/publish/include#check-hacs-manifest )"
+        in caplog.text
+    )