Move get_tree to HacsRepository

custom_components/hacs/repositories/base.py

@@ -892,3 +892,11 @@ async def async_get_legacy_repository_object(
 
     def update_filenames(self) -> None:
         """Get the filename to target."""
+
+    async def get_tree(self, ref: str):
+        """Return the repository tree."""
+        try:
+            tree = await self.repository_object.get_tree(ref)
+            return tree
+        except (ValueError, AIOGitHubAPIException) as exception:
+            raise HacsException(exception) from exception

custom_components/hacs/utils/information.py

@@ -4,15 +4,6 @@
 from ..exceptions import HacsException
 
 
-async def get_tree(repository, ref):
-    """Return the repository tree."""
-    try:
-        tree = await repository.get_tree(ref)
-        return tree
-    except (ValueError, AIOGitHubAPIException) as exception:
-        raise HacsException(exception)
-
-
 async def get_releases(repository, prerelease=False, returnlimit=5):
     """Return the repository releases."""
     try:

custom_components/hacs/utils/validate_repository.py

@@ -11,7 +11,7 @@
     HacsRepositoryArchivedException,
     HacsRepositoryExistException,
 )
-from ..utils.information import get_releases, get_tree
+from ..utils.information import get_releases
 from ..utils.version import version_to_download
 
 if TYPE_CHECKING:
@@ -92,7 +92,7 @@ async def common_update_data(
     )
 
     try:
-        repository.tree = await get_tree(repository.repository_object, repository.ref)
+        repository.tree = await repository.get_tree(repository.ref)
         if not repository.tree:
             raise HacsException("No files in tree")
         repository.treefiles = []

tests/helpers/information/test_get_tree.py

@@ -2,13 +2,10 @@
 # pylint: disable=missing-docstring
 import json
 
-import aiohttp
 import pytest
 
 from custom_components.hacs.exceptions import HacsException
-from custom_components.hacs.utils.information import get_tree
 
-from tests.common import TOKEN
 from tests.sample_data import (
     repository_data,
     response_rate_limit_header,
@@ -44,8 +41,13 @@ async def test_get_tree(aresponses, repository_integration):
         aresponses.Response(body=json.dumps(tree_files_base), headers=response_rate_limit_header),
     )
 
-    repository, _ = await repository_integration.async_get_legacy_repository_object()
-    tree = await get_tree(repository, repository.default_branch)
+    (
+        repository_integration.repository_object,
+        _,
+    ) = await repository_integration.async_get_legacy_repository_object()
+    tree = await repository_integration.get_tree(
+        repository_integration.repository_object.default_branch
+    )
     assert "hacs.json" in [x.full_path for x in tree]
 
 
@@ -79,6 +81,11 @@ async def test_get_tree_exception(aresponses, repository_integration):
             status=403,
         ),
     )
-    repository, _ = await repository_integration.async_get_legacy_repository_object()
+    (
+        repository_integration.repository_object,
+        _,
+    ) = await repository_integration.async_get_legacy_repository_object()
     with pytest.raises(HacsException):
-        await get_tree(repository, repository.default_branch)
+        await repository_integration.get_tree(
+            repository_integration.repository_object.default_branch
+        )

tests/helpers/information/tree/test_base.py

@@ -2,11 +2,8 @@
 # pylint: disable=missing-docstring
 import json
 
-import aiohttp
 import pytest
 
-from custom_components.hacs.utils.information import get_tree
-
 from tests.sample_data import (
     repository_data,
     response_rate_limit_header,
@@ -43,6 +40,11 @@ async def test_base(aresponses, repository_integration):
         aresponses.Response(body=json.dumps(tree_files_base), headers=response_rate_limit_header),
     )
 
-    repository, _ = await repository_integration.async_get_legacy_repository_object()
-    tree = await get_tree(repository, repository.default_branch)
+    (
+        repository_integration.repository_object,
+        _,
+    ) = await repository_integration.async_get_legacy_repository_object()
+    tree = await repository_integration.get_tree(
+        repository_integration.repository_object.default_branch
+    )
     assert "hacs.json" in [x.full_path for x in tree]

tests/helpers/information/tree/test_integration.py

@@ -2,11 +2,8 @@
 # pylint: disable=missing-docstring
 import json
 
-import aiohttp
 import pytest
 
-from custom_components.hacs.utils.information import get_tree
-
 from tests.sample_data import (
     repository_data,
     response_rate_limit_header,
@@ -46,8 +43,13 @@ async def test_base(aresponses, repository_integration):
         ),
     )
 
-    repository, _ = await repository_integration.async_get_legacy_repository_object()
-    tree = await get_tree(repository, repository.default_branch)
+    (
+        repository_integration.repository_object,
+        _,
+    ) = await repository_integration.async_get_legacy_repository_object()
+    tree = await repository_integration.get_tree(
+        repository_integration.repository_object.default_branch
+    )
     filestocheck = [
         "custom_components/test/__init__.py",
         "custom_components/test/translations/en.json",