Remvoe RepositoryHelperProperties

custom_components/hacs/helpers/__init__.py

@@ -3,12 +3,10 @@
     HacsHelperMethods,
     RepositoryHelperMethods,
 )
-from custom_components.hacs.helpers.properties import RepositoryHelperProperties
 
 
 class RepositoryHelpers(
     RepositoryHelperMethods,
-    RepositoryHelperProperties,
 ):
     """Helper class for repositories"""
 

custom_components/hacs/helpers/classes/repository.py

@@ -32,7 +32,11 @@
 from custom_components.hacs.utils.logger import getLogger
 from custom_components.hacs.utils.path import is_safe
 from custom_components.hacs.utils.queue_manager import QueueManager
-from custom_components.hacs.utils.version import version_to_download
+from custom_components.hacs.utils.version import (
+    version_left_higher_or_equal_then_right,
+    version_to_download,
+    version_left_higher_then_right,
+)
 
 
 class RepositoryVersions:
@@ -162,7 +166,7 @@ def display_status(self):
             status = "new"
         elif self.pending_restart:
             status = "pending-restart"
-        elif self.pending_upgrade:
+        elif self.pending_update:
             status = "pending-upgrade"
         elif self.data.installed:
             status = "installed"
@@ -227,6 +231,40 @@ def main_action(self):
         }
         return actions[self.display_status]
 
+    @property
+    def pending_update(self) -> bool:
+        """Return True if pending update."""
+        if not self.can_download:
+            return False
+        if self.data.installed:
+            if self.data.selected_tag is not None:
+                if self.data.selected_tag == self.data.default_branch:
+                    if self.data.installed_commit != self.data.last_commit:
+                        return True
+                    return False
+            if self.display_version_or_commit == "version":
+                if version_left_higher_then_right(
+                    self.display_available_version,
+                    self.display_installed_version,
+                ):
+                    return True
+            if self.display_installed_version != self.display_available_version:
+                return True
+
+        return False
+
+    @property
+    def can_download(self) -> bool:
+        """Return True if we can download."""
+        if self.data.homeassistant is not None:
+            if self.data.releases:
+                if not version_left_higher_or_equal_then_right(
+                    self.hacs.core.ha_version.string,
+                    self.data.homeassistant,
+                ):
+                    return False
+        return True
+
     async def common_validate(self, ignore_issues=False):
         """Common validation steps of the repository."""
         await common_validate(self, ignore_issues)

custom_components/hacs/helpers/functions/template.py

@@ -20,7 +20,7 @@ def render_template(content, context):
         render = Template(content)
         render = render.render(
             installed=context.data.installed,
-            pending_update=context.pending_upgrade,
+            pending_update=context.pending_update,
             prerelease=prerelease,
             selected_tag=context.data.selected_tag,
             version_available=context.releases.last_release,

custom_components/hacs/helpers/methods/installation.py

@@ -54,7 +54,7 @@ async def async_install_repository(repository):
         raise HacsException("repository.content.path.local is None")
     repository.validate.errors = []
 
-    if not repository.can_install:
+    if not repository.can_download:
         raise HacsException("The version of Home Assistant is not compatible with this version")
 
     version = version_to_download(repository)

custom_components/hacs/sensor.py

@@ -72,7 +72,7 @@ def _update(self) -> None:
         repositories = [
             repository
             for repository in self.hacs.repositories.list_all
-            if repository.pending_upgrade
+            if repository.pending_update
         ]
         self._attr_native_value = len(repositories)
         self._attr_extra_state_attributes = {

custom_components/hacs/tasks/setup_websocket_api.py

@@ -143,7 +143,7 @@ async def hacs_repositories(_hass, connection, msg):
                     "authors": repo.data.authors,
                     "available_version": repo.display_available_version,
                     "beta": repo.data.show_beta,
-                    "can_install": repo.can_install,
+                    "can_install": repo.can_download,
                     "category": repo.data.category,
                     "config_flow": repo.data.config_flow,
                     "country": repo.data.country,
@@ -169,7 +169,7 @@ async def hacs_repositories(_hass, connection, msg):
                     "main_action": repo.main_action,
                     "name": repo.display_name,
                     "new": repo.data.new,
-                    "pending_upgrade": repo.pending_upgrade,
+                    "pending_upgrade": repo.pending_update,
                     "releases": repo.data.published_tags,
                     "selected_tag": repo.data.selected_tag,
                     "stars": repo.data.stargazers_count,

tests/helpers/methods/test_installation_method.py

@@ -12,6 +12,6 @@ async def test_installation_method(repository):
     with pytest.raises(HacsException):
         await repository.async_install()
 
-    # repository.can_install = True
+    # repository.can_download = True
 
     await repository._async_post_install()

tests/repositories/helpers/test_properties.py

@@ -7,7 +7,7 @@
 
 def test_repository_helpers_properties_can_be_installed():
     repository = HacsRepository()
-    assert repository.can_be_installed
+    assert repository.can_download
 
 
 def test_repository_helpers_properties_pending_update():

tests/repositories/test_can_install.py

@@ -12,16 +12,16 @@ def test_hacs_can_install(hacs):
 
     hacs.core.ha_version = AwesomeVersion("1.0.0")
     repository.data.homeassistant = "1.0.0b1"
-    assert repository.can_install
+    assert repository.can_download
 
     hacs.core.ha_version = AwesomeVersion("1.0.0b1")
     repository.data.homeassistant = "1.0.0"
-    assert not repository.can_install
+    assert not repository.can_download
 
     hacs.core.ha_version = AwesomeVersion("1.0.0b1")
     repository.data.homeassistant = "1.0.0b2"
-    assert not repository.can_install
+    assert not repository.can_download
 
     hacs.core.ha_version = AwesomeVersion("1.0.0")
     repository.data.homeassistant = "1.0.0"
-    assert repository.can_install
+    assert repository.can_download

tests/repositories/test_core.py

@@ -20,8 +20,8 @@ def test_hacs_repository_core_mostly_defaults():
     assert repository.display_version_or_commit == "commit"
     assert repository.display_available_version == ""
     assert repository.display_installed_version == ""
-    assert repository.can_install
-    assert not repository.pending_upgrade
+    assert repository.can_download
+    assert not repository.pending_update
 
 
 def test_hacs_repository_core_can_install_legacy():
@@ -30,13 +30,13 @@ def test_hacs_repository_core_can_install_legacy():
     repository.data.releases = True
 
     repository.data.homeassistant = "1.1.0"
-    assert not repository.can_install
+    assert not repository.can_download
 
     repository.data.homeassistant = "1.0.0"
-    assert repository.can_install
+    assert repository.can_download
 
     repository.data.homeassistant = "0.1.0"
-    assert repository.can_install
+    assert repository.can_download
 
 
 def test_hacs_repository_core_can_install_manifest():
@@ -45,10 +45,10 @@ def test_hacs_repository_core_can_install_manifest():
     repository.data.releases = True
 
     repository.data.homeassistant = "1.1.0"
-    assert not repository.can_install
+    assert not repository.can_download
 
     repository.data.homeassistant = "1.0.0"
-    assert repository.can_install
+    assert repository.can_download
 
     repository.data.homeassistant = "0.1.0"
-    assert repository.can_install
+    assert repository.can_download