Compare commits
47 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 08aa4b5e15 | |||
| b1676482f0 | |||
| e46cd6e488 | |||
| edd2fdd3fb | |||
| a4a0c1462b | |||
| 196e63c08e | |||
| 518ac1d59d | |||
| ad699dc69a | |||
| a8e247d288 | |||
| 318d517575 | |||
| db137be5b1 | |||
| 83cec0f75a | |||
| cda9914d50 | |||
| 3acefbfbe8 | |||
| 4d10c5c91e | |||
| 810ff6fe85 | |||
| b2d3d940f2 | |||
| 8b1d828c59 | |||
| 824a9e5cad | |||
| 1cbc204e88 | |||
| 561c323e67 | |||
| 5c604b40c6 | |||
| cc8db6a034 | |||
| e0ad133221 | |||
| 0e27a03aaf | |||
| e2dfa20789 | |||
| 8e8b58d2d2 | |||
| 76ecaabd98 | |||
| 3f14dc3bd9 | |||
| 50a78714cc | |||
| 3bf01c91f1 | |||
| 7aa14284dd | |||
| 24933e980d | |||
| e10624df6b | |||
| 1a1ebd3821 | |||
| d3d61067db | |||
| 23b605becf | |||
| c07f8615e4 | |||
| 9b209a15bf | |||
| 30258bd2c0 | |||
| 2c8ca490ea | |||
| 9e8a8e81b9 | |||
| f5b2534fdb | |||
| 8b3916c3fa | |||
| 13e71046f8 | |||
| 58e3674325 | |||
| 828d84caa3 |
89
CHANGELOG.md
89
CHANGELOG.md
@@ -11,6 +11,95 @@ Sections:
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## [0.6.0] - 2026-01-18
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- Restore feature with selection of the last available backups (up to 5 per domain).
|
||||||
|
- New API endpoints to list and restore backups:
|
||||||
|
- `GET /api/bcs/backups?repo_id=...`
|
||||||
|
- `POST /api/bcs/restore?repo_id=...&backup_id=...`
|
||||||
|
|
||||||
|
### Safety
|
||||||
|
- Restoring a backup triggers a “restart required” prompt to apply the recovered integration state.
|
||||||
|
|
||||||
|
### Notes
|
||||||
|
- This is a major release milestone consolidating install/update/uninstall, backup/rollback, and restore workflows.
|
||||||
|
|
||||||
|
## [0.5.11] - 2026-01-18
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- Automatic backup of existing custom components before install or update.
|
||||||
|
- Backup retention with a configurable limit per domain.
|
||||||
|
|
||||||
|
### Safety
|
||||||
|
- Automatic rollback is triggered if an install or update fails after a backup was created.
|
||||||
|
|
||||||
|
## [0.5.10] - 2026-01-17
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- Store view controls: Filter and Sort dropdowns alongside the existing Category selector.
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Search input focus is preserved while typing (cursor no longer jumps out after re-render).
|
||||||
|
|
||||||
|
## [0.5.9] - 2026-01-17
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- README is now collapsible with a preview by default (Show more / Show less).
|
||||||
|
- Improved mobile readability by keeping long README content contained without affecting the page layout.
|
||||||
|
|
||||||
|
## [0.5.8] - 2026-01-17
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Mobile UI layout stabilized to prevent horizontal shifting.
|
||||||
|
- README rendering no longer expands the page width on mobile devices.
|
||||||
|
- Tables and code blocks inside README now scroll within their container.
|
||||||
|
- Floating action buttons removed to avoid UI overlap on small screens.
|
||||||
|
- Header icon buttons improved for better visibility in light and dark mode.
|
||||||
|
|
||||||
|
## [0.5.7] - 2026-01-17
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Mobile UI improvements: removed floating action buttons to prevent overlay issues.
|
||||||
|
- Improved responsive layout to avoid horizontal overflow (badges, URLs, descriptions).
|
||||||
|
- README rendering on mobile is more stable (better wrapping and image scaling).
|
||||||
|
- Header icon buttons are more readable in both light and dark mode.
|
||||||
|
|
||||||
|
## [0.5.6] - 2026-01-17
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- Repository uninstall support directly from the Store UI.
|
||||||
|
- New backend API endpoint: `POST /api/bcs/uninstall`.
|
||||||
|
- Automatic **reconcile**: repositories are marked as not installed when their `custom_components` directories are removed manually.
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Installation & Updates section extended with an Uninstall button.
|
||||||
|
- Store state now remains consistent even after manual file system changes.
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Repositories remained marked as installed after manual deletion of their domains.
|
||||||
|
- UI cache issues caused by outdated static assets.
|
||||||
|
|
||||||
|
## [0.5.5] - 2026-01-16
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Update entities now refresh their displayed name after store refreshes, so repository names replace fallback IDs (e.g. `index:1`) reliably.
|
||||||
|
|
||||||
|
## [0.5.4] - 2026-01-16
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- Native **Repair fix flow** for restart-required situations.
|
||||||
|
- “Restart required” issues are now **fixable** and provide a confirmation dialog with a real restart action.
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Restart-required issues are automatically cleared after Home Assistant restarts.
|
||||||
|
- Update entities now fully align with official Home Assistant behavior (Updates screen + Repairs integration).
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Fixed integration startup issues caused by incorrect file placement.
|
||||||
|
- Resolved circular import and missing setup errors during Home Assistant startup.
|
||||||
|
- Ensured YAML-based setup remains fully supported.
|
||||||
|
|
||||||
## [0.5.3] - 2026-01-16
|
## [0.5.3] - 2026-01-16
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|||||||
2
bcs.yaml
2
bcs.yaml
@@ -4,7 +4,7 @@ description: >
|
|||||||
Supports GitHub, GitLab, Gitea and Bahmcloud repositories with
|
Supports GitHub, GitLab, Gitea and Bahmcloud repositories with
|
||||||
a central index, UI panel and API, similar to HACS but independent.
|
a central index, UI panel and API, similar to HACS but independent.
|
||||||
|
|
||||||
category: Store
|
category: integration
|
||||||
|
|
||||||
author: Bahmcloud
|
author: Bahmcloud
|
||||||
maintainer: Bahmcloud
|
maintainer: Bahmcloud
|
||||||
|
|||||||
@@ -1,166 +1,86 @@
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
from dataclasses import dataclass
|
from datetime import timedelta
|
||||||
from typing import Any
|
|
||||||
|
|
||||||
from homeassistant.components.update import UpdateEntity, UpdateEntityFeature
|
from homeassistant.core import HomeAssistant
|
||||||
from homeassistant.core import HomeAssistant, callback
|
from homeassistant.components.panel_custom import async_register_panel
|
||||||
from homeassistant.helpers.dispatcher import async_dispatcher_connect
|
from homeassistant.helpers.event import async_track_time_interval
|
||||||
from homeassistant.helpers.entity_platform import AddEntitiesCallback
|
from homeassistant.helpers.discovery import async_load_platform
|
||||||
from homeassistant.helpers.entity import EntityCategory
|
|
||||||
|
|
||||||
from .core import DOMAIN, SIGNAL_UPDATED, BCSCore
|
from .core import BCSCore, BCSConfig, BCSError
|
||||||
|
|
||||||
_LOGGER = logging.getLogger(__name__)
|
_LOGGER = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
DOMAIN = "bahmcloud_store"
|
||||||
|
|
||||||
|
DEFAULT_STORE_URL = "https://git.bahmcloud.de/bahmcloud/ha_store/raw/branch/main/store.yaml"
|
||||||
|
CONF_STORE_URL = "store_url"
|
||||||
|
|
||||||
|
|
||||||
|
async def async_setup(hass: HomeAssistant, config: dict) -> bool:
|
||||||
|
cfg = config.get(DOMAIN, {}) or {}
|
||||||
|
store_url = cfg.get(CONF_STORE_URL, DEFAULT_STORE_URL)
|
||||||
|
|
||||||
|
core = BCSCore(hass, BCSConfig(store_url=store_url))
|
||||||
|
hass.data[DOMAIN] = core
|
||||||
|
|
||||||
|
await core.async_initialize()
|
||||||
|
|
||||||
|
# Provide native Update entities in Settings -> System -> Updates.
|
||||||
|
# This integration is YAML-based (async_setup), therefore we load the platform manually.
|
||||||
|
await async_load_platform(hass, "update", DOMAIN, {}, config)
|
||||||
|
|
||||||
|
from .views import (
|
||||||
|
StaticAssetsView,
|
||||||
|
BCSApiView,
|
||||||
|
BCSReadmeView,
|
||||||
|
BCSCustomRepoView,
|
||||||
|
BCSInstallView,
|
||||||
|
BCSUpdateView,
|
||||||
|
BCSUninstallView,
|
||||||
|
BCSBackupsView,
|
||||||
|
BCSRestoreView,
|
||||||
|
BCSRestartView,
|
||||||
|
)
|
||||||
|
|
||||||
|
hass.http.register_view(StaticAssetsView())
|
||||||
|
hass.http.register_view(BCSApiView(core))
|
||||||
|
hass.http.register_view(BCSReadmeView(core))
|
||||||
|
hass.http.register_view(BCSCustomRepoView(core))
|
||||||
|
hass.http.register_view(BCSInstallView(core))
|
||||||
|
hass.http.register_view(BCSUpdateView(core))
|
||||||
|
hass.http.register_view(BCSUninstallView(core))
|
||||||
|
hass.http.register_view(BCSBackupsView(core))
|
||||||
|
hass.http.register_view(BCSRestoreView(core))
|
||||||
|
hass.http.register_view(BCSRestartView(core))
|
||||||
|
|
||||||
|
await async_register_panel(
|
||||||
|
hass,
|
||||||
|
frontend_url_path="bahmcloud-store",
|
||||||
|
webcomponent_name="bahmcloud-store-panel",
|
||||||
|
# IMPORTANT: bump v to avoid caching old JS
|
||||||
|
module_url="/api/bahmcloud_store_static/panel.js?v=103",
|
||||||
|
sidebar_title="Bahmcloud Store",
|
||||||
|
sidebar_icon="mdi:store",
|
||||||
|
require_admin=True,
|
||||||
|
config={},
|
||||||
|
)
|
||||||
|
|
||||||
def _pretty_repo_name(core: BCSCore, repo_id: str) -> str:
|
|
||||||
"""Return a human-friendly name for a repo update entity."""
|
|
||||||
try:
|
try:
|
||||||
repo = core.get_repo(repo_id)
|
await core.full_refresh(source="startup")
|
||||||
if repo and getattr(repo, "name", None):
|
except BCSError as e:
|
||||||
name = str(repo.name).strip()
|
_LOGGER.error("Initial refresh failed: %s", e)
|
||||||
if name:
|
|
||||||
return name
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
# Fallbacks
|
|
||||||
if repo_id.startswith("index:"):
|
|
||||||
return f"BCS Index {repo_id.split(':', 1)[1]}"
|
|
||||||
if repo_id.startswith("custom:"):
|
|
||||||
return f"BCS Custom {repo_id.split(':', 1)[1]}"
|
|
||||||
return f"BCS {repo_id}"
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class _RepoKey:
|
|
||||||
repo_id: str
|
|
||||||
|
|
||||||
|
|
||||||
class BCSRepoUpdateEntity(UpdateEntity):
|
|
||||||
"""Update entity representing a BCS-managed repository."""
|
|
||||||
|
|
||||||
_attr_entity_category = EntityCategory.DIAGNOSTIC
|
|
||||||
_attr_supported_features = UpdateEntityFeature.INSTALL
|
|
||||||
|
|
||||||
def __init__(self, core: BCSCore, repo_id: str) -> None:
|
|
||||||
self._core = core
|
|
||||||
self._repo_id = repo_id
|
|
||||||
self._in_progress = False
|
|
||||||
|
|
||||||
# Stable unique id (do NOT change)
|
|
||||||
self._attr_unique_id = f"{DOMAIN}:{repo_id}"
|
|
||||||
|
|
||||||
# Human-friendly name in UI
|
|
||||||
pretty = _pretty_repo_name(core, repo_id)
|
|
||||||
self._attr_name = pretty
|
|
||||||
|
|
||||||
# Title shown in the entity dialog
|
|
||||||
self._attr_title = pretty
|
|
||||||
|
|
||||||
@property
|
|
||||||
def available(self) -> bool:
|
|
||||||
repo = self._core.get_repo(self._repo_id)
|
|
||||||
installed = self._core.get_installed(self._repo_id)
|
|
||||||
return repo is not None and installed is not None
|
|
||||||
|
|
||||||
@property
|
|
||||||
def in_progress(self) -> bool | None:
|
|
||||||
return self._in_progress
|
|
||||||
|
|
||||||
@property
|
|
||||||
def installed_version(self) -> str | None:
|
|
||||||
installed = self._core.get_installed(self._repo_id) or {}
|
|
||||||
v = installed.get("installed_version") or installed.get("ref")
|
|
||||||
return str(v) if v else None
|
|
||||||
|
|
||||||
@property
|
|
||||||
def latest_version(self) -> str | None:
|
|
||||||
repo = self._core.get_repo(self._repo_id)
|
|
||||||
if not repo:
|
|
||||||
return None
|
|
||||||
v = getattr(repo, "latest_version", None)
|
|
||||||
return str(v) if v else None
|
|
||||||
|
|
||||||
@property
|
|
||||||
def update_available(self) -> bool:
|
|
||||||
latest = self.latest_version
|
|
||||||
installed = self.installed_version
|
|
||||||
if not latest or not installed:
|
|
||||||
return False
|
|
||||||
return latest != installed
|
|
||||||
|
|
||||||
def version_is_newer(self, latest_version: str, installed_version: str) -> bool:
|
|
||||||
return latest_version != installed_version
|
|
||||||
|
|
||||||
@property
|
|
||||||
def release_url(self) -> str | None:
|
|
||||||
repo = self._core.get_repo(self._repo_id)
|
|
||||||
return getattr(repo, "url", None) if repo else None
|
|
||||||
|
|
||||||
async def async_install(self, version: str | None, backup: bool, **kwargs: Any) -> None:
|
|
||||||
if version is not None:
|
|
||||||
_LOGGER.debug(
|
|
||||||
"BCS update entity requested specific version=%s (ignored)", version
|
|
||||||
)
|
|
||||||
|
|
||||||
self._in_progress = True
|
|
||||||
self.async_write_ha_state()
|
|
||||||
|
|
||||||
|
async def periodic(_now) -> None:
|
||||||
try:
|
try:
|
||||||
await self._core.update_repo(self._repo_id)
|
await core.full_refresh(source="timer")
|
||||||
finally:
|
except BCSError as e:
|
||||||
self._in_progress = False
|
_LOGGER.warning("Periodic refresh failed: %s", e)
|
||||||
self.async_write_ha_state()
|
except Exception as e: # pylint: disable=broad-exception-caught
|
||||||
|
_LOGGER.exception("Unexpected error during periodic refresh: %s", e)
|
||||||
|
|
||||||
|
interval_seconds = int(getattr(core, "refresh_seconds", 300) or 300)
|
||||||
|
async_track_time_interval(hass, periodic, timedelta(seconds=interval_seconds))
|
||||||
|
|
||||||
@callback
|
return True
|
||||||
def _sync_entities(
|
|
||||||
core: BCSCore,
|
|
||||||
existing: dict[str, BCSRepoUpdateEntity],
|
|
||||||
async_add_entities: AddEntitiesCallback,
|
|
||||||
) -> None:
|
|
||||||
"""Ensure there is one update entity per installed repo."""
|
|
||||||
installed_map = getattr(core, "_installed_cache", {}) or {}
|
|
||||||
new_entities: list[BCSRepoUpdateEntity] = []
|
|
||||||
|
|
||||||
for repo_id, data in installed_map.items():
|
|
||||||
if not isinstance(data, dict):
|
|
||||||
continue
|
|
||||||
if repo_id in existing:
|
|
||||||
continue
|
|
||||||
|
|
||||||
ent = BCSRepoUpdateEntity(core, repo_id)
|
|
||||||
existing[repo_id] = ent
|
|
||||||
new_entities.append(ent)
|
|
||||||
|
|
||||||
if new_entities:
|
|
||||||
async_add_entities(new_entities)
|
|
||||||
|
|
||||||
for ent in existing.values():
|
|
||||||
ent.async_write_ha_state()
|
|
||||||
|
|
||||||
|
|
||||||
async def async_setup_platform(
|
|
||||||
hass: HomeAssistant,
|
|
||||||
config,
|
|
||||||
async_add_entities: AddEntitiesCallback,
|
|
||||||
discovery_info=None,
|
|
||||||
):
|
|
||||||
"""Set up BCS update entities."""
|
|
||||||
core: BCSCore | None = hass.data.get(DOMAIN)
|
|
||||||
if not core:
|
|
||||||
_LOGGER.debug("BCS core not available, skipping update platform setup")
|
|
||||||
return
|
|
||||||
|
|
||||||
entities: dict[str, BCSRepoUpdateEntity] = {}
|
|
||||||
|
|
||||||
_sync_entities(core, entities, async_add_entities)
|
|
||||||
|
|
||||||
@callback
|
|
||||||
def _handle_update() -> None:
|
|
||||||
_sync_entities(core, entities, async_add_entities)
|
|
||||||
|
|
||||||
async_dispatcher_connect(hass, SIGNAL_UPDATED, _handle_update)
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"domain": "bahmcloud_store",
|
"domain": "bahmcloud_store",
|
||||||
"name": "Bahmcloud Store",
|
"name": "Bahmcloud Store",
|
||||||
"version": "0.5.3",
|
"version": "0.6.0",
|
||||||
"documentation": "https://git.bahmcloud.de/bahmcloud/bahmcloud_store",
|
"documentation": "https://git.bahmcloud.de/bahmcloud/bahmcloud_store",
|
||||||
"platforms": ["update"],
|
"platforms": ["update"],
|
||||||
"requirements": [],
|
"requirements": [],
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ class BahmcloudStorePanel extends HTMLElement {
|
|||||||
|
|
||||||
this._installingRepoId = null;
|
this._installingRepoId = null;
|
||||||
this._updatingRepoId = null;
|
this._updatingRepoId = null;
|
||||||
|
this._uninstallingRepoId = null;
|
||||||
this._restartRequired = false;
|
this._restartRequired = false;
|
||||||
this._lastActionMsg = null;
|
this._lastActionMsg = null;
|
||||||
}
|
}
|
||||||
@@ -141,6 +142,36 @@ class BahmcloudStorePanel extends HTMLElement {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async _uninstallRepo(repoId) {
|
||||||
|
if (!repoId) return;
|
||||||
|
if (this._installingRepoId || this._updatingRepoId || this._uninstallingRepoId) return;
|
||||||
|
|
||||||
|
const r = this._repoById(repoId);
|
||||||
|
const name = this._safeText(r?.name) || repoId;
|
||||||
|
|
||||||
|
const ok = window.confirm(`Uninstall "${name}"?\n\nThis will delete the integration folder(s) from /config/custom_components. A restart will be required.`);
|
||||||
|
if (!ok) return;
|
||||||
|
|
||||||
|
this._uninstallingRepoId = repoId;
|
||||||
|
this._lastActionMsg = null;
|
||||||
|
this.requestUpdate();
|
||||||
|
|
||||||
|
try {
|
||||||
|
const resp = await this._hass.callApi("post", `bcs/uninstall?repo_id=${encodeURIComponent(repoId)}`, {});
|
||||||
|
if (resp && resp.ok) {
|
||||||
|
this._restartRequired = !!resp.restart_required;
|
||||||
|
this._lastActionMsg = "Uninstalled. Restart required.";
|
||||||
|
} else {
|
||||||
|
this._lastActionMsg = (resp && resp.message) ? String(resp.message) : "Uninstall failed.";
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
this._lastActionMsg = e && e.message ? e.message : "Uninstall failed.";
|
||||||
|
} finally {
|
||||||
|
this._uninstallingRepoId = null;
|
||||||
|
await this._load();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async _restartHA() {
|
async _restartHA() {
|
||||||
if (!this._hass) return;
|
if (!this._hass) return;
|
||||||
try {
|
try {
|
||||||
@@ -436,15 +467,15 @@ class BahmcloudStorePanel extends HTMLElement {
|
|||||||
|
|
||||||
<div class="mobilebar">
|
<div class="mobilebar">
|
||||||
<div class="left">
|
<div class="left">
|
||||||
<div class="iconbtn" id="menuBtn" title="Menu">☰</div>
|
<div class="iconbtn" id="menuBtn" title="Menu">鈽<EFBFBD></div>
|
||||||
<div class="iconbtn" id="backBtn" title="Back">←</div>
|
<div class="iconbtn" id="backBtn" title="Back">鈫<EFBFBD></div>
|
||||||
<div>
|
<div>
|
||||||
<div style="font-weight:700;">Bahmcloud Store</div>
|
<div style="font-weight:700;">Bahmcloud Store</div>
|
||||||
<div class="muted small" id="subtitle">Store</div>
|
<div class="muted small" id="subtitle">Store</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="right">
|
<div class="right">
|
||||||
<div class="iconbtn" id="refreshBtn" title="Refresh">⟳</div>
|
<div class="iconbtn" id="refreshBtn" title="Refresh">鉄<EFBFBD></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -506,7 +537,7 @@ class BahmcloudStorePanel extends HTMLElement {
|
|||||||
: "";
|
: "";
|
||||||
|
|
||||||
if (this._loading) {
|
if (this._loading) {
|
||||||
content.innerHTML = `${err}<div class="card">Loading…</div>`;
|
content.innerHTML = `${err}<div class="card">Loading鈥<EFBFBD></div>`;
|
||||||
fabs.innerHTML = "";
|
fabs.innerHTML = "";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -608,7 +639,7 @@ class BahmcloudStorePanel extends HTMLElement {
|
|||||||
if (updateAvailable) badges.push("Update");
|
if (updateAvailable) badges.push("Update");
|
||||||
|
|
||||||
const badgeHtml = badges.length
|
const badgeHtml = badges.length
|
||||||
? `<div class="badge">${this._esc(badges.join(" · "))}</div>`
|
? `<div class="badge">${this._esc(badges.join(" 路 "))}</div>`
|
||||||
: `<div class="badge">${this._esc(this._safeText(r?.provider || "repo"))}</div>`;
|
: `<div class="badge">${this._esc(this._safeText(r?.provider || "repo"))}</div>`;
|
||||||
|
|
||||||
return `
|
return `
|
||||||
@@ -628,7 +659,7 @@ class BahmcloudStorePanel extends HTMLElement {
|
|||||||
|
|
||||||
return `
|
return `
|
||||||
<div class="filters">
|
<div class="filters">
|
||||||
<input id="q" placeholder="Search…" value="${this._esc(this._search)}" />
|
<input id="q" placeholder="Search鈥<EFBFBD>" value="${this._esc(this._search)}" />
|
||||||
<select id="cat">
|
<select id="cat">
|
||||||
<option value="all">All categories</option>
|
<option value="all">All categories</option>
|
||||||
${categories.map((c) => `<option value="${this._esc(c)}" ${this._category === c ? "selected" : ""}>${this._esc(c)}</option>`).join("")}
|
${categories.map((c) => `<option value="${this._esc(c)}" ${this._category === c ? "selected" : ""}>${this._esc(c)}</option>`).join("")}
|
||||||
@@ -640,7 +671,7 @@ class BahmcloudStorePanel extends HTMLElement {
|
|||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="muted small">Version: ${this._esc(this._data.version || "-")} · Repositories: ${repos.length}</div>
|
<div class="muted small">Version: ${this._esc(this._data.version || "-")} 路 Repositories: ${repos.length}</div>
|
||||||
|
|
||||||
<div class="grid" style="margin-top:12px;">
|
<div class="grid" style="margin-top:12px;">
|
||||||
${cards || `<div class="card">No repositories found.</div>`}
|
${cards || `<div class="card">No repositories found.</div>`}
|
||||||
@@ -713,7 +744,7 @@ class BahmcloudStorePanel extends HTMLElement {
|
|||||||
].filter(Boolean);
|
].filter(Boolean);
|
||||||
|
|
||||||
const readmeBlock = this._readmeLoading
|
const readmeBlock = this._readmeLoading
|
||||||
? `<div class="card">Loading README…</div>`
|
? `<div class="card">Loading README鈥<EFBFBD></div>`
|
||||||
: this._readmeText
|
: this._readmeText
|
||||||
? `
|
? `
|
||||||
<div class="card">
|
<div class="card">
|
||||||
@@ -748,12 +779,14 @@ class BahmcloudStorePanel extends HTMLElement {
|
|||||||
|
|
||||||
const busyInstall = this._installingRepoId === repoId;
|
const busyInstall = this._installingRepoId === repoId;
|
||||||
const busyUpdate = this._updatingRepoId === repoId;
|
const busyUpdate = this._updatingRepoId === repoId;
|
||||||
const busy = busyInstall || busyUpdate;
|
const busyUninstall = this._uninstallingRepoId === repoId;
|
||||||
|
const busy = busyInstall || busyUpdate || busyUninstall;
|
||||||
|
|
||||||
const updateAvailable = installed && !!latestVersion && (!installedVersion || latestVersion !== installedVersion);
|
const updateAvailable = installed && !!latestVersion && (!installedVersion || latestVersion !== installedVersion);
|
||||||
|
|
||||||
const installBtn = `<button class="primary" id="btnInstall" ${installed || busy ? "disabled" : ""}>${busyInstall ? "Installing…" : installed ? "Installed" : "Install"}</button>`;
|
const installBtn = `<button class="primary" id="btnInstall" ${installed || busy ? "disabled" : ""}>${busyInstall ? "Installing鈥<EFBFBD>" : installed ? "Installed" : "Install"}</button>`;
|
||||||
const updateBtn = `<button class="primary" id="btnUpdate" ${!updateAvailable || busy ? "disabled" : ""}>${busyUpdate ? "Updating…" : updateAvailable ? "Update" : "Up to date"}</button>`;
|
const updateBtn = `<button class="primary" id="btnUpdate" ${!updateAvailable || busy ? "disabled" : ""}>${busyUpdate ? "Updating鈥<EFBFBD>" : updateAvailable ? "Update" : "Up to date"}</button>`;
|
||||||
|
const uninstallBtn = `<button id="btnUninstall" ${!installed || busy ? "disabled" : ""}>${busyUninstall ? "Uninstalling鈥<67>" : "Uninstall"}</button>`;
|
||||||
|
|
||||||
const restartHint = this._restartRequired
|
const restartHint = this._restartRequired
|
||||||
? `
|
? `
|
||||||
@@ -777,7 +810,7 @@ class BahmcloudStorePanel extends HTMLElement {
|
|||||||
<div>
|
<div>
|
||||||
<div><strong style="font-size:16px;">${this._esc(name)}</strong></div>
|
<div><strong style="font-size:16px;">${this._esc(name)}</strong></div>
|
||||||
<div class="muted">${this._esc(desc)}</div>
|
<div class="muted">${this._esc(desc)}</div>
|
||||||
<div class="muted small" style="margin-top:8px;">${this._esc(infoBits.join(" · "))}</div>
|
<div class="muted small" style="margin-top:8px;">${this._esc(infoBits.join(" 路 "))}</div>
|
||||||
<div class="muted small" style="margin-top:8px;">
|
<div class="muted small" style="margin-top:8px;">
|
||||||
<a href="${this._esc(url)}" target="_blank" rel="noreferrer">Open repository</a>
|
<a href="${this._esc(url)}" target="_blank" rel="noreferrer">Open repository</a>
|
||||||
</div>
|
</div>
|
||||||
@@ -805,6 +838,7 @@ class BahmcloudStorePanel extends HTMLElement {
|
|||||||
<div class="row" style="margin-top:14px; gap:10px; flex-wrap:wrap;">
|
<div class="row" style="margin-top:14px; gap:10px; flex-wrap:wrap;">
|
||||||
${installBtn}
|
${installBtn}
|
||||||
${updateBtn}
|
${updateBtn}
|
||||||
|
${uninstallBtn}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
${restartHint}
|
${restartHint}
|
||||||
@@ -820,6 +854,7 @@ class BahmcloudStorePanel extends HTMLElement {
|
|||||||
// Always wire action buttons (even if README is already loaded)
|
// Always wire action buttons (even if README is already loaded)
|
||||||
const btnInstall = root.getElementById("btnInstall");
|
const btnInstall = root.getElementById("btnInstall");
|
||||||
const btnUpdate = root.getElementById("btnUpdate");
|
const btnUpdate = root.getElementById("btnUpdate");
|
||||||
|
const btnUninstall = root.getElementById("btnUninstall");
|
||||||
const btnRestart = root.getElementById("btnRestart");
|
const btnRestart = root.getElementById("btnRestart");
|
||||||
|
|
||||||
if (btnInstall) {
|
if (btnInstall) {
|
||||||
@@ -836,6 +871,13 @@ class BahmcloudStorePanel extends HTMLElement {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (btnUninstall) {
|
||||||
|
btnUninstall.addEventListener("click", () => {
|
||||||
|
if (btnUninstall.disabled) return;
|
||||||
|
if (this._detailRepoId) this._uninstallRepo(this._detailRepoId);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
if (btnRestart) {
|
if (btnRestart) {
|
||||||
btnRestart.addEventListener("click", () => this._restartHA());
|
btnRestart.addEventListener("click", () => this._restartHA());
|
||||||
}
|
}
|
||||||
@@ -848,7 +890,7 @@ class BahmcloudStorePanel extends HTMLElement {
|
|||||||
mount.innerHTML = this._readmeHtml;
|
mount.innerHTML = this._readmeHtml;
|
||||||
this._postprocessRenderedMarkdown(mount);
|
this._postprocessRenderedMarkdown(mount);
|
||||||
} else {
|
} else {
|
||||||
mount.innerHTML = `<div class="muted">Rendered HTML not available. Use “Show raw Markdown”.</div>`;
|
mount.innerHTML = `<div class="muted">Rendered HTML not available. Use 鈥淪how raw Markdown鈥<EFBFBD>.</div>`;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
mount.innerHTML = "";
|
mount.innerHTML = "";
|
||||||
@@ -883,10 +925,10 @@ class BahmcloudStorePanel extends HTMLElement {
|
|||||||
|
|
||||||
return `
|
return `
|
||||||
<div class="fabs">
|
<div class="fabs">
|
||||||
<button class="fabbtn primary" id="fabOpen" title="Open repository">↗</button>
|
<button class="fabbtn primary" id="fabOpen" title="Open repository">鈫<EFBFBD></button>
|
||||||
<button class="fabbtn" id="fabReload" title="Reload README">⟳</button>
|
<button class="fabbtn" id="fabReload" title="Reload README">鉄<EFBFBD></button>
|
||||||
<button class="fabbtn" id="fabInstall" title="${installDisabled ? (installed ? "Already installed" : "Installing…") : "Install"}" ${installDisabled ? "disabled" : ""}>+</button>
|
<button class="fabbtn" id="fabInstall" title="${installDisabled ? (installed ? "Already installed" : "Installing鈥<EFBFBD>") : "Install"}" ${installDisabled ? "disabled" : ""}>锛<EFBFBD></button>
|
||||||
<button class="fabbtn" id="fabUpdate" title="${updateDisabled ? (!installed ? "Not installed" : "No update available") : "Update"}" ${updateDisabled ? "disabled" : ""}>↑</button>
|
<button class="fabbtn" id="fabUpdate" title="${updateDisabled ? (!installed ? "Not installed" : "No update available") : "Update"}" ${updateDisabled ? "disabled" : ""}>鈫<EFBFBD></button>
|
||||||
<button class="fabbtn" id="fabInfo" title="About">i</button>
|
<button class="fabbtn" id="fabInfo" title="About">i</button>
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,10 +1,24 @@
|
|||||||
body { font-family: system-ui, sans-serif; margin:0; }
|
body { font-family: system-ui, sans-serif; margin:0; }
|
||||||
.wrap { padding: 16px; max-width: 1000px; margin: 0 auto; }
|
.wrap { padding: 16px; max-width: 1000px; margin: 0 auto; }
|
||||||
.card { border: 1px solid #ddd; border-radius: 10px; padding: 12px; margin: 10px 0; }
|
.card { border: 1px solid #ddd; border-radius: 10px; padding: 12px; margin: 10px 0; }
|
||||||
.row { display:flex; justify-content:space-between; gap: 12px; align-items: flex-start; }
|
.row { display:flex; justify-content:space-between; gap: 12px; align-items: flex-start; flex-wrap: wrap; min-width:0; }
|
||||||
.badge { border: 1px solid #bbb; border-radius: 999px; padding: 2px 8px; font-size: 12px; height: fit-content; }
|
.badge { border: 1px solid #bbb; border-radius: 999px; padding: 2px 8px; font-size: 12px; height: fit-content; }
|
||||||
.muted { color: #666; font-size: 13px; margin-top: 4px; }
|
.muted { color: #666; font-size: 13px; margin-top: 4px; }
|
||||||
.actions { display:flex; gap: 8px; margin-top: 10px; }
|
.actions { display:flex; gap: 8px; margin-top: 10px; }
|
||||||
button { padding: 8px 12px; cursor:pointer; }
|
button { padding: 8px 12px; cursor:pointer; }
|
||||||
button[disabled] { opacity: 0.6; cursor: not-allowed; }
|
button[disabled] { opacity: 0.6; cursor: not-allowed; }
|
||||||
a { color: inherit; }
|
a { color: inherit; }
|
||||||
|
|
||||||
|
/* Basic markdown safety (in case styles.css is used by older panels) */
|
||||||
|
.md { max-width: 100%; overflow-x: auto; }
|
||||||
|
.md table { display:block; max-width:100%; overflow-x:auto; }
|
||||||
|
.md img { max-width: 100%; height: auto; }
|
||||||
|
|
||||||
|
/* README UX (E2): collapsible preview (standalone page only) */
|
||||||
|
.readmeWrap{ border:1px solid #ddd; border-radius:10px; padding:12px; background: #f7f7f7; max-width:100%; }
|
||||||
|
.readmeWrap.collapsed{ max-height:260px; overflow:hidden; position:relative; }
|
||||||
|
.readmeWrap.collapsed::after{ content:""; position:absolute; left:0; right:0; bottom:0; height:56px; background: linear-gradient(to bottom, rgba(247,247,247,0), #f7f7f7); pointer-events:none; }
|
||||||
|
.readmeWrap.expanded{ max-height:70vh; overflow:auto; }
|
||||||
|
.readmeActions{ display:flex; justify-content:flex-end; margin-top:10px; }
|
||||||
|
button.link{ border:none; background:transparent; padding:6px 10px; color:#1E88E5; }
|
||||||
|
button.link:hover{ text-decoration:underline; }
|
||||||
|
|||||||
55
custom_components/bahmcloud_store/repairs.py
Normal file
55
custom_components/bahmcloud_store/repairs.py
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import logging
|
||||||
|
|
||||||
|
import voluptuous as vol
|
||||||
|
|
||||||
|
from homeassistant.components.repairs import RepairsFlow
|
||||||
|
from homeassistant.core import HomeAssistant
|
||||||
|
from homeassistant import data_entry_flow
|
||||||
|
|
||||||
|
from .core import RESTART_REQUIRED_ISSUE_ID
|
||||||
|
|
||||||
|
_LOGGER = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
class BCSRestartRequiredFlow(RepairsFlow):
|
||||||
|
"""Repairs flow to restart Home Assistant after BCS install/update."""
|
||||||
|
|
||||||
|
def __init__(self, hass: HomeAssistant) -> None:
|
||||||
|
self.hass = hass
|
||||||
|
|
||||||
|
async def async_step_init(
|
||||||
|
self, user_input: dict[str, str] | None = None
|
||||||
|
) -> data_entry_flow.FlowResult:
|
||||||
|
return await self.async_step_confirm(user_input)
|
||||||
|
|
||||||
|
async def async_step_confirm(
|
||||||
|
self, user_input: dict[str, str] | None = None
|
||||||
|
) -> data_entry_flow.FlowResult:
|
||||||
|
if user_input is not None:
|
||||||
|
_LOGGER.info("BCS repairs flow: restarting Home Assistant (user confirmed)")
|
||||||
|
await self.hass.services.async_call(
|
||||||
|
"homeassistant",
|
||||||
|
"restart",
|
||||||
|
{},
|
||||||
|
blocking=False,
|
||||||
|
)
|
||||||
|
return self.async_create_entry(title="", data={})
|
||||||
|
|
||||||
|
return self.async_show_form(
|
||||||
|
step_id="confirm",
|
||||||
|
data_schema=vol.Schema({}),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
async def async_create_fix_flow(
|
||||||
|
hass: HomeAssistant,
|
||||||
|
issue_id: str,
|
||||||
|
data: dict[str, str | int | float | None] | None,
|
||||||
|
) -> RepairsFlow:
|
||||||
|
"""Create a repairs flow for BCS fixable issues."""
|
||||||
|
if issue_id == RESTART_REQUIRED_ISSUE_ID:
|
||||||
|
return BCSRestartRequiredFlow(hass)
|
||||||
|
|
||||||
|
raise data_entry_flow.UnknownHandler
|
||||||
@@ -4,5 +4,15 @@
|
|||||||
"title": "Restart required",
|
"title": "Restart required",
|
||||||
"description": "One or more integrations were installed or updated by Bahmcloud Store. Restart Home Assistant to load the changes."
|
"description": "One or more integrations were installed or updated by Bahmcloud Store. Restart Home Assistant to load the changes."
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"repair_flow": {
|
||||||
|
"restart_required": {
|
||||||
|
"step": {
|
||||||
|
"confirm": {
|
||||||
|
"title": "Restart Home Assistant",
|
||||||
|
"description": "Bahmcloud Store installed or updated integrations. Restart Home Assistant now to apply the changes."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -26,7 +26,6 @@ def _pretty_repo_name(core: BCSCore, repo_id: str) -> str:
|
|||||||
except Exception:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
# Fallbacks
|
|
||||||
if repo_id.startswith("index:"):
|
if repo_id.startswith("index:"):
|
||||||
return f"BCS Index {repo_id.split(':', 1)[1]}"
|
return f"BCS Index {repo_id.split(':', 1)[1]}"
|
||||||
if repo_id.startswith("custom:"):
|
if repo_id.startswith("custom:"):
|
||||||
@@ -53,11 +52,11 @@ class BCSRepoUpdateEntity(UpdateEntity):
|
|||||||
# Stable unique id (do NOT change)
|
# Stable unique id (do NOT change)
|
||||||
self._attr_unique_id = f"{DOMAIN}:{repo_id}"
|
self._attr_unique_id = f"{DOMAIN}:{repo_id}"
|
||||||
|
|
||||||
# Human-friendly name in UI
|
self._refresh_display_name()
|
||||||
pretty = _pretty_repo_name(core, repo_id)
|
|
||||||
self._attr_name = pretty
|
|
||||||
|
|
||||||
# Title shown in the entity dialog
|
def _refresh_display_name(self) -> None:
|
||||||
|
pretty = _pretty_repo_name(self._core, self._repo_id)
|
||||||
|
self._attr_name = pretty
|
||||||
self._attr_title = pretty
|
self._attr_title = pretty
|
||||||
|
|
||||||
@property
|
@property
|
||||||
@@ -102,9 +101,7 @@ class BCSRepoUpdateEntity(UpdateEntity):
|
|||||||
|
|
||||||
async def async_install(self, version: str | None, backup: bool, **kwargs: Any) -> None:
|
async def async_install(self, version: str | None, backup: bool, **kwargs: Any) -> None:
|
||||||
if version is not None:
|
if version is not None:
|
||||||
_LOGGER.debug(
|
_LOGGER.debug("BCS update entity requested specific version=%s (ignored)", version)
|
||||||
"BCS update entity requested specific version=%s (ignored)", version
|
|
||||||
)
|
|
||||||
|
|
||||||
self._in_progress = True
|
self._in_progress = True
|
||||||
self.async_write_ha_state()
|
self.async_write_ha_state()
|
||||||
@@ -117,19 +114,18 @@ class BCSRepoUpdateEntity(UpdateEntity):
|
|||||||
|
|
||||||
|
|
||||||
@callback
|
@callback
|
||||||
def _sync_entities(
|
def _sync_entities(core: BCSCore, existing: dict[str, BCSRepoUpdateEntity], async_add_entities: AddEntitiesCallback) -> None:
|
||||||
core: BCSCore,
|
"""Ensure there is one update entity per installed repo AND keep names in sync."""
|
||||||
existing: dict[str, BCSRepoUpdateEntity],
|
|
||||||
async_add_entities: AddEntitiesCallback,
|
|
||||||
) -> None:
|
|
||||||
"""Ensure there is one update entity per installed repo."""
|
|
||||||
installed_map = getattr(core, "_installed_cache", {}) or {}
|
installed_map = getattr(core, "_installed_cache", {}) or {}
|
||||||
new_entities: list[BCSRepoUpdateEntity] = []
|
new_entities: list[BCSRepoUpdateEntity] = []
|
||||||
|
|
||||||
for repo_id, data in installed_map.items():
|
for repo_id, data in installed_map.items():
|
||||||
if not isinstance(data, dict):
|
if not isinstance(data, dict):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if repo_id in existing:
|
if repo_id in existing:
|
||||||
|
# IMPORTANT: Update display name after refresh, when repo.name becomes available.
|
||||||
|
existing[repo_id]._refresh_display_name()
|
||||||
continue
|
continue
|
||||||
|
|
||||||
ent = BCSRepoUpdateEntity(core, repo_id)
|
ent = BCSRepoUpdateEntity(core, repo_id)
|
||||||
|
|||||||
@@ -334,6 +334,74 @@ class BCSUpdateView(HomeAssistantView):
|
|||||||
return web.json_response({"ok": False, "message": str(e) or "Update failed"}, status=500)
|
return web.json_response({"ok": False, "message": str(e) or "Update failed"}, status=500)
|
||||||
|
|
||||||
|
|
||||||
|
class BCSUninstallView(HomeAssistantView):
|
||||||
|
url = "/api/bcs/uninstall"
|
||||||
|
name = "api:bcs_uninstall"
|
||||||
|
requires_auth = True
|
||||||
|
|
||||||
|
def __init__(self, core: Any) -> None:
|
||||||
|
self.core: BCSCore = core
|
||||||
|
|
||||||
|
async def post(self, request: web.Request) -> web.Response:
|
||||||
|
repo_id = request.query.get("repo_id")
|
||||||
|
if not repo_id:
|
||||||
|
return web.json_response({"ok": False, "message": "Missing repo_id"}, status=400)
|
||||||
|
|
||||||
|
try:
|
||||||
|
result = await self.core.uninstall_repo(repo_id)
|
||||||
|
return web.json_response(result, status=200)
|
||||||
|
except Exception as e:
|
||||||
|
_LOGGER.exception("BCS uninstall failed: %s", e)
|
||||||
|
return web.json_response({"ok": False, "message": str(e) or "Uninstall failed"}, status=500)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
class BCSBackupsView(HomeAssistantView):
|
||||||
|
url = "/api/bcs/backups"
|
||||||
|
name = "api:bcs_backups"
|
||||||
|
requires_auth = True
|
||||||
|
|
||||||
|
def __init__(self, core: Any) -> None:
|
||||||
|
self.core: BCSCore = core
|
||||||
|
|
||||||
|
async def get(self, request: web.Request) -> web.Response:
|
||||||
|
repo_id = request.query.get("repo_id")
|
||||||
|
if not repo_id:
|
||||||
|
return web.json_response({"ok": False, "message": "Missing repo_id"}, status=400)
|
||||||
|
|
||||||
|
try:
|
||||||
|
backups = await self.core.list_repo_backups(repo_id)
|
||||||
|
return web.json_response({"ok": True, "repo_id": repo_id, "backups": backups}, status=200)
|
||||||
|
except Exception as e:
|
||||||
|
_LOGGER.exception("BCS list backups failed: %s", e)
|
||||||
|
return web.json_response({"ok": False, "message": str(e) or "List backups failed"}, status=500)
|
||||||
|
|
||||||
|
|
||||||
|
class BCSRestoreView(HomeAssistantView):
|
||||||
|
url = "/api/bcs/restore"
|
||||||
|
name = "api:bcs_restore"
|
||||||
|
requires_auth = True
|
||||||
|
|
||||||
|
def __init__(self, core: Any) -> None:
|
||||||
|
self.core: BCSCore = core
|
||||||
|
|
||||||
|
async def post(self, request: web.Request) -> web.Response:
|
||||||
|
repo_id = request.query.get("repo_id")
|
||||||
|
backup_id = request.query.get("backup_id")
|
||||||
|
if not repo_id:
|
||||||
|
return web.json_response({"ok": False, "message": "Missing repo_id"}, status=400)
|
||||||
|
if not backup_id:
|
||||||
|
return web.json_response({"ok": False, "message": "Missing backup_id"}, status=400)
|
||||||
|
|
||||||
|
try:
|
||||||
|
result = await self.core.restore_repo_backup(repo_id, backup_id)
|
||||||
|
return web.json_response(result, status=200)
|
||||||
|
except Exception as e:
|
||||||
|
_LOGGER.exception("BCS restore failed: %s", e)
|
||||||
|
return web.json_response({"ok": False, "message": str(e) or "Restore failed"}, status=500)
|
||||||
|
|
||||||
|
|
||||||
class BCSRestartView(HomeAssistantView):
|
class BCSRestartView(HomeAssistantView):
|
||||||
url = "/api/bcs/restart"
|
url = "/api/bcs/restart"
|
||||||
name = "api:bcs_restart"
|
name = "api:bcs_restart"
|
||||||
|
|||||||
Reference in New Issue
Block a user