Compare commits

..
69 Commits
Author SHA1 Message Date
semantic-release 8069a5d635 chore(release): v1.0.13
Update Version / Update Version (push) Successful in 5s
2026-07-09 19:00:28 +00:00
sirmrak 356b61e6e6 fix: Test validation
Update Version / Update Version (push) Successful in 6s
2026-07-09 22:00:19 +03:00
sirmrak 3b93a6a16b Добавление тестов
Update Version / Update Version (push) Successful in 5s
2026-07-09 21:59:37 +03:00
semantic-release aa7eb0a9d9 chore(release): v1.0.12
Update Version / Update Version (push) Successful in 5s
2026-07-09 18:47:22 +00:00
sirmrak 0888c63b80 fix: test
Update Version / Update Version (push) Successful in 5s
2026-07-09 21:47:14 +03:00
sirmrak c6e7b332cf Обновить .gitea/workflows/update_version.yml
Update Version / Update Version (push) Successful in 5s
2026-07-09 21:45:52 +03:00
semantic-release 7b4fdfe629 chore(release): v1.0.11
Update Version / Update Version (push) Successful in 5s
2026-07-09 18:35:55 +00:00
sirmrak 15dd7e3880 fix: Test
Update Version / Update Version (push) Failing after 6s
2026-07-09 21:35:49 +03:00
sirmrak 28811370e9 Обновить .gitea/workflows/update_version.yml
Update Version / Update Version (push) Successful in 5s
2026-07-09 21:35:26 +03:00
sirmrak a1fca2f4d1 Обновить pyproject.toml
Update Version / Update Version (push) Successful in 6s
2026-07-09 21:34:44 +03:00
semantic-release d479bdb583 chore(release): v1.0.10
Update Version / Update Version (push) Successful in 6s
2026-07-09 18:26:23 +00:00
sirmrak 010a1144c5 fix: Test
Update Version / Update Version (push) Failing after 7s
2026-07-09 21:26:14 +03:00
sirmrak 6cf92d83f0 Обновить .gitea/workflows/update_version.yml
Update Version / Update Version (push) Successful in 5s
2026-07-09 21:24:56 +03:00
sirmrak 9f7199beab Обновить pyproject.toml
Update Version / Update Version (push) Successful in 5s
2026-07-09 21:23:53 +03:00
semantic-release a02ae4106b chore(release): v1.0.9
Update Version / Update Version (push) Successful in 4s
2026-07-09 18:08:02 +00:00
sirmrak 6a411cea91 fix: test
Update Version / Update Version (push) Failing after 7s
2026-07-09 21:07:53 +03:00
sirmrak 4ff72fdb07 Обновить pyproject.toml
Update Version / Update Version (push) Successful in 5s
2026-07-09 21:07:03 +03:00
semantic-release 93d1afd7e0 chore(release): v1.0.8
Update Version / Update Version (push) Successful in 5s
2026-07-09 17:49:53 +00:00
sirmrak 11bf31885e fix: Тестовый релиз
Update Version / Update Version (push) Failing after 6s
2026-07-09 20:49:43 +03:00
sirmrak 8b93ed6187 Удалить test.text
Update Version / Update Version (push) Successful in 5s
2026-07-09 20:48:31 +03:00
sirmrak 286f84fbb0 Добавить test.text
Update Version / Update Version (push) Successful in 5s
2026-07-09 20:47:26 +03:00
sirmrak 01a504f0ba Добавить .github/workflows/release.yml
Update Version / Update Version (push) Successful in 5s
2026-07-09 20:44:49 +03:00
semantic-release c97fc433bc chore(release): v1.0.7
Update Version / Update Version (push) Successful in 5s
2026-07-09 17:38:46 +00:00
sirmrak c5a78f998f fix: Тестим авторелиз
Update Version / Update Version (push) Failing after 6s
2026-07-09 20:38:37 +03:00
semantic-release eb106d7fe4 chore(release): v1.0.6
Update Version / Update Version (push) Successful in 5s
2026-07-09 17:15:57 +00:00
sirmrak 4ffa66c312 Удалить CHANGELOG.md
Update Version / Update Version (push) Failing after 6s
2026-07-09 20:15:51 +03:00
sirmrak 3ff545c6df Обновить .gitea/workflows/update_version.yml
Update Version / Update Version (push) Successful in 5s
2026-07-09 20:14:48 +03:00
sirmrak 458603e80c Обновить .gitea/workflows/update_version.yml
Update Version / Update Version (push) Failing after 5s
2026-07-09 20:05:55 +03:00
semantic-release 81dbc70b04 chore(release): v1.0.6
Update Version / Update Version (push) Successful in 6s
2026-07-09 16:56:33 +00:00
sirmrak 58ae700e0b fix: тестовое исправление для автоматического релиза
Update Version / Update Version (push) Successful in 6s
2026-07-09 19:56:24 +03:00
sirmrak 399f55c57b Обновить .gitea/workflows/update_version.yml
Update Version / Update Version (push) Successful in 6s
2026-07-09 19:55:24 +03:00
semantic-release 900c40c8a1 chore(release): v1.0.5
/ Update Version (push) Successful in 5s
2026-07-09 16:43:26 +00:00
sirmrak 860584ca79 Добавить .gitea/workflows/update_version.yml
/ Update Version (push) Successful in 7s
2026-07-09 19:43:19 +03:00
sirmrak d230ec6590 Удалить .gitea/workflows/release.yml 2026-07-09 19:40:38 +03:00
sirmrak e0868fae9b fix: Test
HA Integration Release / Validate HA Integration (push) Successful in 2s
HA Integration Release / Semantic Release (push) Failing after 41s
2026-07-09 14:09:49 +03:00
sirmrak 59d3f9accd fix: Release 2026-07-09 14:06:50 +03:00
semantic-release ee6dde688c chore(release): v1.0.7
HA Integration Release / Validate HA Integration (push) Successful in 2s
HA Integration Release / Semantic Release (push) Successful in 41s
2026-07-09 11:01:55 +00:00
sirmrak e10e3e7c19 fix: Run Semantic Release
HA Integration Release / Validate HA Integration (push) Successful in 2s
HA Integration Release / Semantic Release (push) Failing after 43s
2026-07-09 14:01:05 +03:00
semantic-release 33756f1659 chore(release): v1.0.6
HA Integration Release / Validate HA Integration (push) Successful in 3s
HA Integration Release / Semantic Release (push) Successful in 41s
2026-07-09 10:58:00 +00:00
sirmrak bd34c9fd81 fix: release.yaml
HA Integration Release / Validate HA Integration (push) Successful in 3s
HA Integration Release / Semantic Release (push) Failing after 43s
2026-07-09 13:57:12 +03:00
semantic-release 590e110efa chore(release): v1.0.5
HA Integration Release / Validate HA Integration (push) Successful in 2s
HA Integration Release / Semantic Release (push) Successful in 5s
2026-07-09 10:50:44 +00:00
sirmrak 92b9392149 fix: test commit for release
HA Integration Release / Validate HA Integration (push) Successful in 3s
HA Integration Release / Semantic Release (push) Failing after 6s
2026-07-09 13:50:30 +03:00
semantic-release fced8328d7 chore(release): v1.0.6
HA Integration Release / Validate HA Integration (push) Successful in 2s
HA Integration Release / Semantic Release (push) Successful in 5s
2026-07-09 10:43:47 +00:00
sirmrak ae301f25db fix: disable SSL verification for semantic-release
HA Integration Release / Validate HA Integration (push) Successful in 2s
HA Integration Release / Semantic Release (push) Failing after 6s
2026-07-09 13:43:33 +03:00
semantic-release fcc4de59c1 chore(release): v1.0.5
HA Integration Release / Validate HA Integration (push) Successful in 2s
HA Integration Release / Semantic Release (push) Successful in 5s
2026-07-09 10:40:40 +00:00
sirmrak 4587148d70 fix: configure semantic-release for Gitea with SSL
HA Integration Release / Validate HA Integration (push) Successful in 2s
HA Integration Release / Semantic Release (push) Failing after 5s
2026-07-09 13:40:26 +03:00
semantic-release 6c73814724 1.0.0
HA Integration Release / Validate HA Integration (push) Successful in 2s
HA Integration Release / Semantic Release (push) Successful in 6s
Automatically generated by python-semantic-release
2026-07-09 10:32:03 +00:00
sirmrak 8c4009dc82 Обновить .gitea/workflows/release.yml
HA Integration Release / Validate HA Integration (push) Successful in 3s
HA Integration Release / Semantic Release (push) Failing after 15s
2026-07-09 13:31:39 +03:00
sirmrak 37de17749e Обновить .gitea/workflows/release.yml
HA Integration Release / Validate HA Integration (push) Failing after 3s
HA Integration Release / Semantic Release (push) Has been skipped
2026-07-09 13:28:52 +03:00
sirmrak d4c2548498 fix: Изменил размер картинки
Test Runner / Test Job (push) Successful in 4s
HA Integration Release / Validate HA Integration (push) Failing after 4s
HA Integration Release / Semantic Release (push) Has been skipped
2026-07-09 13:17:44 +03:00
sirmrak f889f18cd9 Добавить .gitea/workflows/release.yml
HA Integration Release / Validate HA Integration (push) Failing after 16s
HA Integration Release / Semantic Release (push) Has been skipped
Test Runner / Test Job (push) Successful in 7s
2026-07-09 13:16:33 +03:00
sirmrak 9abb91c3f9 Добавить pyproject.toml
Test Runner / Test Job (push) Successful in 4s
2026-07-09 13:15:26 +03:00
sirmrak 76388df08c GIT_SSL_NO_VERIFY: true
Test Runner / Test Job (push) Successful in 18s
2026-07-09 13:07:24 +03:00
sirmrak 9626fafd2f Добавить .gitea/workflows/test.yml
Test Runner / Test Job (push) Failing after 55s
2026-07-09 12:52:39 +03:00
sirmrak 71eb3a7c86 Обновить custom_components/motion_light/manifest.json 2026-07-09 09:56:10 +03:00
sirmrak b9dd8bcad7 Обновить custom_components/motion_light/translations/en.json 2026-07-09 09:48:46 +03:00
sirmrak b1a5eca9a5 Обновить custom_components/motion_light/translations/ru.json 2026-07-09 09:47:31 +03:00
sirmrak 182a46cf92 Обновить custom_components/motion_light/manifest.json 2026-07-09 09:22:02 +03:00
sirmrak e5c10104b8 Обновить custom_components/motion_light/coordinator.py 2026-07-09 09:19:53 +03:00
sirmrak 541ea43435 Обновить custom_components/motion_light/coordinator.py 2026-07-08 15:43:45 +03:00
sirmrak 62d4641097 Обновить custom_components/motion_light/translations/en.json 2026-07-08 15:26:07 +03:00
sirmrak 153d5d479f Обновить custom_components/motion_light/translations/ru.json 2026-07-08 15:25:32 +03:00
sirmrak 7ea6821116 Обновить custom_components/motion_light/sensor.py 2026-07-08 15:22:31 +03:00
sirmrak b1747ef487 Обновить custom_components/motion_light/coordinator.py 2026-07-08 15:21:43 +03:00
sirmrak ff3434612b Обновить custom_components/motion_light/const.py 2026-07-08 15:20:18 +03:00
sirmrak 57bb21e5ba Обновить custom_components/motion_light/manifest.json 2026-07-08 14:48:49 +03:00
sirmrak 18b6d83af2 Обновить custom_components/motion_light/number.py 2026-07-08 14:42:07 +03:00
sirmrak f097f7dabb Обновить custom_components/motion_light/manifest.json 2026-07-08 14:32:32 +03:00
sirmrak 55488681b2 Не создаем сущности lux при отсутствии датчика освещенности 2026-07-08 14:26:08 +03:00
14 changed files with 649 additions and 190 deletions
+33
View File
@@ -0,0 +1,33 @@
name: Test Runner
on:
push:
branches:
- main
- master
env:
GIT_SSL_NO_VERIFY: true
jobs:
test:
name: Test Job
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Echo message
run: |
echo "Hello from Gitea Actions!"
echo "Runner is working correctly!"
date
pwd
ls -la
- name: Test Python
uses: actions/setup-python@v5
with:
python-version: '3.11'
- name: Check Python version
run: python --version
+69
View File
@@ -0,0 +1,69 @@
name: Update Version
on:
push:
branches:
- main
- master
env:
GIT_SSL_NO_VERIFY: true
jobs:
update-version:
name: Update Version
runs-on: ubuntu-latest
if: github.actor != 'gitea-actions[bot]' && github.actor != 'Gitea Actions Bot'
permissions:
contents: write
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.PAT_TOKEN }}
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.11"
- name: Install dependencies
run: pip install python-semantic-release
- name: Configure Git
run: |
git config --local user.email "actions@gitea.local"
git config --local user.name "Gitea Actions Bot"
- name: Run semantic-release
env:
GITEA_TOKEN: ${{ secrets.PAT_TOKEN }}
run: |
echo "🧹 Сбрасываем конфликтующие переменные Gitea Actions..."
unset GITHUB_SERVER_URL
unset GITHUB_API_URL
unset GITHUB_REPOSITORY
echo "🔐 Записываем оригинальный Root CA от mkcert из секретов..."
echo "${{ secrets.LOCAL_ROOT_CA }}" > /tmp/rootCA.crt
# Проверка на случай, если секрет забыли настроить
if [ ! -s /tmp/rootCA.crt ]; then
echo "❌ Ошибка: Секрет LOCAL_ROOT_CA пуст. Проверьте настройки репозитория!"
exit 1
fi
echo "✅ Root CA успешно прочитан."
# Находим, где конкретно Python (библиотека certifi) хранит свои сертификаты
CERTIFI_PATH=$(python3 -c "import certifi; print(certifi.where())")
echo "Путь к bundle Python: $CERTIFI_PATH"
# Внедряем корневой сертификат mkcert в конец доверенного списка Python
cat /tmp/rootCA.crt >> "$CERTIFI_PATH"
echo "✅ Root CA от mkcert добавлен в доверенные для Python!"
echo "🚀 Запускаем semantic-release..."
semantic-release version
+132
View File
@@ -0,0 +1,132 @@
name: Test and Release
on:
push:
tags:
- 'v*'
workflow_dispatch: # Позволяет запускать вручную
jobs:
# Шаг 1: Валидация структуры HA интеграции
validate:
name: Validate Integration
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Hassfest Validation
uses: home-assistant/actions/hassfest@master
- name: HACS Validation
uses: hacs/action@main
with:
category: "integration"
# Шаг 2: Запуск тестов (если есть)
test:
name: Run Tests
runs-on: ubuntu-latest
needs: validate
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.11"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pytest pytest-homeassistant-custom-component
if [ -f requirements_test.txt ]; then pip install -r requirements_test.txt; fi
- name: Run tests
run: |
if [ -d "tests" ]; then
pytest tests/ --cov=custom_components/motion_light --cov-report=xml
else
echo "No tests directory found, skipping tests"
fi
# Шаг 3: Проверка стиля кода
lint:
name: Code Quality
runs-on: ubuntu-latest
needs: validate
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.11"
- name: Install linters
run: |
pip install black ruff mypy
- name: Check code formatting with black
run: |
black --check custom_components/motion_light/ || echo "Code formatting issues found"
- name: Check code with ruff
run: |
ruff check custom_components/motion_light/ || echo "Ruff issues found"
# Шаг 4: Создание релиза (только если все проверки пройдены)
release:
name: Create Release
runs-on: ubuntu-latest
needs: [validate, test, lint]
permissions:
contents: write
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Get tag info
id: tag
run: |
TAG=${GITHUB_REF#refs/tags/}
echo "tag=$TAG" >> $GITHUB_OUTPUT
PREV_TAG=$(git describe --tags --abbrev=0 HEAD^ 2>/dev/null || echo "")
if [ -z "$PREV_TAG" ]; then
COMMITS=$(git log --pretty=format:"- %s" --reverse)
else
COMMITS=$(git log ${PREV_TAG}..HEAD --pretty=format:"- %s" --reverse)
fi
echo "commits<<EOF" >> $GITHUB_OUTPUT
echo "$COMMITS" >> $GITHUB_OUTPUT
echo "EOF" >> $GITHUB_OUTPUT
- name: Create GitHub Release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
TAG="${{ steps.tag.outputs.tag }}"
COMMITS="${{ steps.tag.outputs.commits }}"
echo "🚀 Создаём релиз $TAG в GitHub..."
cat > /tmp/release_notes.md << EOF
## Изменения в версии $TAG
$COMMITS
EOF
gh release create "$TAG" \
--title "Release $TAG" \
--notes-file /tmp/release_notes.md \
--target main
echo "✅ Релиз создан!"
+112
View File
@@ -0,0 +1,112 @@
# CHANGELOG
<!-- version list -->
## v1.0.13 (2026-07-09)
### Bug Fixes
- Test validation
([`356b61e`](https://192.168.200.208:3000/sirmrak/motion_light/commit/356b61e6e618a423503d44d2f0d9ef96fee0da0d))
## v1.0.12 (2026-07-09)
### Bug Fixes
- Test
([`0888c63`](https://192.168.200.208:3000/sirmrak/motion_light/commit/0888c63b804be1e5bedd7e72fbfd142dd4f88287))
## v1.0.11 (2026-07-09)
### Bug Fixes
- Test
([`15dd7e3`](https://192.168.200.208:3000/sirmrak/motion_light/commit/15dd7e3880dad782f502eb70db6aa8ca23f803bc))
## v1.0.10 (2026-07-09)
### Bug Fixes
- Test
([`010a114`](https://192.168.200.208:3000/sirmrak/motion_light/commit/010a1144c5dc5252831126bfc9592036a7ca2518))
## v1.0.9 (2026-07-09)
### Bug Fixes
- Test
([`6a411ce`](https://192.168.200.208:3000/sirmrak/motion_light/commit/6a411cea91047e9714519dbb190d5d92252b024a))
## v1.0.8 (2026-07-09)
### Bug Fixes
- Тестовый релиз
([`11bf318`](https://192.168.200.208:3000/sirmrak/motion_light/commit/11bf31885eb113d02cf5c1558446a4671c1dc202))
## v1.0.7 (2026-07-09)
### Bug Fixes
- Тестим авторелиз
([`c5a78f9`](https://192.168.200.208:3000/sirmrak/motion_light/commit/c5a78f998fda972f0dfe4f938f0855d3c1d28aee))
## v1.0.6 (2026-07-09)
### Bug Fixes
- Тестовое исправление для автоматического релиза
([`58ae700`](https://192.168.200.208:3000/sirmrak/motion_light/commit/58ae700e0ba31b664222eccd96aaa17d30d2eff4))
## v1.0.5 (2026-07-09)
### Bug Fixes
- Configure semantic-release for Gitea with SSL
([`4587148`](https://192.168.200.208:3000/sirmrak/motion_light/commit/4587148d70e362fdd2a47523df0da959499fba2f))
- Disable SSL verification for semantic-release
([`ae301f2`](https://192.168.200.208:3000/sirmrak/motion_light/commit/ae301f25db468e56f9378582215b4dac6979722e))
- Release
([`59d3f9a`](https://192.168.200.208:3000/sirmrak/motion_light/commit/59d3f9accd5d2cb3b8e1ef4f403c7445e7da7b46))
- Release.yaml
([`bd34c9f`](https://192.168.200.208:3000/sirmrak/motion_light/commit/bd34c9fd81002974c08a6f349f0234b4e78353aa))
- Run Semantic Release
([`e10e3e7`](https://192.168.200.208:3000/sirmrak/motion_light/commit/e10e3e7c19c2da63289cd499cca5a5eacee22157))
- Test
([`e0868fa`](https://192.168.200.208:3000/sirmrak/motion_light/commit/e0868fae9ba86cd76eb070c5057960741eecba1e))
- Test commit for release
([`92b9392`](https://192.168.200.208:3000/sirmrak/motion_light/commit/92b93921498c7afd21d1dceec51518894c1efdcd))
- Изменил размер картинки
([`d4c2548`](https://192.168.200.208:3000/sirmrak/motion_light/commit/d4c25484981a33ab4455027ffb4ef693256aa414))
## v1.0.4 (2026-07-09)
## v1.0.3 (2026-07-08)
## v1.0.2 (2026-07-08)
## v1.0.1 (2026-07-08)
## v1.0.0 (2026-07-08)
- Initial Release
+1 -1
View File
@@ -1,5 +1,5 @@
[English](README.md) | Русский
# <img src="custom_components/motion_light/brand/icon.png" width="64"> </img> Motion Light
# <img src="custom_components/motion_light/brand/icon.png" width="32"> </img> Motion Light
Умная интеграция для Home Assistant на основе конечного автомата (FSM) для управления освещением по датчикам движения, освещенности и ручным переключениям.
+1
View File
@@ -46,5 +46,6 @@ STATE_ACTIVE = "active"
STATE_OFF = "off"
STATE_MANUAL_ON = "manual_on"
STATE_MANUAL_OFF_COOLDOWN = "manual_off_cooldown"
STATE_FORCE_STOPPED = "force_stopped"
STATE_ERROR = "error"
STATE_DISABLED = "disabled"
+66 -22
View File
@@ -28,6 +28,7 @@ from .const import (
STATE_OFF,
STATE_MANUAL_ON,
STATE_MANUAL_OFF_COOLDOWN,
STATE_FORCE_STOPPED,
STATE_ERROR,
STATE_DISABLED,
)
@@ -110,6 +111,9 @@ class MotionLightCoordinator(DataUpdateCoordinator):
attrs["main_sensors"] = self.main_sensors
attrs["extend_sensors"] = self.extend_sensors
attrs["lux_sensor"] = self.lux_sensor
attrs["force_stop_sensor"] = self.force_stop_sensor
attrs["force_stop_state"] = self.force_stop_state
attrs["force_stop_active"] = self._state == STATE_FORCE_STOPPED
attrs["active_main_sensors"] = self._get_active_main_sensors()
attrs["active_extend_sensors"] = self._get_active_extend_sensors()
attrs["lux_value"] = self._get_current_lux()
@@ -154,8 +158,6 @@ class MotionLightCoordinator(DataUpdateCoordinator):
def set_manual_idle_timeout(self, value: float) -> None:
self.manual_idle_timeout = int(value)
self.logger.info("Manual idle timeout set to %d sec", self.manual_idle_timeout)
# Если таймер уже тикает, а мы изменили значение на 0, нужно его отменить
if self.manual_idle_timeout <= 0 and self._manual_idle_timer:
self.logger.info("Manual idle timeout set to 0, cancelling active timer")
self._manual_idle_timer()
@@ -175,6 +177,15 @@ class MotionLightCoordinator(DataUpdateCoordinator):
self.logger.info("Switches: %s, Main sensors: %s, Extend sensors: %s, Lux: %s",
self.switch_entities, self.main_sensors, self.extend_sensors, self.lux_sensor)
# Проверяем состояние force_stop_sensor при старте
if self.force_stop_sensor:
force_stop_state_obj = self.hass.states.get(self.force_stop_sensor)
if force_stop_state_obj and force_stop_state_obj.state == self.force_stop_state:
self.logger.info("Force stop sensor is already in stop state at startup")
await self._update_state(STATE_FORCE_STOPPED)
await self._start_listening()
return
any_on = any(
self.hass.states.get(s) and self.hass.states.get(s).state == "on"
for s in self.switch_entities
@@ -294,6 +305,11 @@ class MotionLightCoordinator(DataUpdateCoordinator):
self.logger.debug("Integration disabled, ignoring")
return
# БЛОКИРОВЩИК: Игнорируем движение, если активна принудительная остановка
if self._state == STATE_FORCE_STOPPED:
self.logger.debug("Ignoring during force_stopped")
return
self.logger.debug("Main sensor ON by %s, current state: %s", triggered_by, self._state)
if self._state == STATE_MANUAL_OFF_COOLDOWN:
@@ -302,7 +318,6 @@ class MotionLightCoordinator(DataUpdateCoordinator):
if self._state == STATE_MANUAL_ON:
self.logger.debug("During manual_on, resetting idle timer")
# ИЗМЕНЕНИЕ: Сбрасываем таймер только если он включен (>0)
if self.manual_idle_timeout > 0:
self._reset_manual_idle_timer()
return
@@ -394,6 +409,11 @@ class MotionLightCoordinator(DataUpdateCoordinator):
self.logger.debug("Integration disabled, ignoring")
return
# БЛОКИРОВЩИК: Игнорируем движение, если активна принудительная остановка
if self._state == STATE_FORCE_STOPPED:
self.logger.debug("Ignoring during force_stopped")
return
self.logger.debug("Extend sensor ON by %s, current state: %s", triggered_by, self._state)
if self._state == STATE_IDLE:
@@ -406,7 +426,6 @@ class MotionLightCoordinator(DataUpdateCoordinator):
if self._state == STATE_MANUAL_ON:
self.logger.debug("During manual_on, resetting idle timer")
# ИЗМЕНЕНИЕ: Сбрасываем таймер только если он включен (>0)
if self.manual_idle_timeout > 0:
self._reset_manual_idle_timer()
return
@@ -440,6 +459,11 @@ class MotionLightCoordinator(DataUpdateCoordinator):
if not self.respect_manual:
return
# БЛОКИРОВЩИК: Игнорируем ручные переключения, если активна принудительная остановка
if self._state == STATE_FORCE_STOPPED:
self.logger.debug("Ignoring manual change during force_stopped")
return
new_state = event.data.get("new_state")
old_state = event.data.get("old_state")
if not new_state or not old_state:
@@ -485,9 +509,27 @@ class MotionLightCoordinator(DataUpdateCoordinator):
if not new_state:
return
# Если датчик перешел в блокирующее состояние
if new_state.state == self.force_stop_state:
self.logger.info("Force stop triggered by %s", event.data.get("entity_id"))
self.hass.async_create_task(self._force_stop())
self.hass.async_create_task(self._enter_force_stop())
# Если датчик вышел из блокирующего состояния
else:
self.logger.info("Force stop released by %s", event.data.get("entity_id"))
self.hass.async_create_task(self._exit_force_stop())
async def _enter_force_stop(self):
"""Enter force_stopped state."""
self.logger.info("Entering force_stopped state")
self._cancel_all_timers()
if self._state in (STATE_ON, STATE_DELAYING, STATE_ACTIVE, STATE_MANUAL_ON):
await self._turn_off_switches()
await self._update_state(STATE_FORCE_STOPPED)
async def _exit_force_stop(self):
"""Exit force_stopped state to idle."""
self.logger.info("Exiting force_stopped state")
await self._update_state(STATE_IDLE)
def _is_any_main_sensor_active(self) -> bool:
"""Check if any main sensor is currently in 'on' state."""
@@ -562,13 +604,21 @@ class MotionLightCoordinator(DataUpdateCoordinator):
self._check_lux_periodically,
)
self.async_set_updated_data({
"state": self._state,
"attributes": self.attributes,
})
def _stop_lux_check_timer(self):
"""Stop periodic lux check timer."""
if self._lux_check_timer:
self.logger.debug("Stopping lux check timer")
self._lux_check_timer()
self._lux_check_timer = None
self.async_set_updated_data({
"state": self._state,
"attributes": self.attributes,
})
@callback
def _check_lux_periodically(self, _=None):
"""Check lux periodically."""
@@ -658,11 +708,11 @@ class MotionLightCoordinator(DataUpdateCoordinator):
self.hass.async_create_task(self._update_state(STATE_IDLE))
async def _turn_on_switches(self) -> None:
"""Turn on switches with our context."""
"""Turn on switches/lights with our context."""
ctx = Context(
id=f"motion_light_{self.entry.entry_id}_{dt_util.utcnow().timestamp()}"
)
self.logger.info("Turning ON switches: %s", self.switch_entities)
self.logger.info("Turning ON entities: %s", self.switch_entities)
await self.hass.services.async_call(
"homeassistant",
"turn_on",
@@ -671,11 +721,11 @@ class MotionLightCoordinator(DataUpdateCoordinator):
)
async def _turn_off_switches(self) -> None:
"""Turn off switches with our context."""
"""Turn off switches/lights with our context."""
ctx = Context(
id=f"motion_light_{self.entry.entry_id}_{dt_util.utcnow().timestamp()}"
)
self.logger.info("Turning OFF switches: %s", self.switch_entities)
self.logger.info("Turning OFF entities: %s", self.switch_entities)
await self.hass.services.async_call(
"homeassistant",
"turn_off",
@@ -686,7 +736,6 @@ class MotionLightCoordinator(DataUpdateCoordinator):
async def _enter_manual_on(self):
"""Enter manual_on state."""
await self._update_state(STATE_MANUAL_ON)
# ИЗМЕНЕНИЕ: Запускаем таймер только если он не отключен (не равен 0)
if self.manual_idle_timeout > 0:
self._reset_manual_idle_timer()
else:
@@ -694,7 +743,6 @@ class MotionLightCoordinator(DataUpdateCoordinator):
def _reset_manual_idle_timer(self):
"""Reset manual idle timer."""
# ИЗМЕНЕНИЕ: Защита от создания таймера при значении 0
if self.manual_idle_timeout <= 0:
return
@@ -715,8 +763,8 @@ class MotionLightCoordinator(DataUpdateCoordinator):
self.hass.async_create_task(self._turn_off_switches_manual())
async def _turn_off_switches_manual(self):
"""Turn off switches in manual mode."""
self.logger.info("Turning OFF switches (manual timeout): %s", self.switch_entities)
"""Turn off switches/lights in manual mode."""
self.logger.info("Turning OFF entities (manual timeout): %s", self.switch_entities)
await self.hass.services.async_call(
"homeassistant",
"turn_off",
@@ -755,14 +803,10 @@ class MotionLightCoordinator(DataUpdateCoordinator):
self._lux_cooldown_active = False
self._lux_cooldown_timer = None
self.logger.info("Lux cooldown expired")
async def _force_stop(self):
"""Force stop — turn off switches."""
self.logger.info("Force stop called")
self._cancel_all_timers()
await self._turn_off_switches()
await self._update_state(STATE_OFF)
async_call_later(self.hass, 1, self._transition_to_idle)
self.async_set_updated_data({
"state": self._state,
"attributes": self.attributes,
})
def _cancel_all_timers(self):
"""Cancel all timers."""
+1 -1
View File
@@ -1,7 +1,7 @@
{
"domain": "motion_light",
"name": "Motion Light",
"version": "1.0.0",
"version": "1.0.13",
"documentation": "https://github.com/sirmrak/motion_light",
"issue_tracker": "https://github.com/sirmrak/motion_light/issues",
"dependencies": [],
+12 -4
View File
@@ -10,6 +10,7 @@ from homeassistant.helpers.restore_state import RestoreEntity
from homeassistant.helpers.device_registry import DeviceInfo
from .const import (
DOMAIN,
CONF_LUX_SENSOR,
ENTITY_MOTION_FILTER,
ENTITY_OFF_DELAY,
ENTITY_LUX_THRESHOLD,
@@ -70,16 +71,23 @@ async def async_setup_entry(
) -> None:
"""Set up Motion Light number entities."""
coordinator = hass.data[DOMAIN][entry.entry_id]
lux_sensor = entry.options.get(CONF_LUX_SENSOR) or entry.data.get(CONF_LUX_SENSOR)
entities = [
MotionLightNumber(coordinator, entry, ENTITY_MOTION_FILTER, 0, 10, 1, DEFAULT_MOTION_FILTER),
MotionLightNumber(coordinator, entry, ENTITY_OFF_DELAY, 0, 600, 5, DEFAULT_OFF_DELAY),
MotionLightNumber(coordinator, entry, ENTITY_LUX_THRESHOLD, 1, 1000, 10, DEFAULT_LUX_THRESHOLD),
MotionLightNumber(coordinator, entry, ENTITY_LUX_COOLDOWN, 0, 300, 5, DEFAULT_LUX_COOLDOWN),
MotionLightNumber(coordinator, entry, ENTITY_MANUAL_IDLE_TIMEOUT, 0, 3600, 60, DEFAULT_MANUAL_IDLE_TIMEOUT),
MotionLightNumber(coordinator, entry, ENTITY_MANUAL_IDLE_TIMEOUT, 0, 3600, 30, DEFAULT_MANUAL_IDLE_TIMEOUT),
MotionLightNumber(coordinator, entry, ENTITY_MANUAL_OFF_COOLDOWN, 0, 300, 5, DEFAULT_MANUAL_OFF_COOLDOWN),
]
async_add_entities(entities)
if lux_sensor:
entities.extend([
MotionLightNumber(coordinator, entry, ENTITY_LUX_THRESHOLD, 1, 1000, 10, DEFAULT_LUX_THRESHOLD),
MotionLightNumber(coordinator, entry, ENTITY_LUX_COOLDOWN, 0, 300, 5, DEFAULT_LUX_COOLDOWN),
])
async_add_entities(entities)
class MotionLightNumber(CoordinatorEntity, NumberEntity, RestoreEntity):
"""Representation of a Motion Light setting as a number entity."""
+1
View File
@@ -45,6 +45,7 @@ class MotionLightStatusSensor(CoordinatorEntity, SensorEntity):
"off": "mdi:lightbulb-off-outline",
"manual_on": "mdi:hand-back-left",
"manual_off_cooldown": "mdi:timer-pause",
"force_stopped": "mdi:stop-circle-outline",
"error": "mdi:alert-circle",
"disabled": "mdi:lightbulb-off",
}
@@ -55,8 +55,25 @@
"off": "Off",
"manual_on": "Manual on",
"manual_off_cooldown": "Manual off cooldown",
"force_stopped": "Force stopped",
"error": "Error",
"disabled": "Disabled"
},
"attributes": {
"switch_entities": "Controlled switches",
"main_sensors": "Main triggers",
"extend_sensors": "Extend sensors",
"lux_sensor": "Illuminance sensor",
"force_stop_sensor": "Force stop sensor",
"force_stop_state": "Force stop state",
"force_stop_active": "Force stop active",
"active_main_sensors": "Active main triggers",
"active_extend_sensors": "Active extend sensors",
"lux_value": "Current illuminance",
"lux_cooldown_active": "Lux cooldown active",
"lux_check_active": "Lux check active",
"triggered_by": "Triggered by",
"last_motion_time": "Last motion time"
}
}
},
@@ -55,8 +55,25 @@
"off": "Выключено",
"manual_on": "Ручное включение",
"manual_off_cooldown": "Пауза после ручного выкл.",
"force_stopped": "Принудительная остановка",
"error": "Ошибка",
"disabled": "Отключено"
},
"attributes": {
"switch_entities": "Управляемые выключатели",
"main_sensors": "Главные триггеры",
"extend_sensors": "Датчики продления",
"lux_sensor": "Датчик освещённости",
"force_stop_sensor": "Датчик принудительной остановки",
"force_stop_state": "Состояние принудительной остановки",
"force_stop_active": "Принудительная остановка активна",
"active_main_sensors": "Активные главные триггеры",
"active_extend_sensors": "Активные датчики продления",
"lux_value": "Текущая освещённость",
"lux_cooldown_active": "Cooldown люкса активен",
"lux_check_active": "Проверка люкса активна",
"triggered_by": "Активировано",
"last_motion_time": "Последнее движение"
}
}
},
+25
View File
@@ -0,0 +1,25 @@
[tool.semantic_release]
tag_format = "v{version}"
version_variables = [
"custom_components/motion_light/manifest.json:version",
]
commit_message = "chore(release): v{version}"
# ВАЖНО: не создаём релиз в Gitea (релиз будет в GitHub)
upload_to_vcs_release = false
[tool.semantic_release.remote]
type = "gitea"
domain = "192.168.200.208:3000"
api_domain = "192.168.200.208:3000"
[tool.semantic_release.branches.main]
match = "(main|master)"
prerelease = false
[tool.semantic_release.commit_parser_options]
allowed_tags = ["feat", "fix", "docs", "style", "refactor", "perf", "test", "chore", "revert"]
minor_tags = ["feat"]
patch_tags = ["fix", "perf"]