Cleanup add-on detection exceptions (#2507)

custom_components/hacs/base.py

@@ -3,7 +3,6 @@
 
 import asyncio
 from dataclasses import asdict, dataclass, field
-from datetime import timedelta
 import gzip
 import json
 import logging
@@ -26,7 +25,6 @@
 from aiohttp.client import ClientSession, ClientTimeout
 from awesomeversion import AwesomeVersion
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.event import async_call_later
 from homeassistant.loader import Integration
 
 from .const import TV
@@ -39,16 +37,17 @@
  LovelaceMode,
 )
 from .exceptions import (
+ AddonRepositoryException,
  HacsException,
  HacsExpectedException,
  HacsRepositoryArchivedException,
  HacsRepositoryExistException,
+ HomeAssistantCoreRepositoryException,
 )
 from .repositories import RERPOSITORY_CLASSES
 from .utils.decode import decode_content
 from .utils.logger import get_hacs_logger
 from .utils.queue_manager import QueueManager
-from .utils.store import async_load_from_store, async_save_to_store
 
 if TYPE_CHECKING:
  from .repositories.base import HacsRepository
@@ -494,10 +493,12 @@ async def async_register_repository(
  raise HacsExpectedException(f"Skipping {repository_full_name}")
 
  if repository_full_name == "home-assistant/core":
- raise HacsExpectedException(
- "You can not add homeassistant/core, to use core integrations "
- "check the Home Assistant documentation for how to add them."
- )
+ raise HomeAssistantCoreRepositoryException()
+
+ if repository_full_name == "home-assistant/addons" or repository_full_name.startswith(
+ "hassio-addons/"
+ ):
+ raise AddonRepositoryException()
 
  if category not in RERPOSITORY_CLASSES:
  raise HacsException(f"{category} is not a valid repository category.")

custom_components/hacs/exceptions.py

@@ -23,3 +23,27 @@ class HacsRepositoryExistException(HacsException):
 
 class HacsExecutionStillInProgress(HacsException):
  """Exception to raise if execution is still in progress."""
+
+
+class AddonRepositoryException(HacsException):
+ """Exception to raise when user tries to add add-on repository."""
+
+ exception_message = (
+ "The repository does not seem to be a integration, "
+ "but an add-on repository. HACS does not manage add-ons."
+ )
+
+ def __init__(self) -> None:
+ super().__init__(self.exception_message)
+
+
+class HomeAssistantCoreRepositoryException(HacsException):
+ """Exception to raise when user tries to add the home-assistant/core repository."""
+
+ exception_message = (
+ "You can not add homeassistant/core, to use core integrations "
+ "check the Home Assistant documentation for how to add them."
+ )
+
+ def __init__(self) -> None:
+ super().__init__(self.exception_message)

custom_components/hacs/repositories/integration.py

@@ -7,7 +7,7 @@
 from homeassistant.loader import async_get_custom_components
 
 from ..enums import HacsCategory, HacsGitHubRepo, RepositoryFile
-from ..exceptions import HacsException
+from ..exceptions import AddonRepositoryException, HacsException
 from ..utils.decode import decode_content
 from ..utils.decorator import concurrent
 from ..utils.filters import get_first_directory_in_directory
@@ -57,16 +57,11 @@ async def validate_repository(self):
  name = get_first_directory_in_directory(self.tree, "custom_components")
  if name is None:
  if (
- self.data.full_name == "home-assistant/addons"
- or self.data.full_name.startswith("hassio-addons/")
- or "repository.json" in self.treefiles
+ "repository.json" in self.treefiles
  or "repository.yaml" in self.treefiles
  or "repository.yml" in self.treefiles
  ):
- raise HacsException(
- "The repository does not seem to be a integration, "
- "but an add-on repository. HACS does not manage add-ons."
- )
+ raise AddonRepositoryException()
  raise HacsException(
  f"Repository structure for {self.ref.replace('tags/','')} is not compliant"
  )

tests/stories/test_registration.py

@@ -7,7 +7,11 @@
 
 from custom_components.hacs.base import HacsBase
 from custom_components.hacs.enums import HacsCategory
-from custom_components.hacs.exceptions import HacsException
+from custom_components.hacs.exceptions import (
+ AddonRepositoryException,
+ HacsException,
+ HomeAssistantCoreRepositoryException,
+)
 
 from tests.sample_data import (
  category_test_treefiles,
@@ -85,21 +89,10 @@ async def test_registration(
 @pytest.mark.parametrize(
  "repository_full_name,expected_message",
  (
- (
- "home-assistant/core",
- "You can not add homeassistant/core, to use core integrations "
- "check the Home Assistant documentation for how to add them.",
- ),
- (
- "home-assistant/addons",
- "The repository does not seem to be a integration, "
- "but an add-on repository. HACS does not manage add-ons.",
- ),
- (
- "some-user/addons",
- "The repository does not seem to be a integration, "
- "but an add-on repository. HACS does not manage add-ons.",
- ),
+ ("home-assistant/core", HomeAssistantCoreRepositoryException.exception_message),
+ ("home-assistant/addons", AddonRepositoryException.exception_message),
+ ("hassio-addons/some-addon", AddonRepositoryException.exception_message),
+ ("some-user/addons", AddonRepositoryException.exception_message),
  ("some-user/some-invalid-repo", "Repository structure for main is not compliant"),
  ),
 )
@@ -137,6 +130,9 @@ async def test_registration_issues(
  "home-assistant/addons": [
  {"path": "repository.json", "type": "blob"},
  ],
+ "hassio-addons/some-addon": [
+ {"path": "repository.json", "type": "blob"},
+ ],
  "some-user/addons": [
  {"path": "repository.yaml", "type": "blob"},
  ],