#743 - Trying to fix this.

config/custom_components/hacs/hacsbase/data.py

@@ -42,28 +42,39 @@ class HacsData:
                 repository_manifest = repository.repository_manifest.manifest
             else:
                 repository_manifest = None
-            content[repository.information.uid] = {
+            data = {
                 "authors": repository.data.authors,
                 "category": repository.data.category,
                 "description": repository.data.description,
-                "downloads": repository.releases.downloads,
+                "domain": repository.data.domain,
+                "downloads": repository.data.downloads,
                 "full_name": repository.data.full_name,
                 "first_install": repository.status.first_install,
-                "hide": repository.status.hide,
-                "installed_commit": repository.versions.installed_commit,
-                "installed": repository.status.installed,
-                "last_commit": repository.versions.available_commit,
-                "last_release_tag": repository.versions.available,
-                "last_updated": repository.information.last_updated,
+                "installed_commit": repository.data.installed_commit,
+                "installed": repository.data.installed,
+                "last_commit": repository.data.last_commit,
+                "last_release_tag": repository.data.last_version,
+                "last_updated": repository.data.last_updated,
                 "name": repository.data.name,
-                "new": repository.status.new,
+                "new": repository.data.new,
                 "repository_manifest": repository_manifest,
-                "selected_tag": repository.status.selected_tag,
-                "show_beta": repository.status.show_beta,
+                "selected_tag": repository.data.selected_tag,
+                "show_beta": repository.data.show_beta,
                 "stars": repository.data.stargazers_count,
                 "topics": repository.data.topics,
-                "version_installed": repository.versions.installed,
+                "version_installed": repository.data.installed_version,
             }
+            if data:
+                if repository.data.installed and (
+                    repository.data.installed_commit
+                    or repository.data.installed_version
+                ):
+                    await async_save_to_store(
+                        self.hacs.hass,
+                        f"hacs/{repository.data.id}.hacs",
+                        repository.data.to_json(),
+                    )
+                content[str(repository.data.id)] = data
 
         await async_save_to_store(self.hacs.hass, "repositories", content)
         self.hacs.hass.bus.async_fire("hacs/repository", {})
@@ -79,6 +90,7 @@ class HacsData:
                 self.hacs.system.status.new = True
                 return True
             self.logger.info("Restore started")
+            self.hacs.system.status.new = False
 
             # Hacs
             self.hacs.configuration.frontend_mode = hacs.get("view", "Grid")
@@ -88,21 +100,40 @@ class HacsData:
             # Repositories
             for entry in repositories:
                 repo = repositories[entry]
-                if not self.hacs.is_known(repo["full_name"]):
+                if not self.hacs.is_known(entry):
                     await register_repository(
                         repo["full_name"], repo["category"], False
                     )
-                repository = self.hacs.get_by_name(repo["full_name"])
-                if repository is None:
-                    self.logger.error(f"Did not find {repo['full_name']}")
+                repository = [
+                    x
+                    for x in self.hacs.repositories
+                    if str(x.data.id) == str(entry)
+                    or x.data.full_name == repo["full_name"]
+                ]
+                if not repository:
+                    self.logger.error(f"Did not find {repo['full_name']} ({entry})")
                     continue
 
+                repository = repository[0]
+
                 # Restore repository attributes
-                repository.information.uid = entry
+                repository.data.id = entry
                 await self.hacs.hass.async_add_executor_job(
                     restore_repository_data, repository, repo
                 )
 
+                restored = await async_load_from_store(
+                    self.hacs.hass, f"hacs/{entry}.hacs"
+                )
+
+                if restored:
+                    repository.data.update_data(restored)
+                    if not repository.data.installed:
+                        repository.logger.debug(
+                            "Should be installed but is not... Fixing that!"
+                        )
+                        repository.data.installed = True
+
             self.logger.info("Restore done")
         except Exception as exception:  # pylint: disable=broad-except
             self.logger.critical(f"[{exception}] Restore Failed!")
@@ -117,27 +148,28 @@ def restore_repository_data(
     repository.data.authors = repository_data.get("authors", [])
     repository.data.description = repository_data.get("description")
     repository.releases.last_release_object_downloads = repository_data.get("downloads")
-    repository.information.last_updated = repository_data.get("last_updated")
+    repository.data.last_updated = repository_data.get("last_updated")
     repository.data.topics = repository_data.get("topics", [])
+    repository.data.domain = repository_data.get("domain", None)
     repository.data.stargazers_count = repository_data.get("stars", 0)
     repository.releases.last_release = repository_data.get("last_release_tag")
-    repository.status.hide = repository_data.get("hide", False)
-    repository.status.installed = repository_data.get("installed", False)
-    repository.status.new = repository_data.get("new", True)
-    repository.status.selected_tag = repository_data.get("selected_tag")
-    repository.status.show_beta = repository_data.get("show_beta", False)
-    repository.versions.available = repository_data.get("last_release_tag")
-    repository.versions.available_commit = repository_data.get("last_commit")
-    repository.versions.installed = repository_data.get("version_installed")
-    repository.versions.installed_commit = repository_data.get("installed_commit")
+    repository.data.hide = repository_data.get("hide", False)
+    repository.data.installed = repository_data.get("installed", False)
+    repository.data.new = repository_data.get("new", True)
+    repository.data.selected_tag = repository_data.get("selected_tag")
+    repository.data.show_beta = repository_data.get("show_beta", False)
+    repository.data.last_version = repository_data.get("last_release_tag")
+    repository.data.last_commit = repository_data.get("last_commit")
+    repository.data.installed_version = repository_data.get("version_installed")
+    repository.data.installed_commit = repository_data.get("installed_commit")
 
     repository.repository_manifest = HacsManifest.from_dict(
         repository_data.get("repository_manifest", {})
     )
 
-    if repository.status.installed:
+    if repository.data.installed:
         repository.status.first_install = False
 
     if repository_data["full_name"] == "hacs/integration":
-        repository.versions.installed = VERSION
-        repository.status.installed = True
+        repository.data.installed_version = VERSION
+        repository.data.installed = True