Handle repository renames (#2144)

* Handle repository renames

* Fix test

custom_components/hacs/base.py

@@ -25,6 +25,7 @@ class HacsCommon:
  categories: List = []
  default: List = []
  installed: List = []
+ renamed_repositories = {}
  skip: List = []
 
 

custom_components/hacs/hacsbase/data.py

@@ -48,6 +48,13 @@ async def async_write(self):
 
  self.logger.debug("Saving data")
 
+ # Renamed repositories
+ await async_save_to_store(
+ self.hacs.hass,
+ "renamed_repositories",
+ self.hacs.common.renamed_repositories,
+ )
+
  # Hacs
  await async_save_to_store(
  self.hacs.hass,
@@ -120,6 +127,9 @@ async def restore(self):
  """Restore saved data."""
  hacs = await async_load_from_store(self.hacs.hass, "hacs")
  repositories = await async_load_from_store(self.hacs.hass, "repositories") or {}
+ self.hacs.common.renamed_repositories = (
+ await async_load_from_store(self.hacs.hass, "renamed_repositories") or {}
+ )
 
  if not hacs and not repositories:
  # Assume new install

custom_components/hacs/hacsbase/hacs.py

@@ -60,6 +60,7 @@ class HacsCommon:
  categories = []
  default = []
  installed = []
+ renamed_repositories = {}
  skip = []
 
 
@@ -388,6 +389,8 @@ async def async_get_category_repositories(self, category: HacsCategory):
  """Get repositories from category."""
  repositories = await async_get_list_from_default(category)
  for repo in repositories:
+ if self.common.renamed_repositories.get(repo):
+ repo = self.common.renamed_repositories[repo]
  if is_removed(repo):
  continue
  repository = self.get_by_name(repo)

custom_components/hacs/helpers/classes/exceptions.py

@@ -15,3 +15,7 @@ class HacsNotModifiedException(HacsException):
 
 class HacsExpectedException(HacsException):
  """For stuff that are expected."""
+
+
+class HacsRepositoryExistException(HacsException):
+ """For repositories that are already exist."""

custom_components/hacs/helpers/functions/register_repository.py

@@ -1,14 +1,19 @@
 """Register a repository."""
+from __future__ import annotations
+from typing import TYPE_CHECKING
 from aiogithubapi import AIOGitHubAPIException
 
 from custom_components.hacs.helpers.classes.exceptions import (
  HacsException,
  HacsExpectedException,
+ HacsRepositoryExistException,
 )
 from custom_components.hacs.share import get_hacs
 
 from ...repositories import RERPOSITORY_CLASSES
 
+if TYPE_CHECKING:
+ from ..classes.repository import HacsRepository
 
 # @concurrent(15, 5)
 async def register_repository(full_name, category, check=True, ref=None):
@@ -22,7 +27,7 @@ async def register_repository(full_name, category, check=True, ref=None):
  if category not in RERPOSITORY_CLASSES:
  raise HacsException(f"{category} is not a valid repository category.")
 
- repository = RERPOSITORY_CLASSES[category](full_name)
+ repository: HacsRepository = RERPOSITORY_CLASSES[category](full_name)
  if check:
  try:
  await repository.async_registration(ref)
@@ -39,6 +44,8 @@ async def register_repository(full_name, category, check=True, ref=None):
  repository.logger.info("%s Validation completed", repository)
  else:
  repository.logger.info("%s Registration completed", repository)
+ except HacsRepositoryExistException:
+ return
  except AIOGitHubAPIException as exception:
  hacs.common.skip.append(repository.data.full_name)
  raise HacsException(

custom_components/hacs/helpers/functions/validate_repository.py

@@ -1,10 +1,14 @@
 """Helper to do common validation for repositories."""
+from __future__ import annotations
+from typing import TYPE_CHECKING
+
 from aiogithubapi import AIOGitHubAPIException
 
 from custom_components.hacs.helpers.classes.exceptions import (
  HacsException,
  HacsNotModifiedException,
  HacsRepositoryArchivedException,
+ HacsRepositoryExistException,
 )
 from custom_components.hacs.helpers.functions.information import (
  get_releases,
@@ -16,6 +20,9 @@
 )
 from custom_components.hacs.share import get_hacs, is_removed
 
+if TYPE_CHECKING:
+ from custom_components.hacs.helpers.classes.repository import HacsRepository
+
 
 async def common_validate(repository, ignore_issues=False):
  """Common validation steps of the repository."""
@@ -29,7 +36,9 @@ async def common_validate(repository, ignore_issues=False):
  await repository.get_repository_manifest_content()
 
 
-async def common_update_data(repository, ignore_issues=False, force=False):
+async def common_update_data(
+ repository: HacsRepository, ignore_issues=False, force=False
+):
  """Common update data."""
  hacs = get_hacs()
  releases = []
@@ -43,10 +52,19 @@ async def common_update_data(repository, ignore_issues=False, force=False):
  else repository.data.etag_repository,
  )
  repository.repository_object = repository_object
+ if repository.data.full_name != repository_object.full_name:
+ hacs.common.renamed_repositories[
+ repository.data.full_name
+ ] = repository_object.full_name
+ if str(repository_object.id) not in hacs.common.default:
+ hacs.common.default.append(str(repository_object.id))
+ raise HacsRepositoryExistException
  repository.data.update_data(repository_object.attributes)
  repository.data.etag_repository = etag
  except HacsNotModifiedException:
  return
+ except HacsRepositoryExistException:
+ raise HacsRepositoryExistException from None
  except (AIOGitHubAPIException, HacsException) as exception:
  if not hacs.status.startup:
  repository.logger.error("%s %s", repository, exception)

tests/hacsbase/test_hacsbase_data.py

@@ -55,6 +55,8 @@ async def _mocked_loads(hass, key):
  }
  elif key == "hacs":
  return {"view": "Grid", "compact": False, "onboarding_done": True}
+ elif key == "renamed_repositories":
+ return {}
  else:
  raise ValueError(f"No mock for {key}")