chore(release): v1.1.0

Reviewed-on: #1

.gitea/workflows/test.yml

@@ -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

.gitea/workflows/update_version.yml

@@ -0,0 +1,46 @@
+name: Update Version
+
+on:
+  push:
+    branches:
+      - main
+      - master
+      - dev
+
+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: |
+          unset GITHUB_SERVER_URL
+          unset GITHUB_API_URL
+          unset GITHUB_REPOSITORY
+          semantic-release version

.github/workflows/release.yml

@@ -0,0 +1,145 @@
+name: Test and Release
+
+on:
+  push:
+    tags:
+      - 'v*'
+  workflow_dispatch:
+
+jobs:
+  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"
+
+  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
+
+  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"
+
+  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
+          
+          # Проверяем, это beta или stable релиз
+          if [[ "$TAG" == *"beta"* ]]; then
+            echo "is_beta=true" >> $GITHUB_OUTPUT
+            PRERELEASE_FLAG="--prerelease"
+          else
+            echo "is_beta=false" >> $GITHUB_OUTPUT
+            PRERELEASE_FLAG=""
+          fi
+          
+          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 }}"
+          IS_BETA="${{ steps.tag.outputs.is_beta }}"
+          
+          echo "🚀 Создаём релиз $TAG в GitHub..."
+          
+          if [ "$IS_BETA" = "true" ]; then
+            TITLE="Beta Release $TAG"
+          else
+            TITLE="Release $TAG"
+          fi
+          
+          cat > /tmp/release_notes.md << EOF
+          ## $TITLE
+          
+          $COMMITS
+          EOF
+          
+          gh release create "$TAG" \
+            --title "$TITLE" \
+            --notes-file /tmp/release_notes.md \
+            --target main \
+            ${IS_BETA:+--prerelease}
+          
+          echo "✅ Релиз создан!"

CHANGELOG.md

@@ -0,0 +1,155 @@
+# CHANGELOG
+
+<!-- version list -->
+
+## v1.1.0 (2026-07-22)
+
+
+## v1.1.0-beta.1 (2026-07-22)
+
+### Features
+
+- Add dev branch for beta releases
+  ([`fa4d133`](https://git.darkmode.duckdns.org/sirmrak/motion_light/commit/fa4d133d50e896428883919c98ef830780aacce2))
+
+
+## v1.0.17 (2026-07-17)
+
+### Bug Fixes
+
+- Test
+  ([`31237e7`](https://git.darkmode.duckdns.org/sirmrak/motion_light/commit/31237e76d9c770dae4e04fad6d7a0196340a60c5))
+
+
+## v1.0.16 (2026-07-10)
+
+### Bug Fixes
+
+- Test new secrets
+  ([`eae1c9c`](https://192.168.200.208:3000/sirmrak/motion_light/commit/eae1c9cef21aa9285a6e5b2174949b6bf2942154))
+
+
+## v1.0.15 (2026-07-10)
+
+### Bug Fixes
+
+- Lux_cooldown_active
+  ([`342a983`](https://192.168.200.208:3000/sirmrak/motion_light/commit/342a98327d2297977323e12f84e0dc9bc8b3a49d))
+
+
+## v1.0.14 (2026-07-09)
+
+### Bug Fixes
+
+- Удалены переводы атрибутов из custom_components/motion_light/translations
+  ([`563095c`](https://192.168.200.208:3000/sirmrak/motion_light/commit/563095cbcf77d22d02a7176faf5aec6837d18b37))
+
+
+## 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

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 sirmrak
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.ru.md

@@ -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) для управления освещением по датчикам движения, освещенности и ручным переключениям.
 

custom_components/motion_light/__init__.py

@@ -1,4 +1,4 @@
-"""The Motion Light integration."""
+"""The Motion Light integration. Test"""
 import logging
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
@@ -44,4 +44,4 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 async def _async_update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
     """Handle options update."""
     _LOGGER.info("Options updated, reloading Motion Light '%s'", entry.title)
-    await hass.config_entries.async_reload(entry.entry_id)
+    await hass.config_entries.async_reload(entry.entry_id)

custom_components/motion_light/const.py

@@ -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"

custom_components/motion_light/coordinator.py

@@ -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
@@ -439,6 +458,11 @@ class MotionLightCoordinator(DataUpdateCoordinator):
         """Handle target switch state change."""
         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")
@@ -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."""
@@ -561,6 +603,11 @@ class MotionLightCoordinator(DataUpdateCoordinator):
             LUX_CHECK_INTERVAL,
             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."""
@@ -568,7 +615,24 @@ class MotionLightCoordinator(DataUpdateCoordinator):
             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,
+            })
 
+    def _cancel_lux_cooldown(self):
+        """Cancel lux cooldown when light is turned on."""
+        if self._lux_cooldown_active:
+            self.logger.debug("Cancelling lux cooldown")
+            self._lux_cooldown_active = False
+            if self._lux_cooldown_timer:
+                self._lux_cooldown_timer()
+                self._lux_cooldown_timer = None
+            self.async_set_updated_data({
+                "state": self._state,
+                "attributes": self.attributes,
+            })   
+            
     @callback
     def _check_lux_periodically(self, _=None):
         """Check lux periodically."""
@@ -605,7 +669,8 @@ class MotionLightCoordinator(DataUpdateCoordinator):
         if not self._is_any_sensor_active():
             self.logger.debug("No sensors active, not turning on")
             return
-
+        
+        self._cancel_lux_cooldown() 
         triggered_by = self._attributes.get("triggered_by")
         await self._turn_on_switches()
         await self._update_state(STATE_ON, triggered_by=triggered_by)
@@ -620,7 +685,7 @@ class MotionLightCoordinator(DataUpdateCoordinator):
             await self._update_state(STATE_IDLE)
             self._start_lux_check_timer()
             return
-
+        self._cancel_lux_cooldown()
         triggered_by = self._attributes.get("triggered_by")
         await self._turn_on_switches()
         await self._update_state(STATE_ON, triggered_by=triggered_by)
@@ -658,11 +723,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 +736,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",
@@ -685,8 +750,8 @@ class MotionLightCoordinator(DataUpdateCoordinator):
 
     async def _enter_manual_on(self):
         """Enter manual_on state."""
+        self._cancel_lux_cooldown()
         await self._update_state(STATE_MANUAL_ON)
-        # ИЗМЕНЕНИЕ: Запускаем таймер только если он не отключен (не равен 0)
         if self.manual_idle_timeout > 0:
             self._reset_manual_idle_timer()
         else:
@@ -694,7 +759,6 @@ class MotionLightCoordinator(DataUpdateCoordinator):
 
     def _reset_manual_idle_timer(self):
         """Reset manual idle timer."""
-        # ИЗМЕНЕНИЕ: Защита от создания таймера при значении 0
         if self.manual_idle_timeout <= 0:
             return
 
@@ -715,8 +779,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."""
+        """Turn off switches/lights in manual mode."""
-        self.logger.info("Turning OFF switches (manual timeout): %s", self.switch_entities)
+        self.logger.info("Turning OFF entities (manual timeout): %s", self.switch_entities)
         await self.hass.services.async_call(
             "homeassistant",
             "turn_off",
@@ -755,15 +819,11 @@ class MotionLightCoordinator(DataUpdateCoordinator):
         self._lux_cooldown_active = False
         self._lux_cooldown_timer = None
         self.logger.info("Lux cooldown expired")
-
+        self.async_set_updated_data({
-    async def _force_stop(self):
+            "state": self._state,
-        """Force stop — turn off switches."""
+            "attributes": self.attributes,
-        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)
-
     def _cancel_all_timers(self):
         """Cancel all timers."""
         if self._motion_detect_timer:

custom_components/motion_light/manifest.json

@@ -1,12 +1,12 @@
 {
-  "domain": "motion_light",
+    "domain": "motion_light",
-  "name": "Motion Light",
+    "name": "Motion Light",
-  "version": "1.0.2",
+    "codeowners": ["@sirmrak"],
-  "documentation": "https://github.com/sirmrak/motion_light",
+    "config_flow": true,
-  "issue_tracker": "https://github.com/sirmrak/motion_light/issues",
+    "dependencies": [],
-  "dependencies": [],
+    "documentation": "https://github.com/sirmrak/motion_light",
-  "codeowners": ["@sirmrak"],
+    "iot_class": "local_push",
-  "requirements": [],
+    "issue_tracker": "https://github.com/sirmrak/motion_light/issues",
-  "iot_class": "local_push",
+    "requirements": [],
-  "config_flow": true
+    "version": "1.1.0"
 }

custom_components/motion_light/sensor.py

@@ -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",
         }

custom_components/motion_light/translations/en.json

@@ -1,84 +1,85 @@
 {
-  "config": {
+    "config": {
-    "step": {
+        "step": {
-      "user": {
+            "user": {
-        "title": "Motion Light",
+                "title": "Motion Light",
-        "description": "Motion-based lighting control setup",
+                "description": "Motion-based lighting control setup",
-        "data": {
+                "data": {
-          "name": "Name",
+                    "name": "Name",
-          "main_sensors": "Main triggers",
+                    "main_sensors": "Main triggers",
-          "extend_sensors": "Extend sensors (optional)",
+                    "extend_sensors": "Extend sensors (optional)",
-          "switch_entities": "Controlled switches",
+                    "switch_entities": "Controlled switches",
-          "lux_sensor": "Illuminance sensor (optional)",
+                    "lux_sensor": "Illuminance sensor (optional)",
-          "force_stop_sensor": "Force stop sensor (optional)",
+                    "force_stop_sensor": "Force stop sensor (optional)",
-          "force_stop_state": "Force stop sensor state",
+                    "force_stop_state": "Force stop sensor state",
-          "log_level": "Log level"
+                    "log_level": "Log level"
+                }
+            }
         }
-      }
-    }
-  },
-  "options": {
-    "step": {
-      "init": {
-        "title": "Motion Light Options",
-        "description": "Change integration parameters",
-        "data": {
-          "main_sensors": "Main triggers",
-          "extend_sensors": "Extend sensors (optional)",
-          "switch_entities": "Controlled switches",
-          "lux_sensor": "Illuminance sensor (optional)",
-          "force_stop_sensor": "Force stop sensor (optional)",
-          "force_stop_state": "Force stop sensor state",
-          "log_level": "Log level"
-        }
-      }
-    }
-  },
-  "entity": {
-    "switch": {
-      "motion_light_enabled": {
-        "name": "Control"
-      },
-      "motion_light_priority_manual": {
-        "name": "Manual priority"
-      }
     },
-    "sensor": {
+    "options": {
-      "motion_light_status": {
+        "step": {
-        "name": "Status",
+            "init": {
-        "state": {
+                "title": "Motion Light Options",
-          "idle": "Idle",
+                "description": "Change integration parameters",
-          "detecting": "Detecting",
+                "data": {
-          "on": "On",
+                    "main_sensors": "Main triggers",
-          "delaying": "Delaying",
+                    "extend_sensors": "Extend sensors (optional)",
-          "active": "Extended",
+                    "switch_entities": "Controlled switches",
-          "off": "Off",
+                    "lux_sensor": "Illuminance sensor (optional)",
-          "manual_on": "Manual on",
+                    "force_stop_sensor": "Force stop sensor (optional)",
-          "manual_off_cooldown": "Manual off cooldown",
+                    "force_stop_state": "Force stop sensor state",
-          "error": "Error",
+                    "log_level": "Log level"
-          "disabled": "Disabled"
+                }
+            }
         }
-      }
     },
-    "number": {
+    "entity": {
-      "motion_light_motion_filter": {
+        "switch": {
-        "name": "Motion filter"
+            "motion_light_enabled": {
-      },
+                "name": "Control"
-      "motion_light_off_delay": {
+            },
-        "name": "Off delay"
+            "motion_light_priority_manual": {
-      },
+                "name": "Manual priority"
-      "motion_light_lux_threshold": {
+            }
-        "name": "Lux threshold"
+        },
-      },
+        "sensor": {
-      "motion_light_lux_cooldown": {
+            "motion_light_status": {
-        "name": "Lux cooldown"
+                "name": "Status",
-      },
+                "state": {
-      "motion_light_manual_idle_timeout": {
+                    "idle": "Idle",
-        "name": "'Forgot to turn off' timer"
+                    "detecting": "Detecting",
-      },
+                    "on": "On",
-      "motion_light_manual_off_cooldown": {
+                    "delaying": "Delaying",
-        "name": "Manual off cooldown"
+                    "active": "Extended",
-      }
+                    "off": "Off",
+                    "manual_on": "Manual on",
+                    "manual_off_cooldown": "Manual off cooldown",
+                    "force_stopped": "Force stopped",
+                    "error": "Error",
+                    "disabled": "Disabled"
+                }
+            }
+        },
+        "number": {
+            "motion_light_motion_filter": {
+                "name": "Motion filter"
+            },
+            "motion_light_off_delay": {
+                "name": "Off delay"
+            },
+            "motion_light_lux_threshold": {
+                "name": "Lux threshold"
+            },
+            "motion_light_lux_cooldown": {
+                "name": "Lux cooldown"
+            },
+            "motion_light_manual_idle_timeout": {
+                "name": "'Forgot to turn off' timer"
+            },
+            "motion_light_manual_off_cooldown": {
+                "name": "Manual off cooldown"
+            }
+        }
     }
-  }
 }

custom_components/motion_light/translations/ru.json

@@ -1,84 +1,85 @@
 {
-  "config": {
+    "config": {
-    "step": {
+        "step": {
-      "user": {
+            "user": {
-        "title": "Motion Light",
+                "title": "Motion Light",
-        "description": "Настройка управления освещением по движению",
+                "description": "Настройка управления освещением по движению",
-        "data": {
+                "data": {
-          "name": "Название",
+                    "name": "Название",
-          "main_sensors": "Главные триггеры",
+                    "main_sensors": "Главные триггеры",
-          "extend_sensors": "Датчики продления (опционально)",
+                    "extend_sensors": "Датчики продления (опционально)",
-          "switch_entities": "Управляемые выключатели",
+                    "switch_entities": "Управляемые выключатели",
-          "lux_sensor": "Датчик освещённости (опционально)",
+                    "lux_sensor": "Датчик освещённости (опционально)",
-          "force_stop_sensor": "Датчик принудительной остановки (опционально)",
+                    "force_stop_sensor": "Датчик принудительной остановки (опционально)",
-          "force_stop_state": "Состояние датчика принудительной остановки",
+                    "force_stop_state": "Состояние датчика принудительной остановки",
-          "log_level": "Уровень логирования"
+                    "log_level": "Уровень логирования"
+                }
+            }
         }
-      }
-    }
-  },
-  "options": {
-    "step": {
-      "init": {
-        "title": "Настройки Motion Light",
-        "description": "Изменение параметров интеграции",
-        "data": {
-          "main_sensors": "Главные триггеры",
-          "extend_sensors": "Датчики продления (опционально)",
-          "switch_entities": "Управляемые выключатели",
-          "lux_sensor": "Датчик освещённости (опционально)",
-          "force_stop_sensor": "Датчик принудительной остановки (опционально)",
-          "force_stop_state": "Состояние датчика принудительной остановки",
-          "log_level": "Уровень логирования"
-        }
-      }
-    }
-  },
-  "entity": {
-    "switch": {
-      "motion_light_enabled": {
-        "name": "Управление"
-      },
-      "motion_light_priority_manual": {
-        "name": "Приоритет ручного"
-      }
     },
-    "sensor": {
+    "options": {
-      "motion_light_status": {
+        "step": {
-        "name": "Статус",
+            "init": {
-        "state": {
+                "title": "Настройки Motion Light",
-          "idle": "Ожидание",
+                "description": "Изменение параметров интеграции",
-          "detecting": "Обнаружение",
+                "data": {
-          "on": "Включено",
+                    "main_sensors": "Главные триггеры",
-          "delaying": "Задержка выключения",
+                    "extend_sensors": "Датчики продления (опционально)",
-          "active": "Продлено",
+                    "switch_entities": "Управляемые выключатели",
-          "off": "Выключено",
+                    "lux_sensor": "Датчик освещённости (опционально)",
-          "manual_on": "Ручное включение",
+                    "force_stop_sensor": "Датчик принудительной остановки (опционально)",
-          "manual_off_cooldown": "Пауза после ручного выкл.",
+                    "force_stop_state": "Состояние датчика принудительной остановки",
-          "error": "Ошибка",
+                    "log_level": "Уровень логирования"
-          "disabled": "Отключено"
+                }
+            }
         }
-      }
     },
-    "number": {
+    "entity": {
-      "motion_light_motion_filter": {
+        "switch": {
-        "name": "Фильтр движения"
+            "motion_light_enabled": {
-      },
+                "name": "Управление"
-      "motion_light_off_delay": {
+            },
-        "name": "Задержка выключения"
+            "motion_light_priority_manual": {
-      },
+                "name": "Приоритет ручного"
-      "motion_light_lux_threshold": {
+            }
-        "name": "Порог освещённости"
+        },
-      },
+        "sensor": {
-      "motion_light_lux_cooldown": {
+            "motion_light_status": {
-        "name": "Cooldown люкса"
+                "name": "Статус",
-      },
+                "state": {
-      "motion_light_manual_idle_timeout": {
+                    "idle": "Ожидание",
-        "name": "Таймер 'забыл выключить'"
+                    "detecting": "Обнаружение",
-      },
+                    "on": "Включено",
-      "motion_light_manual_off_cooldown": {
+                    "delaying": "Задержка выключения",
-        "name": "Cooldown ручного выкл."
+                    "active": "Продлено",
-      }
+                    "off": "Выключено",
+                    "manual_on": "Ручное включение",
+                    "manual_off_cooldown": "Пауза после ручного выкл.",
+                    "force_stopped": "Принудительная остановка",
+                    "error": "Ошибка",
+                    "disabled": "Отключено"
+                }
+            }
+        },
+        "number": {
+            "motion_light_motion_filter": {
+                "name": "Фильтр движения"
+            },
+            "motion_light_off_delay": {
+                "name": "Задержка выключения"
+            },
+            "motion_light_lux_threshold": {
+                "name": "Порог освещённости"
+            },
+            "motion_light_lux_cooldown": {
+                "name": "Cooldown люкса"
+            },
+            "motion_light_manual_idle_timeout": {
+                "name": "Таймер 'забыл выключить'"
+            },
+            "motion_light_manual_off_cooldown": {
+                "name": "Cooldown ручного выкл."
+            }
+        }
     }
-  }
 }

pyproject.toml

@@ -0,0 +1,32 @@
+[tool.semantic_release]
+tag_format = "v{version}"
+
+version_variables = [
+    "custom_components/motion_light/manifest.json:version",
+]
+
+commit_message = "chore(release): v{version}"
+
+# Отключаем создание релиза через API Gitea (релиз будет создаваться в GitHub)
+upload_to_vcs_release = false
+
+[tool.semantic_release.remote]
+type = "gitea"
+domain = "git.darkmode.duckdns.org"
+api_domain = "git.darkmode.duckdns.org"
+
+# Настройки для stable релизов (ветка main)
+[tool.semantic_release.branches.main]
+match = "(main|master)"
+prerelease = false
+
+# Настройки для beta релизов (ветка dev)
+[tool.semantic_release.branches.dev]
+match = "dev"
+prerelease = true
+prerelease_token = "beta"
+
+[tool.semantic_release.commit_parser_options]
+allowed_tags = ["feat", "fix", "docs", "style", "refactor", "perf", "test", "chore", "revert"]
+minor_tags = ["feat"]
+patch_tags = ["fix", "perf"]