Compare commits
52 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 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 | |||
| c18e93406a | |||
| 9af18ba090 | |||
| fff50a1580 | |||
| f8e9967c3a | |||
| 7bc493eb45 | |||
| b97b970a45 | |||
| 593e0c367d | |||
| 8e0817a64b | |||
| dfc7e44565 | |||
| c9c4f99fbf | |||
| 37cc11c9ee | |||
| 9c773c07e8 | |||
| c04612e159 | |||
| 5796012189 |
75
CHANGELOG.md
75
CHANGELOG.md
@@ -11,6 +11,81 @@ Sections:
|
||||
|
||||
---
|
||||
|
||||
## [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
|
||||
|
||||
### Added
|
||||
- Native Home Assistant Update entities for installed repositories (shown under **Settings → System → Updates**).
|
||||
- Human-friendly update names based on repository name (instead of internal repo IDs like `index:1`).
|
||||
|
||||
### Changed
|
||||
- Update UI now behaves like official Home Assistant integrations (update action is triggered via the HA Updates screen).
|
||||
|
||||
## [0.5.2] - 2026-01-16
|
||||
|
||||
### Added
|
||||
|
||||
2
bcs.yaml
2
bcs.yaml
@@ -4,7 +4,7 @@ description: >
|
||||
Supports GitHub, GitLab, Gitea and Bahmcloud repositories with
|
||||
a central index, UI panel and API, similar to HACS but independent.
|
||||
|
||||
category: Store
|
||||
category: integration
|
||||
|
||||
author: Bahmcloud
|
||||
maintainer: Bahmcloud
|
||||
|
||||
@@ -6,6 +6,7 @@ from datetime import timedelta
|
||||
from homeassistant.core import HomeAssistant
|
||||
from homeassistant.components.panel_custom import async_register_panel
|
||||
from homeassistant.helpers.event import async_track_time_interval
|
||||
from homeassistant.helpers.discovery import async_load_platform
|
||||
|
||||
from .core import BCSCore, BCSConfig, BCSError
|
||||
|
||||
@@ -26,6 +27,10 @@ async def async_setup(hass: HomeAssistant, config: dict) -> bool:
|
||||
|
||||
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,
|
||||
@@ -33,6 +38,7 @@ async def async_setup(hass: HomeAssistant, config: dict) -> bool:
|
||||
BCSCustomRepoView,
|
||||
BCSInstallView,
|
||||
BCSUpdateView,
|
||||
BCSUninstallView,
|
||||
BCSRestartView,
|
||||
)
|
||||
|
||||
@@ -42,6 +48,7 @@ async def async_setup(hass: HomeAssistant, config: dict) -> bool:
|
||||
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(BCSRestartView(core))
|
||||
|
||||
await async_register_panel(
|
||||
@@ -49,7 +56,7 @@ async def async_setup(hass: HomeAssistant, config: dict) -> bool:
|
||||
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=101",
|
||||
module_url="/api/bahmcloud_store_static/panel.js?v=102",
|
||||
sidebar_title="Bahmcloud Store",
|
||||
sidebar_icon="mdi:store",
|
||||
require_admin=True,
|
||||
|
||||
@@ -15,7 +15,8 @@ from urllib.parse import parse_qsl, urlencode, urlsplit, urlunsplit, urlparse
|
||||
|
||||
from homeassistant.core import HomeAssistant
|
||||
from homeassistant.helpers.aiohttp_client import async_get_clientsession
|
||||
from homeassistant.components import persistent_notification
|
||||
from homeassistant.helpers.dispatcher import async_dispatcher_send
|
||||
from homeassistant.helpers import issue_registry as ir
|
||||
from homeassistant.util import yaml as ha_yaml
|
||||
|
||||
from .storage import BCSStorage, CustomRepo
|
||||
@@ -26,6 +27,9 @@ _LOGGER = logging.getLogger(__name__)
|
||||
|
||||
DOMAIN = "bahmcloud_store"
|
||||
|
||||
SIGNAL_UPDATED = f"{DOMAIN}_updated"
|
||||
RESTART_REQUIRED_ISSUE_ID = "restart_required"
|
||||
|
||||
|
||||
class BCSError(Exception):
|
||||
"""BCS core error."""
|
||||
@@ -91,6 +95,9 @@ class BCSCore:
|
||||
self.version = await self._read_manifest_version_async()
|
||||
await self._refresh_installed_cache()
|
||||
|
||||
# After a successful HA restart, restart-required is no longer relevant.
|
||||
self._clear_restart_required_issue()
|
||||
|
||||
async def _read_manifest_version_async(self) -> str:
|
||||
def _read() -> str:
|
||||
try:
|
||||
@@ -107,12 +114,44 @@ class BCSCore:
|
||||
self._listeners.append(cb)
|
||||
|
||||
def signal_updated(self) -> None:
|
||||
# Notify entities/platforms (e.g. update entities) that BCS data changed.
|
||||
async_dispatcher_send(self.hass, SIGNAL_UPDATED)
|
||||
for cb in list(self._listeners):
|
||||
try:
|
||||
cb()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
def _mark_restart_required(self) -> None:
|
||||
"""Show a 'restart required' issue in Home Assistant Settings.
|
||||
|
||||
IMPORTANT:
|
||||
- is_fixable=True enables the "Fix/OK" button
|
||||
- the real action is implemented in repairs.py (fix flow)
|
||||
"""
|
||||
try:
|
||||
ir.async_create_issue(
|
||||
self.hass,
|
||||
DOMAIN,
|
||||
RESTART_REQUIRED_ISSUE_ID,
|
||||
is_fixable=True, # <-- IMPORTANT: show "Fix" button
|
||||
is_persistent=False,
|
||||
severity=ir.IssueSeverity.WARNING,
|
||||
translation_key=RESTART_REQUIRED_ISSUE_ID,
|
||||
)
|
||||
except Exception:
|
||||
_LOGGER.debug("Failed to create restart required issue", exc_info=True)
|
||||
|
||||
def _clear_restart_required_issue(self) -> None:
|
||||
"""Remove restart required issue after HA restarted."""
|
||||
try:
|
||||
if hasattr(ir, "async_delete_issue"):
|
||||
ir.async_delete_issue(self.hass, DOMAIN, RESTART_REQUIRED_ISSUE_ID)
|
||||
elif hasattr(ir, "async_remove_issue"):
|
||||
ir.async_remove_issue(self.hass, DOMAIN, RESTART_REQUIRED_ISSUE_ID)
|
||||
except Exception:
|
||||
_LOGGER.debug("Failed to clear restart required issue", exc_info=True)
|
||||
|
||||
async def full_refresh(self, source: str = "manual") -> None:
|
||||
"""Single refresh entry-point used by both timer and manual button."""
|
||||
_LOGGER.info("BCS full refresh triggered (source=%s)", source)
|
||||
@@ -122,6 +161,11 @@ class BCSCore:
|
||||
def get_repo(self, repo_id: str) -> RepoItem | None:
|
||||
return self.repos.get(repo_id)
|
||||
|
||||
def get_installed(self, repo_id: str) -> dict[str, Any] | None:
|
||||
"""Return cached installation info for a repo_id (no I/O)."""
|
||||
data = (self._installed_cache or {}).get(repo_id)
|
||||
return data if isinstance(data, dict) else None
|
||||
|
||||
async def refresh(self) -> None:
|
||||
index_repos, refresh_seconds = await self._load_index_repos()
|
||||
self.refresh_seconds = refresh_seconds
|
||||
@@ -322,7 +366,6 @@ class BCSCore:
|
||||
if isinstance(d, list):
|
||||
installed_domains = [str(x) for x in d if str(x).strip()]
|
||||
|
||||
# IMPORTANT: this is the ref we installed (tag/release/branch)
|
||||
v = inst.get("installed_version")
|
||||
installed_version = str(v) if v is not None else None
|
||||
|
||||
@@ -367,7 +410,6 @@ class BCSCore:
|
||||
)
|
||||
|
||||
def _pick_ref_for_install(self, repo: RepoItem) -> str:
|
||||
# Prefer latest_version (release/tag/atom-derived), fallback to default branch, then main.
|
||||
if repo.latest_version and str(repo.latest_version).strip():
|
||||
return str(repo.latest_version).strip()
|
||||
if repo.default_branch and str(repo.default_branch).strip():
|
||||
@@ -375,13 +417,6 @@ class BCSCore:
|
||||
return "main"
|
||||
|
||||
def _build_zip_url(self, repo_url: str, ref: str) -> str:
|
||||
"""Build a public ZIP download URL (provider-neutral, no tokens).
|
||||
|
||||
Supports:
|
||||
- GitHub: codeload
|
||||
- GitLab: /-/archive/
|
||||
- Gitea (incl. Bahmcloud): /archive/<ref>.zip
|
||||
"""
|
||||
ref = (ref or "").strip()
|
||||
if not ref:
|
||||
raise BCSInstallError("Missing ref for ZIP download")
|
||||
@@ -480,21 +515,93 @@ class BCSCore:
|
||||
return await self.hass.async_add_executor_job(_read)
|
||||
|
||||
async def _refresh_installed_cache(self) -> None:
|
||||
"""Refresh installed cache and reconcile with filesystem.
|
||||
|
||||
If a user manually deletes a domain folder under /config/custom_components,
|
||||
we automatically remove the installed flag from our storage so the Store UI
|
||||
does not show stale "installed" state.
|
||||
"""
|
||||
try:
|
||||
items = await self.storage.list_installed_repos()
|
||||
cache: dict[str, Any] = {}
|
||||
|
||||
# Determine which installed repos still exist on disk.
|
||||
cc_root = Path(self.hass.config.path("custom_components"))
|
||||
to_remove: list[str] = []
|
||||
|
||||
for it in items:
|
||||
domains = [str(d) for d in (it.domains or []) if str(d).strip()]
|
||||
|
||||
# A repo is considered "present" if at least one of its domains
|
||||
# exists and contains a manifest.json.
|
||||
present = False
|
||||
for d in domains:
|
||||
p = cc_root / d
|
||||
if p.is_dir() and (p / "manifest.json").exists():
|
||||
present = True
|
||||
break
|
||||
|
||||
if not present:
|
||||
to_remove.append(it.repo_id)
|
||||
continue
|
||||
|
||||
cache[it.repo_id] = {
|
||||
"domains": it.domains,
|
||||
"installed_version": it.installed_version, # BCS ref
|
||||
"installed": True,
|
||||
"domains": domains,
|
||||
"installed_version": it.installed_version,
|
||||
"installed_manifest_version": it.installed_manifest_version,
|
||||
"ref": it.ref,
|
||||
"installed_at": it.installed_at,
|
||||
}
|
||||
|
||||
# Remove stale installed entries from storage.
|
||||
for rid in to_remove:
|
||||
try:
|
||||
await self.storage.remove_installed_repo(rid)
|
||||
_LOGGER.info("BCS reconcile: removed stale installed repo_id=%s", rid)
|
||||
except Exception:
|
||||
_LOGGER.debug("BCS reconcile: failed removing stale repo_id=%s", rid, exc_info=True)
|
||||
|
||||
self._installed_cache = cache
|
||||
except Exception:
|
||||
self._installed_cache = {}
|
||||
|
||||
async def uninstall_repo(self, repo_id: str) -> dict[str, Any]:
|
||||
"""Uninstall a repository by deleting its installed domains and clearing storage."""
|
||||
async with self._install_lock:
|
||||
inst = await self.storage.get_installed_repo(repo_id)
|
||||
if not inst:
|
||||
# Already uninstalled.
|
||||
await self._refresh_installed_cache()
|
||||
self.signal_updated()
|
||||
return {"ok": True, "repo_id": repo_id, "removed": [], "restart_required": False}
|
||||
|
||||
cc_root = Path(self.hass.config.path("custom_components"))
|
||||
removed: list[str] = []
|
||||
|
||||
def _remove_dir(path: Path) -> None:
|
||||
if path.exists() and path.is_dir():
|
||||
shutil.rmtree(path, ignore_errors=True)
|
||||
|
||||
for domain in inst.domains:
|
||||
d = str(domain).strip()
|
||||
if not d:
|
||||
continue
|
||||
target = cc_root / d
|
||||
await self.hass.async_add_executor_job(_remove_dir, target)
|
||||
removed.append(d)
|
||||
|
||||
await self.storage.remove_installed_repo(repo_id)
|
||||
await self._refresh_installed_cache()
|
||||
|
||||
# Show restart required in Settings.
|
||||
if removed:
|
||||
self._mark_restart_required()
|
||||
|
||||
_LOGGER.info("BCS uninstall complete: repo_id=%s removed_domains=%s", repo_id, removed)
|
||||
self.signal_updated()
|
||||
return {"ok": True, "repo_id": repo_id, "removed": removed, "restart_required": bool(removed)}
|
||||
|
||||
async def install_repo(self, repo_id: str) -> dict[str, Any]:
|
||||
repo = self.get_repo(repo_id)
|
||||
if not repo:
|
||||
@@ -534,11 +641,7 @@ class BCSCore:
|
||||
if not installed_domains:
|
||||
raise BCSInstallError("No integrations found under custom_components/ (missing manifest.json)")
|
||||
|
||||
# informational only (many repos are wrong here)
|
||||
installed_manifest_version = await self._read_installed_manifest_version(installed_domains[0])
|
||||
|
||||
# IMPORTANT: BCS "installed_version" is the ref we installed (tag/release/branch),
|
||||
# so update logic won't break when manifest.json is 0.0.0 or outdated.
|
||||
installed_version = ref
|
||||
|
||||
await self.storage.set_installed_repo(
|
||||
@@ -551,12 +654,7 @@ class BCSCore:
|
||||
)
|
||||
await self._refresh_installed_cache()
|
||||
|
||||
persistent_notification.async_create(
|
||||
self.hass,
|
||||
"Bahmcloud Store installation finished. A Home Assistant restart is required to load the integration.",
|
||||
title="Bahmcloud Store",
|
||||
notification_id="bcs_restart_required",
|
||||
)
|
||||
self._mark_restart_required()
|
||||
|
||||
_LOGGER.info(
|
||||
"BCS install complete: repo_id=%s domains=%s installed_ref=%s manifest_version=%s",
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
{
|
||||
"domain": "bahmcloud_store",
|
||||
"name": "Bahmcloud Store",
|
||||
"version": "0.5.2",
|
||||
"version": "0.5.10",
|
||||
"documentation": "https://git.bahmcloud.de/bahmcloud/bahmcloud_store",
|
||||
"platforms": ["update"],
|
||||
"requirements": [],
|
||||
"codeowners": ["@bahmcloud"],
|
||||
"iot_class": "local_polling"
|
||||
|
||||
@@ -29,6 +29,7 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
|
||||
this._installingRepoId = null;
|
||||
this._updatingRepoId = null;
|
||||
this._uninstallingRepoId = null;
|
||||
this._restartRequired = false;
|
||||
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() {
|
||||
if (!this._hass) return;
|
||||
try {
|
||||
@@ -436,15 +467,15 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
|
||||
<div class="mobilebar">
|
||||
<div class="left">
|
||||
<div class="iconbtn" id="menuBtn" title="Menu">☰</div>
|
||||
<div class="iconbtn" id="backBtn" title="Back">←</div>
|
||||
<div class="iconbtn" id="menuBtn" title="Menu">鈽<EFBFBD></div>
|
||||
<div class="iconbtn" id="backBtn" title="Back">鈫<EFBFBD></div>
|
||||
<div>
|
||||
<div style="font-weight:700;">Bahmcloud Store</div>
|
||||
<div class="muted small" id="subtitle">Store</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="right">
|
||||
<div class="iconbtn" id="refreshBtn" title="Refresh">⟳</div>
|
||||
<div class="iconbtn" id="refreshBtn" title="Refresh">鉄<EFBFBD></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -506,7 +537,7 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
: "";
|
||||
|
||||
if (this._loading) {
|
||||
content.innerHTML = `${err}<div class="card">Loading…</div>`;
|
||||
content.innerHTML = `${err}<div class="card">Loading鈥<EFBFBD></div>`;
|
||||
fabs.innerHTML = "";
|
||||
return;
|
||||
}
|
||||
@@ -608,7 +639,7 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
if (updateAvailable) badges.push("Update");
|
||||
|
||||
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>`;
|
||||
|
||||
return `
|
||||
@@ -628,7 +659,7 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
|
||||
return `
|
||||
<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">
|
||||
<option value="all">All categories</option>
|
||||
${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>
|
||||
</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;">
|
||||
${cards || `<div class="card">No repositories found.</div>`}
|
||||
@@ -713,7 +744,7 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
].filter(Boolean);
|
||||
|
||||
const readmeBlock = this._readmeLoading
|
||||
? `<div class="card">Loading README…</div>`
|
||||
? `<div class="card">Loading README鈥<EFBFBD></div>`
|
||||
: this._readmeText
|
||||
? `
|
||||
<div class="card">
|
||||
@@ -748,12 +779,14 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
|
||||
const busyInstall = this._installingRepoId === 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 installBtn = `<button class="primary" id="btnInstall" ${installed || busy ? "disabled" : ""}>${busyInstall ? "Installing…" : installed ? "Installed" : "Install"}</button>`;
|
||||
const updateBtn = `<button class="primary" id="btnUpdate" ${!updateAvailable || busy ? "disabled" : ""}>${busyUpdate ? "Updating…" : updateAvailable ? "Update" : "Up to date"}</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鈥<EFBFBD>" : updateAvailable ? "Update" : "Up to date"}</button>`;
|
||||
const uninstallBtn = `<button id="btnUninstall" ${!installed || busy ? "disabled" : ""}>${busyUninstall ? "Uninstalling鈥<67>" : "Uninstall"}</button>`;
|
||||
|
||||
const restartHint = this._restartRequired
|
||||
? `
|
||||
@@ -777,7 +810,7 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
<div>
|
||||
<div><strong style="font-size:16px;">${this._esc(name)}</strong></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;">
|
||||
<a href="${this._esc(url)}" target="_blank" rel="noreferrer">Open repository</a>
|
||||
</div>
|
||||
@@ -805,6 +838,7 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
<div class="row" style="margin-top:14px; gap:10px; flex-wrap:wrap;">
|
||||
${installBtn}
|
||||
${updateBtn}
|
||||
${uninstallBtn}
|
||||
</div>
|
||||
|
||||
${restartHint}
|
||||
@@ -820,6 +854,7 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
// Always wire action buttons (even if README is already loaded)
|
||||
const btnInstall = root.getElementById("btnInstall");
|
||||
const btnUpdate = root.getElementById("btnUpdate");
|
||||
const btnUninstall = root.getElementById("btnUninstall");
|
||||
const btnRestart = root.getElementById("btnRestart");
|
||||
|
||||
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) {
|
||||
btnRestart.addEventListener("click", () => this._restartHA());
|
||||
}
|
||||
@@ -848,7 +890,7 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
mount.innerHTML = this._readmeHtml;
|
||||
this._postprocessRenderedMarkdown(mount);
|
||||
} 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 {
|
||||
mount.innerHTML = "";
|
||||
@@ -883,10 +925,10 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
|
||||
return `
|
||||
<div class="fabs">
|
||||
<button class="fabbtn primary" id="fabOpen" title="Open repository">↗</button>
|
||||
<button class="fabbtn" id="fabReload" title="Reload README">⟳</button>
|
||||
<button class="fabbtn" id="fabInstall" title="${installDisabled ? (installed ? "Already installed" : "Installing…") : "Install"}" ${installDisabled ? "disabled" : ""}>+</button>
|
||||
<button class="fabbtn" id="fabUpdate" title="${updateDisabled ? (!installed ? "Not installed" : "No update available") : "Update"}" ${updateDisabled ? "disabled" : ""}>↑</button>
|
||||
<button class="fabbtn primary" id="fabOpen" title="Open repository">鈫<EFBFBD></button>
|
||||
<button class="fabbtn" id="fabReload" title="Reload README">鉄<EFBFBD></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" : ""}>鈫<EFBFBD></button>
|
||||
<button class="fabbtn" id="fabInfo" title="About">i</button>
|
||||
</div>
|
||||
`;
|
||||
|
||||
@@ -15,23 +15,25 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
|
||||
this._search = "";
|
||||
this._category = "all";
|
||||
this._provider = "all"; // all|github|gitea|gitlab|other|custom
|
||||
this._filter = "all"; // all|installed|not_installed|updates|custom
|
||||
this._sort = "az"; // az|updates_first|installed_first
|
||||
|
||||
this._detailRepoId = null;
|
||||
this._detailRepo = null;
|
||||
|
||||
this._readmeLoading = false;
|
||||
this._readmeText = null;
|
||||
this._readmeHtml = null;
|
||||
this._readmeError = null;
|
||||
|
||||
// Manual refresh UX state
|
||||
this._refreshing = false;
|
||||
this._status = "";
|
||||
// README UX (E2)
|
||||
this._readmeExpanded = false;
|
||||
this._readmeCanToggle = false;
|
||||
|
||||
this._refreshing = false;
|
||||
|
||||
// Install/Update UX
|
||||
this._installingRepoId = null;
|
||||
this._updatingRepoId = null;
|
||||
this._uninstallingRepoId = null;
|
||||
this._restartRequired = false;
|
||||
this._lastActionMsg = null;
|
||||
}
|
||||
@@ -56,7 +58,6 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
const data = await this._hass.callApi("get", "bcs");
|
||||
this._data = data;
|
||||
|
||||
// keep detail fresh
|
||||
if (this._view === "detail" && this._detailRepoId && Array.isArray(data?.repos)) {
|
||||
const fresh = data.repos.find((r) => this._safeId(r?.id) === this._detailRepoId);
|
||||
if (fresh) this._detailRepo = fresh;
|
||||
@@ -75,19 +76,16 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
|
||||
this._refreshing = true;
|
||||
this._error = null;
|
||||
this._status = "Refreshing…";
|
||||
this._loading = true;
|
||||
this._update();
|
||||
|
||||
try {
|
||||
const resp = await this._hass.callApi("post", "bcs?action=refresh", {});
|
||||
if (!resp?.ok) {
|
||||
this._status = "";
|
||||
this._error = this._safeText(resp?.message) || "Refresh failed.";
|
||||
} else {
|
||||
this._status = "Refresh done.";
|
||||
const msg = this._safeText(resp?.message) || "Refresh failed.";
|
||||
this._error = msg;
|
||||
}
|
||||
} catch (e) {
|
||||
this._status = "";
|
||||
this._error = e?.message ? String(e.message) : String(e);
|
||||
} finally {
|
||||
this._refreshing = false;
|
||||
@@ -148,6 +146,35 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
}
|
||||
}
|
||||
|
||||
async _uninstallRepo(repoId) {
|
||||
if (!this._hass) return;
|
||||
if (!repoId) return;
|
||||
if (this._installingRepoId || this._updatingRepoId || this._uninstallingRepoId) return;
|
||||
|
||||
const ok = window.confirm("Really uninstall this repository? This will remove its files from /config/custom_components and requires a restart.");
|
||||
if (!ok) return;
|
||||
|
||||
this._uninstallingRepoId = repoId;
|
||||
this._error = null;
|
||||
this._lastActionMsg = null;
|
||||
this._update();
|
||||
|
||||
try {
|
||||
const resp = await this._hass.callApi("post", `bcs/uninstall?repo_id=${encodeURIComponent(repoId)}`, {});
|
||||
if (!resp?.ok) {
|
||||
this._error = this._safeText(resp?.message) || "Uninstall failed.";
|
||||
} else {
|
||||
this._restartRequired = !!resp.restart_required;
|
||||
this._lastActionMsg = "Uninstall finished. Restart required.";
|
||||
}
|
||||
} catch (e) {
|
||||
this._error = e?.message ? String(e.message) : String(e);
|
||||
} finally {
|
||||
this._uninstallingRepoId = null;
|
||||
await this._load();
|
||||
}
|
||||
}
|
||||
|
||||
async _restartHA() {
|
||||
if (!this._hass) return;
|
||||
try {
|
||||
@@ -178,7 +205,7 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
this._readmeText = null;
|
||||
this._readmeHtml = null;
|
||||
this._readmeError = null;
|
||||
this._status = "";
|
||||
this._readmeExpanded = false;
|
||||
this._update();
|
||||
return;
|
||||
}
|
||||
@@ -243,10 +270,8 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
this._readmeText = null;
|
||||
this._readmeHtml = null;
|
||||
this._readmeError = null;
|
||||
|
||||
this._status = "";
|
||||
this._restartRequired = false;
|
||||
this._lastActionMsg = null;
|
||||
this._readmeExpanded = false;
|
||||
this._readmeCanToggle = false;
|
||||
|
||||
this._update();
|
||||
this._loadReadme(repoId);
|
||||
@@ -264,15 +289,23 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
if (resp?.ok && typeof resp.readme === "string" && resp.readme.trim()) {
|
||||
this._readmeText = resp.readme;
|
||||
this._readmeHtml = typeof resp.html === "string" && resp.html.trim() ? resp.html : null;
|
||||
|
||||
const lines = resp.readme.split(/\r?\n/).length;
|
||||
this._readmeCanToggle = lines > 24 || resp.readme.length > 1600;
|
||||
this._readmeExpanded = !this._readmeCanToggle;
|
||||
} else {
|
||||
this._readmeText = null;
|
||||
this._readmeHtml = null;
|
||||
this._readmeError = this._safeText(resp?.message) || "README not found.";
|
||||
this._readmeCanToggle = false;
|
||||
this._readmeExpanded = false;
|
||||
}
|
||||
} catch (e) {
|
||||
this._readmeText = null;
|
||||
this._readmeHtml = null;
|
||||
this._readmeError = e?.message ? String(e.message) : String(e);
|
||||
this._readmeCanToggle = false;
|
||||
this._readmeExpanded = false;
|
||||
} finally {
|
||||
this._readmeLoading = false;
|
||||
this._update();
|
||||
@@ -284,7 +317,7 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
|
||||
root.innerHTML = `
|
||||
<style>
|
||||
:host { display:block; min-height:100%; --bcs-accent:#1E88E5; }
|
||||
:host { display:block; min-height:100%; --bcs-accent:#1E88E5; max-width:100%; overflow-x:hidden; }
|
||||
|
||||
.mobilebar{
|
||||
position:sticky; top:0; z-index:50;
|
||||
@@ -299,13 +332,15 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
.iconbtn{
|
||||
width:40px; height:40px; border-radius:14px;
|
||||
display:flex; align-items:center; justify-content:center;
|
||||
border:1px solid var(--divider-color);
|
||||
background: var(--card-background-color);
|
||||
/* Ensure icon visibility on app header (light & dark modes) */
|
||||
color: var(--app-header-text-color, var(--primary-text-color));
|
||||
border: 1px solid rgba(255,255,255,0.35);
|
||||
background: rgba(255,255,255,0.16);
|
||||
cursor:pointer; user-select:none;
|
||||
}
|
||||
.iconbtn:hover{ filter:brightness(0.98); }
|
||||
|
||||
.wrap{ max-width:1200px; margin:0 auto; padding:16px; }
|
||||
.wrap{ max-width:1200px; margin:0 auto; padding:16px; overflow-x:hidden; }
|
||||
|
||||
.tabs{ display:flex; gap:10px; flex-wrap:wrap; margin:8px 0 16px; }
|
||||
.tab{
|
||||
@@ -318,9 +353,12 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
|
||||
.grid{ display:grid; gap:12px; grid-template-columns: repeat(1, minmax(0, 1fr)); }
|
||||
@media (min-width: 900px){ .grid{ grid-template-columns: repeat(2, minmax(0, 1fr)); } }
|
||||
/* Prevent grid children from forcing horizontal overflow (mobile) */
|
||||
.grid > *{ min-width:0; }
|
||||
|
||||
.grid2{ display:grid; gap:12px; grid-template-columns: 1fr; }
|
||||
@media (min-width: 1024px){ .grid2{ grid-template-columns: 1.2fr .8fr; } }
|
||||
.grid2 > *{ min-width:0; }
|
||||
|
||||
.card{
|
||||
padding:14px 14px;
|
||||
@@ -328,12 +366,12 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
background: var(--card-background-color);
|
||||
border:1px solid var(--divider-color);
|
||||
box-shadow: 0 1px 0 rgba(0,0,0,.04);
|
||||
overflow:hidden;
|
||||
}
|
||||
|
||||
.row{ display:flex; align-items:flex-start; justify-content:space-between; gap:12px; }
|
||||
.muted{ color: var(--secondary-text-color); }
|
||||
.row{ display:flex; align-items:flex-start; justify-content:space-between; gap:12px; flex-wrap:wrap; }
|
||||
.muted{ color: var(--secondary-text-color); overflow-wrap:anywhere; word-break:break-word; }
|
||||
.small{ font-size: 12px; }
|
||||
|
||||
.badge{
|
||||
padding:6px 10px;
|
||||
border-radius:999px;
|
||||
@@ -341,7 +379,10 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
background: rgba(30,136,229,.06);
|
||||
color: var(--primary-text-color);
|
||||
font-size: 12px;
|
||||
white-space:nowrap;
|
||||
white-space:normal;
|
||||
max-width:55%;
|
||||
overflow:hidden;
|
||||
text-overflow:ellipsis;
|
||||
}
|
||||
|
||||
.filters{ display:flex; gap:10px; flex-wrap:wrap; margin-bottom:12px; }
|
||||
@@ -380,36 +421,6 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
background: rgba(255, 82, 82, .08);
|
||||
}
|
||||
|
||||
.fabs{
|
||||
position: fixed;
|
||||
right: 16px;
|
||||
bottom: 16px;
|
||||
display:flex;
|
||||
flex-direction:column;
|
||||
gap:10px;
|
||||
z-index: 60;
|
||||
}
|
||||
.fabbtn{
|
||||
width:54px; height:54px;
|
||||
border-radius:18px;
|
||||
border:1px solid var(--divider-color);
|
||||
background: var(--card-background-color);
|
||||
display:flex; align-items:center; justify-content:center;
|
||||
cursor:pointer;
|
||||
box-shadow: 0 8px 18px rgba(0,0,0,.12);
|
||||
user-select:none;
|
||||
font-size: 18px;
|
||||
padding: 0;
|
||||
}
|
||||
.fabbtn.primary{
|
||||
border-color: rgba(30,136,229,.35);
|
||||
background: rgba(30,136,229,.10);
|
||||
}
|
||||
.fabbtn:disabled{
|
||||
opacity: .55;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
pre.readme{
|
||||
padding: 12px;
|
||||
border-radius: 14px;
|
||||
@@ -420,7 +431,10 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
/* Markdown can contain very wide content (tables/images). Keep it within the viewport. */
|
||||
.md{ overflow-wrap:anywhere; word-break:break-word; max-width:100%; min-width:0; overflow-x:auto; -webkit-overflow-scrolling:touch; }
|
||||
.md :is(h1,h2,h3){ margin-top: 12px; }
|
||||
.md img{ max-width:100%; height:auto; }
|
||||
.md code{
|
||||
padding: 2px 5px;
|
||||
border-radius: 8px;
|
||||
@@ -437,14 +451,65 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
.md table{
|
||||
width:100%;
|
||||
border-collapse: collapse;
|
||||
overflow:auto;
|
||||
overflow-x:auto;
|
||||
overflow-y:hidden;
|
||||
-webkit-overflow-scrolling: touch;
|
||||
display:block;
|
||||
max-width:100%;
|
||||
}
|
||||
.readmeWrap{
|
||||
margin-top:12px;
|
||||
max-width:100%;
|
||||
border:1px solid var(--divider-color);
|
||||
border-radius:14px;
|
||||
padding:12px;
|
||||
background: rgba(0,0,0,.02);
|
||||
position:relative;
|
||||
overflow:hidden;
|
||||
}
|
||||
.readmeWrap.collapsed{
|
||||
max-height:260px;
|
||||
}
|
||||
@media (min-width: 1024px){
|
||||
.readmeWrap.collapsed{ max-height:340px; }
|
||||
}
|
||||
.readmeWrap.collapsed::after{
|
||||
content:"";
|
||||
position:absolute;
|
||||
left:0; right:0; bottom:0;
|
||||
height:64px;
|
||||
background: linear-gradient(to bottom, rgba(0,0,0,0), var(--card-background-color));
|
||||
pointer-events:none;
|
||||
}
|
||||
.readmeWrap.expanded{
|
||||
max-height:70vh;
|
||||
overflow:auto;
|
||||
-webkit-overflow-scrolling:touch;
|
||||
}
|
||||
.readmeActions{
|
||||
display:flex; justify-content:flex-end;
|
||||
margin-top:10px;
|
||||
}
|
||||
button.link{
|
||||
border:1px solid transparent;
|
||||
background: transparent;
|
||||
color: var(--bcs-accent);
|
||||
padding:8px 10px;
|
||||
}
|
||||
button.link:hover{
|
||||
border-color: rgba(30,136,229,.25);
|
||||
background: rgba(30,136,229,.06);
|
||||
}
|
||||
|
||||
.md th, .md td{
|
||||
border: 1px solid var(--divider-color);
|
||||
padding: 8px;
|
||||
text-align:left;
|
||||
max-width:100%;
|
||||
overflow-wrap:anywhere;
|
||||
word-break:break-word;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<div class="mobilebar">
|
||||
@@ -457,30 +522,39 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
</div>
|
||||
</div>
|
||||
<div class="right">
|
||||
<button id="refreshBtn" class="primary" style="border-radius:14px; padding:8px 12px;">Refresh</button>
|
||||
<div class="iconbtn" id="refreshBtn" title="Refresh">⟳</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="wrap">
|
||||
<div class="tabs">
|
||||
<div class="tab" id="tabStore">Store</div>
|
||||
<div class="tab" id="tabManage">Manage repositories</div>
|
||||
<div class="tab" id="tabAbout">Settings / About</div>
|
||||
<div class="tab" id="tabManage">Manage</div>
|
||||
<div class="tab" id="tabAbout">About</div>
|
||||
</div>
|
||||
|
||||
<div id="content"></div>
|
||||
</div>
|
||||
|
||||
<div id="fabs"></div>
|
||||
|
||||
`;
|
||||
|
||||
root.getElementById("menuBtn").addEventListener("click", () => this._toggleMenu());
|
||||
root.getElementById("backBtn").addEventListener("click", () => this._goBack());
|
||||
root.getElementById("refreshBtn").addEventListener("click", () => this._refreshAll());
|
||||
|
||||
root.getElementById("tabStore").addEventListener("click", () => { this._view = "store"; this._update(); });
|
||||
root.getElementById("tabManage").addEventListener("click", () => { this._view = "manage"; this._update(); });
|
||||
root.getElementById("tabAbout").addEventListener("click", () => { this._view = "about"; this._update(); });
|
||||
root.getElementById("tabStore").addEventListener("click", () => {
|
||||
this._view = "store";
|
||||
this._update();
|
||||
});
|
||||
root.getElementById("tabManage").addEventListener("click", () => {
|
||||
this._view = "manage";
|
||||
this._update();
|
||||
});
|
||||
root.getElementById("tabAbout").addEventListener("click", () => {
|
||||
this._view = "about";
|
||||
this._update();
|
||||
});
|
||||
|
||||
this._update();
|
||||
}
|
||||
@@ -489,6 +563,25 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
const root = this.shadowRoot;
|
||||
if (!root) return;
|
||||
|
||||
// Preserve focus & cursor position for inputs that trigger a re-render (e.g. search).
|
||||
// Without this, mobile browsers may drop focus after each keystroke.
|
||||
const active = root.activeElement;
|
||||
const restore = {
|
||||
id: active && active.id ? String(active.id) : null,
|
||||
start: null,
|
||||
end: null,
|
||||
};
|
||||
try {
|
||||
if (active && (active.tagName === "INPUT" || active.tagName === "TEXTAREA")) {
|
||||
if (typeof active.selectionStart === "number" && typeof active.selectionEnd === "number") {
|
||||
restore.start = active.selectionStart;
|
||||
restore.end = active.selectionEnd;
|
||||
}
|
||||
}
|
||||
} catch (_) {
|
||||
// ignore
|
||||
}
|
||||
|
||||
const subtitle = root.getElementById("subtitle");
|
||||
if (subtitle) subtitle.textContent = this._view === "detail" ? "Details" : this._view[0].toUpperCase() + this._view.slice(1);
|
||||
|
||||
@@ -502,21 +595,19 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
setActive("tabAbout", this._view === "about");
|
||||
|
||||
const content = root.getElementById("content");
|
||||
const fabs = root.getElementById("fabs");
|
||||
if (!content || !fabs) return;
|
||||
if (!content) return;
|
||||
|
||||
const err = this._error ? `<div class="err"><strong>Error:</strong> ${this._esc(this._error)}</div>` : "";
|
||||
const status = this._status ? `<div class="muted small" style="margin:10px 0;">${this._esc(this._status)}</div>` : "";
|
||||
const err = this._error
|
||||
? `<div class="err"><strong>Error:</strong> ${this._esc(this._error)}</div>`
|
||||
: "";
|
||||
|
||||
if (this._loading) {
|
||||
content.innerHTML = `${err}${status}<div class="card">Loading…</div>`;
|
||||
fabs.innerHTML = "";
|
||||
content.innerHTML = `${err}<div class="card">Loading…</div>`;
|
||||
return;
|
||||
}
|
||||
|
||||
if (!this._data?.ok) {
|
||||
content.innerHTML = `${err}${status}<div class="card">No data. Please refresh.</div>`;
|
||||
fabs.innerHTML = "";
|
||||
content.innerHTML = `${err}<div class="card">No data. Please refresh.</div>`;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -526,14 +617,27 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
else if (this._view === "about") html = this._renderAbout();
|
||||
else if (this._view === "detail") html = this._renderDetail();
|
||||
|
||||
content.innerHTML = `${err}${status}${html}`;
|
||||
fabs.innerHTML = this._view === "detail" ? this._renderFabs() : "";
|
||||
content.innerHTML = `${err}${html}`;
|
||||
|
||||
if (this._view === "store") this._wireStore();
|
||||
if (this._view === "manage") this._wireManage();
|
||||
if (this._view === "detail") {
|
||||
this._wireDetail();
|
||||
this._wireFabs();
|
||||
this._wireDetail(); // now always wires buttons
|
||||
}
|
||||
|
||||
// Restore focus and cursor for the search field after re-render.
|
||||
if (restore.id && this._view === "store") {
|
||||
const el = root.getElementById(restore.id);
|
||||
if (el && (el.tagName === "INPUT" || el.tagName === "TEXTAREA")) {
|
||||
try {
|
||||
el.focus({ preventScroll: true });
|
||||
if (restore.start !== null && restore.end !== null && typeof el.setSelectionRange === "function") {
|
||||
el.setSelectionRange(restore.start, restore.end);
|
||||
}
|
||||
} catch (_) {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -556,19 +660,12 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
}
|
||||
|
||||
_asBoolStrict(v) {
|
||||
// IMPORTANT: only treat literal true as installed
|
||||
return v === true;
|
||||
}
|
||||
|
||||
_renderStore() {
|
||||
const repos = Array.isArray(this._data.repos) ? this._data.repos : [];
|
||||
|
||||
const categories = Array.from(
|
||||
new Set(repos.map((r) => this._safeText(r?.category)).filter((c) => !!c))
|
||||
).sort();
|
||||
|
||||
const providers = ["github", "gitlab", "gitea", "other"];
|
||||
|
||||
const filtered = repos
|
||||
.filter((r) => {
|
||||
const name = (this._safeText(r?.name) || "").toLowerCase();
|
||||
@@ -581,23 +678,52 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
const cat = this._safeText(r?.category) || "";
|
||||
if (this._category !== "all" && this._category !== cat) return false;
|
||||
|
||||
const prov = this._safeText(r?.provider) || "other";
|
||||
if (this._provider !== "all") {
|
||||
if (this._provider === "custom" && r?.source !== "custom") return false;
|
||||
if (this._provider !== "custom" && prov !== this._provider) return false;
|
||||
}
|
||||
const latest = this._safeText(r?.latest_version);
|
||||
const installed = this._asBoolStrict(r?.installed);
|
||||
const installedVersion = this._safeText(r?.installed_version);
|
||||
const updateAvailable = installed && !!latest && (!installedVersion || latest !== installedVersion);
|
||||
|
||||
if (this._filter === "installed" && !installed) return false;
|
||||
if (this._filter === "not_installed" && installed) return false;
|
||||
if (this._filter === "updates" && !updateAvailable) return false;
|
||||
if (this._filter === "custom" && r?.source !== "custom") return false;
|
||||
|
||||
return true;
|
||||
})
|
||||
.sort((a, b) => {
|
||||
const an = (this._safeText(a?.name) || "").toLowerCase();
|
||||
const bn = (this._safeText(b?.name) || "").toLowerCase();
|
||||
|
||||
const alatest = this._safeText(a?.latest_version);
|
||||
const ainstalled = this._asBoolStrict(a?.installed);
|
||||
const ainstalledVersion = this._safeText(a?.installed_version);
|
||||
const aupdate = ainstalled && !!alatest && (!ainstalledVersion || alatest !== ainstalledVersion);
|
||||
|
||||
const blatest = this._safeText(b?.latest_version);
|
||||
const binstalled = this._asBoolStrict(b?.installed);
|
||||
const binstalledVersion = this._safeText(b?.installed_version);
|
||||
const bupdate = binstalled && !!blatest && (!binstalledVersion || blatest !== binstalledVersion);
|
||||
|
||||
if (this._sort === "updates_first") {
|
||||
if (aupdate !== bupdate) return aupdate ? -1 : 1;
|
||||
return an.localeCompare(bn);
|
||||
}
|
||||
if (this._sort === "installed_first") {
|
||||
if (ainstalled !== binstalled) return ainstalled ? -1 : 1;
|
||||
return an.localeCompare(bn);
|
||||
}
|
||||
return an.localeCompare(bn);
|
||||
});
|
||||
|
||||
const categories = Array.from(
|
||||
new Set(repos.map((r) => this._safeText(r?.category)).filter((c) => !!c))
|
||||
).sort();
|
||||
|
||||
const cards = filtered
|
||||
.map((r) => {
|
||||
const id = this._safeId(r?.id);
|
||||
const name = this._safeText(r?.name) || "Unnamed repository";
|
||||
const url = this._safeText(r?.url) || "";
|
||||
const desc = this._safeText(r?.description) || "";
|
||||
|
||||
const latest = this._safeText(r?.latest_version);
|
||||
@@ -620,9 +746,7 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
<div>
|
||||
<div><strong>${this._esc(name)}</strong></div>
|
||||
<div class="muted">${this._esc(desc)}</div>
|
||||
<div class="muted small" style="margin-top:8px;">
|
||||
Creator: ${this._esc(this._safeText(r?.owner || "-"))} · Latest: ${this._esc(latest || "-")} · Meta: ${this._esc(this._safeText(r?.meta_source || "-"))}
|
||||
</div>
|
||||
<div class="muted small" style="margin-top:8px;">${this._esc(url)}</div>
|
||||
</div>
|
||||
${badgeHtml}
|
||||
</div>
|
||||
@@ -633,19 +757,26 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
|
||||
return `
|
||||
<div class="filters">
|
||||
<input id="q" placeholder="Search repositories…" value="${this._esc(this._search)}" />
|
||||
<input id="q" placeholder="Search…" value="${this._esc(this._search)}" />
|
||||
<select id="cat">
|
||||
<option value="all">All categories</option>
|
||||
${categories.map((c) => `<option value="${this._esc(c)}" ${this._category === c ? "selected" : ""}>${this._esc(c)}</option>`).join("")}
|
||||
</select>
|
||||
<select id="prov">
|
||||
<option value="all">All providers</option>
|
||||
<option value="custom" ${this._provider === "custom" ? "selected" : ""}>Custom</option>
|
||||
${providers.map((p) => `<option value="${p}" ${this._provider === p ? "selected" : ""}>${p.toUpperCase()}</option>`).join("")}
|
||||
<select id="filter">
|
||||
<option value="all" ${this._filter === "all" ? "selected" : ""}>All</option>
|
||||
<option value="installed" ${this._filter === "installed" ? "selected" : ""}>Installed</option>
|
||||
<option value="not_installed" ${this._filter === "not_installed" ? "selected" : ""}>Not installed</option>
|
||||
<option value="updates" ${this._filter === "updates" ? "selected" : ""}>Updates available</option>
|
||||
<option value="custom" ${this._filter === "custom" ? "selected" : ""}>Custom repos</option>
|
||||
</select>
|
||||
<select id="sort">
|
||||
<option value="az" ${this._sort === "az" ? "selected" : ""}>A–Z</option>
|
||||
<option value="updates_first" ${this._sort === "updates_first" ? "selected" : ""}>Updates first</option>
|
||||
<option value="installed_first" ${this._sort === "installed_first" ? "selected" : ""}>Installed first</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="muted small">BCS ${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;">
|
||||
${cards || `<div class="card">No repositories found.</div>`}
|
||||
@@ -658,11 +789,33 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
|
||||
const q = root.getElementById("q");
|
||||
const cat = root.getElementById("cat");
|
||||
const prov = root.getElementById("prov");
|
||||
const filter = root.getElementById("filter");
|
||||
const sort = root.getElementById("sort");
|
||||
|
||||
if (q) q.addEventListener("input", (e) => { this._search = e?.target?.value || ""; this._update(); });
|
||||
if (cat) cat.addEventListener("change", (e) => { this._category = e?.target?.value || "all"; this._update(); });
|
||||
if (prov) prov.addEventListener("change", (e) => { this._provider = e?.target?.value || "all"; this._update(); });
|
||||
if (q) {
|
||||
q.addEventListener("input", (e) => {
|
||||
this._search = e?.target?.value || "";
|
||||
this._update();
|
||||
});
|
||||
}
|
||||
if (cat) {
|
||||
cat.addEventListener("change", (e) => {
|
||||
this._category = e?.target?.value || "all";
|
||||
this._update();
|
||||
});
|
||||
}
|
||||
if (filter) {
|
||||
filter.addEventListener("change", (e) => {
|
||||
this._filter = e?.target?.value || "all";
|
||||
this._update();
|
||||
});
|
||||
}
|
||||
if (sort) {
|
||||
sort.addEventListener("change", (e) => {
|
||||
this._sort = e?.target?.value || "az";
|
||||
this._update();
|
||||
});
|
||||
}
|
||||
|
||||
root.querySelectorAll("[data-open]").forEach((el) => {
|
||||
const id = el.getAttribute("data-open");
|
||||
@@ -673,9 +826,9 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
_renderAbout() {
|
||||
return `
|
||||
<div class="card">
|
||||
<div><strong>Installation & Updates</strong></div>
|
||||
<div><strong>About</strong></div>
|
||||
<div class="muted" style="margin-top:10px;">
|
||||
Installation and updates are now available via the Store UI.
|
||||
Bahmcloud Store is a provider-neutral repository index and UI for Home Assistant.
|
||||
</div>
|
||||
<div class="muted small" style="margin-top:10px;">
|
||||
Current integration version: <strong>${this._esc(this._data?.version || "-")}</strong>
|
||||
@@ -692,18 +845,15 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
const url = this._safeText(r?.url) || "";
|
||||
const desc = this._safeText(r?.description) || "";
|
||||
|
||||
const repoId = this._safeId(r?.id);
|
||||
|
||||
const installed = this._asBoolStrict(r?.installed);
|
||||
const installedVersion = this._safeText(r?.installed_version);
|
||||
const installedDomains = Array.isArray(r?.installed_domains) ? r.installed_domains : [];
|
||||
const latestVersion = this._safeText(r?.latest_version);
|
||||
|
||||
const busyInstall = this._installingRepoId === repoId;
|
||||
const busyUpdate = this._updatingRepoId === repoId;
|
||||
const busy = busyInstall || busyUpdate;
|
||||
|
||||
const updateAvailable = installed && !!latestVersion && (!installedVersion || latestVersion !== installedVersion);
|
||||
const infoBits = [
|
||||
this._safeText(r?.owner) ? `Creator: ${this._safeText(r?.owner)}` : "Creator: -",
|
||||
this._safeText(r?.latest_version) ? `Latest: ${this._safeText(r?.latest_version)}` : "Latest: -",
|
||||
this._safeText(r?.provider) ? `Provider: ${this._safeText(r?.provider)}` : null,
|
||||
this._safeText(r?.category) ? `Category: ${this._safeText(r?.category)}` : null,
|
||||
this._safeText(r?.meta_author) ? `Author: ${this._safeText(r?.meta_author)}` : null,
|
||||
this._safeText(r?.meta_maintainer) ? `Maintainer: ${this._safeText(r?.meta_maintainer)}` : null,
|
||||
this._safeText(r?.meta_source) ? `Meta: ${this._safeText(r?.meta_source)}` : null,
|
||||
].filter(Boolean);
|
||||
|
||||
const readmeBlock = this._readmeLoading
|
||||
? `<div class="card">Loading README…</div>`
|
||||
@@ -715,7 +865,14 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
<div class="muted small">Rendered Markdown</div>
|
||||
</div>
|
||||
|
||||
<div id="readmePretty" class="md" style="margin-top:12px;"></div>
|
||||
<div class="readmeWrap ${this._readmeExpanded ? "expanded" : "collapsed"}">
|
||||
<div id="readmePretty" class="md"></div>
|
||||
</div>
|
||||
${this._readmeCanToggle ? `
|
||||
<div class="readmeActions">
|
||||
<button class="link" id="btnReadmeToggle">${this._readmeExpanded ? "Show less" : "Show more"}</button>
|
||||
</div>
|
||||
` : ``}
|
||||
|
||||
<details>
|
||||
<summary>Show raw Markdown</summary>
|
||||
@@ -732,8 +889,23 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
</div>
|
||||
`;
|
||||
|
||||
const repoId = this._safeId(r?.id);
|
||||
|
||||
const installed = this._asBoolStrict(r?.installed);
|
||||
const installedVersion = this._safeText(r?.installed_version);
|
||||
const installedDomains = Array.isArray(r?.installed_domains) ? r.installed_domains : [];
|
||||
const latestVersion = this._safeText(r?.latest_version);
|
||||
|
||||
const busyInstall = this._installingRepoId === repoId;
|
||||
const busyUpdate = this._updatingRepoId === repoId;
|
||||
const busyUninstall = this._uninstallingRepoId === repoId;
|
||||
const busy = busyInstall || busyUpdate || busyUninstall;
|
||||
|
||||
const updateAvailable = installed && !!latestVersion && (!installedVersion || latestVersion !== installedVersion);
|
||||
|
||||
const installBtn = `<button class="primary" id="btnInstall" ${installed || busy ? "disabled" : ""}>${busyInstall ? "Installing…" : installed ? "Installed" : "Install"}</button>`;
|
||||
const updateBtn = `<button class="primary" id="btnUpdate" ${!updateAvailable || busy ? "disabled" : ""}>${busyUpdate ? "Updating…" : updateAvailable ? "Update" : "Up to date"}</button>`;
|
||||
const uninstallBtn = `<button class="primary" id="btnUninstall" ${!installed || busy ? "disabled" : ""}>${busyUninstall ? "Uninstalling…" : "Uninstall"}</button>`;
|
||||
|
||||
const restartHint = this._restartRequired
|
||||
? `
|
||||
@@ -757,12 +929,7 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
<div>
|
||||
<div><strong style="font-size:16px;">${this._esc(name)}</strong></div>
|
||||
<div class="muted">${this._esc(desc)}</div>
|
||||
<div class="muted small" style="margin-top:8px;">
|
||||
Creator: ${this._esc(this._safeText(r?.owner || "-"))}
|
||||
· Latest: ${this._esc(latestVersion || "-")}
|
||||
· Provider: ${this._esc(this._safeText(r?.provider || "-"))}
|
||||
· Meta: ${this._esc(this._safeText(r?.meta_source || "-"))}
|
||||
</div>
|
||||
<div class="muted small" style="margin-top:8px;">${this._esc(infoBits.join(" · "))}</div>
|
||||
<div class="muted small" style="margin-top:8px;">
|
||||
<a href="${this._esc(url)}" target="_blank" rel="noreferrer">Open repository</a>
|
||||
</div>
|
||||
@@ -790,6 +957,7 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
<div class="row" style="margin-top:14px; gap:10px; flex-wrap:wrap;">
|
||||
${installBtn}
|
||||
${updateBtn}
|
||||
${uninstallBtn}
|
||||
</div>
|
||||
|
||||
${restartHint}
|
||||
@@ -802,13 +970,44 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
_wireDetail() {
|
||||
const root = this.shadowRoot;
|
||||
|
||||
// Always wire action buttons (even if README is already loaded)
|
||||
const btnInstall = root.getElementById("btnInstall");
|
||||
const btnUpdate = root.getElementById("btnUpdate");
|
||||
const btnUninstall = root.getElementById("btnUninstall");
|
||||
const btnRestart = root.getElementById("btnRestart");
|
||||
const btnReadmeToggle = root.getElementById("btnReadmeToggle");
|
||||
|
||||
if (btnInstall) btnInstall.addEventListener("click", () => { if (!btnInstall.disabled && this._detailRepoId) this._installRepo(this._detailRepoId); });
|
||||
if (btnUpdate) btnUpdate.addEventListener("click", () => { if (!btnUpdate.disabled && this._detailRepoId) this._updateRepo(this._detailRepoId); });
|
||||
if (btnRestart) btnRestart.addEventListener("click", () => this._restartHA());
|
||||
if (btnInstall) {
|
||||
btnInstall.addEventListener("click", () => {
|
||||
if (btnInstall.disabled) return;
|
||||
if (this._detailRepoId) this._installRepo(this._detailRepoId);
|
||||
});
|
||||
}
|
||||
|
||||
if (btnUpdate) {
|
||||
btnUpdate.addEventListener("click", () => {
|
||||
if (btnUpdate.disabled) return;
|
||||
if (this._detailRepoId) this._updateRepo(this._detailRepoId);
|
||||
});
|
||||
}
|
||||
|
||||
if (btnUninstall) {
|
||||
btnUninstall.addEventListener("click", () => {
|
||||
if (btnUninstall.disabled) return;
|
||||
if (this._detailRepoId) this._uninstallRepo(this._detailRepoId);
|
||||
});
|
||||
}
|
||||
|
||||
if (btnRestart) {
|
||||
btnRestart.addEventListener("click", () => this._restartHA());
|
||||
}
|
||||
|
||||
if (btnReadmeToggle) {
|
||||
btnReadmeToggle.addEventListener("click", () => {
|
||||
this._readmeExpanded = !this._readmeExpanded;
|
||||
this._update();
|
||||
});
|
||||
}
|
||||
|
||||
const mount = root.getElementById("readmePretty");
|
||||
if (!mount) return;
|
||||
@@ -836,54 +1035,6 @@ class BahmcloudStorePanel extends HTMLElement {
|
||||
} catch (_) {}
|
||||
}
|
||||
|
||||
_renderFabs() {
|
||||
const r = this._detailRepo;
|
||||
if (!r) return "";
|
||||
|
||||
const repoId = this._safeId(r?.id);
|
||||
const installed = this._asBoolStrict(r?.installed);
|
||||
const latest = this._safeText(r?.latest_version);
|
||||
const installedVersion = this._safeText(r?.installed_version);
|
||||
|
||||
const busy = this._installingRepoId === repoId || this._updatingRepoId === repoId;
|
||||
const updateAvailable = installed && !!latest && (!installedVersion || latest !== installedVersion);
|
||||
|
||||
const installDisabled = installed || busy;
|
||||
const updateDisabled = !updateAvailable || busy;
|
||||
|
||||
return `
|
||||
<div class="fabs">
|
||||
<button class="fabbtn primary" id="fabOpen" title="Open repository">↗</button>
|
||||
<button class="fabbtn" id="fabReload" title="Reload README">⟳</button>
|
||||
<button class="fabbtn" id="fabInstall" title="${installDisabled ? (installed ? "Already installed" : "Installing…") : "Install"}" ${installDisabled ? "disabled" : ""}>+</button>
|
||||
<button class="fabbtn" id="fabUpdate" title="${updateDisabled ? (!installed ? "Not installed" : "No update available") : "Update"}" ${updateDisabled ? "disabled" : ""}>↑</button>
|
||||
<button class="fabbtn" id="fabInfo" title="About">i</button>
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
|
||||
_wireFabs() {
|
||||
const root = this.shadowRoot;
|
||||
const r = this._detailRepo;
|
||||
if (!r) return;
|
||||
|
||||
const url = this._safeText(r?.url);
|
||||
const repoId = this._safeId(r?.id);
|
||||
|
||||
const open = root.getElementById("fabOpen");
|
||||
const reload = root.getElementById("fabReload");
|
||||
const install = root.getElementById("fabInstall");
|
||||
const update = root.getElementById("fabUpdate");
|
||||
const info = root.getElementById("fabInfo");
|
||||
|
||||
if (open) open.addEventListener("click", () => url && window.open(url, "_blank", "noreferrer"));
|
||||
if (reload) reload.addEventListener("click", () => this._detailRepoId && this._loadReadme(this._detailRepoId));
|
||||
|
||||
if (install) install.addEventListener("click", () => { if (!install.disabled) this._installRepo(repoId); });
|
||||
if (update) update.addEventListener("click", () => { if (!update.disabled) this._updateRepo(repoId); });
|
||||
|
||||
if (info) info.addEventListener("click", () => { this._view = "about"; this._update(); });
|
||||
}
|
||||
|
||||
_renderManage() {
|
||||
const repos = Array.isArray(this._data.repos) ? this._data.repos : [];
|
||||
|
||||
@@ -1,10 +1,24 @@
|
||||
body { font-family: system-ui, sans-serif; margin:0; }
|
||||
.wrap { padding: 16px; max-width: 1000px; margin: 0 auto; }
|
||||
.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; }
|
||||
.muted { color: #666; font-size: 13px; margin-top: 4px; }
|
||||
.actions { display:flex; gap: 8px; margin-top: 10px; }
|
||||
button { padding: 8px 12px; cursor:pointer; }
|
||||
button[disabled] { opacity: 0.6; cursor: not-allowed; }
|
||||
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
|
||||
18
custom_components/bahmcloud_store/strings.json
Normal file
18
custom_components/bahmcloud_store/strings.json
Normal file
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"issues": {
|
||||
"restart_required": {
|
||||
"title": "Restart required",
|
||||
"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."
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,11 +1,142 @@
|
||||
from __future__ import annotations
|
||||
|
||||
# NOTE:
|
||||
# Update entities will be implemented once installation/provider resolution is in place.
|
||||
# This stub prevents platform load errors and keeps the integration stable in 0.3.0.
|
||||
import logging
|
||||
from dataclasses import dataclass
|
||||
from typing import Any
|
||||
|
||||
from homeassistant.core import HomeAssistant
|
||||
from homeassistant.components.update import UpdateEntity, UpdateEntityFeature
|
||||
from homeassistant.core import HomeAssistant, callback
|
||||
from homeassistant.helpers.dispatcher import async_dispatcher_connect
|
||||
from homeassistant.helpers.entity_platform import AddEntitiesCallback
|
||||
from homeassistant.helpers.entity import EntityCategory
|
||||
|
||||
from .core import DOMAIN, SIGNAL_UPDATED, BCSCore
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def _pretty_repo_name(core: BCSCore, repo_id: str) -> str:
|
||||
"""Return a human-friendly name for a repo update entity."""
|
||||
try:
|
||||
repo = core.get_repo(repo_id)
|
||||
if repo and getattr(repo, "name", None):
|
||||
name = str(repo.name).strip()
|
||||
if name:
|
||||
return name
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
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}"
|
||||
|
||||
self._refresh_display_name()
|
||||
|
||||
def _refresh_display_name(self) -> None:
|
||||
pretty = _pretty_repo_name(self._core, self._repo_id)
|
||||
self._attr_name = pretty
|
||||
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()
|
||||
|
||||
try:
|
||||
await self._core.update_repo(self._repo_id)
|
||||
finally:
|
||||
self._in_progress = False
|
||||
self.async_write_ha_state()
|
||||
|
||||
|
||||
@callback
|
||||
def _sync_entities(core: BCSCore, existing: dict[str, BCSRepoUpdateEntity], async_add_entities: AddEntitiesCallback) -> None:
|
||||
"""Ensure there is one update entity per installed repo AND keep names in sync."""
|
||||
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:
|
||||
# IMPORTANT: Update display name after refresh, when repo.name becomes available.
|
||||
existing[repo_id]._refresh_display_name()
|
||||
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(
|
||||
@@ -14,4 +145,18 @@ async def async_setup_platform(
|
||||
async_add_entities: AddEntitiesCallback,
|
||||
discovery_info=None,
|
||||
):
|
||||
return
|
||||
"""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)
|
||||
@@ -334,6 +334,27 @@ class BCSUpdateView(HomeAssistantView):
|
||||
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 BCSRestartView(HomeAssistantView):
|
||||
url = "/api/bcs/restart"
|
||||
name = "api:bcs_restart"
|
||||
|
||||
Reference in New Issue
Block a user