chore(release): v1.0.7

Automatically generated by python-semantic-release

.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,47 @@
+name: Update Version
+
+on:
+  push:
+    branches:
+      - main
+      - master
+
+env:
+  GIT_SSL_NO_VERIFY: true
+
+jobs:
+  update-version:
+    name: Update Version
+    runs-on: ubuntu-latest
+    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 }}
+          PYTHONHTTPSVERIFY: "0"
+          REQUESTS_CA_BUNDLE: ""
+          CURL_CA_BUNDLE: ""
+        run: |
+          echo "🚀 Запускаем semantic-release..."
+          semantic-release version

CHANGELOG.md

@@ -0,0 +1,64 @@
+# CHANGELOG
+
+<!-- version list -->
+
+## 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

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/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
@@ -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."""
+        """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,14 +803,10 @@ 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."""

custom_components/motion_light/manifest.json

@@ -1,7 +1,7 @@
 {
   "domain": "motion_light",
   "name": "Motion Light",
-  "version": "1.0.0",
+  "version": "1.0.7",
   "documentation": "https://github.com/sirmrak/motion_light",
   "issue_tracker": "https://github.com/sirmrak/motion_light/issues",
   "dependencies": [],

custom_components/motion_light/number.py

@@ -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_MANUAL_IDLE_TIMEOUT, 0, 3600, 30, DEFAULT_MANUAL_IDLE_TIMEOUT),
-        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_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."""

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

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

custom_components/motion_light/translations/ru.json

@@ -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": "Последнее движение"
         }
       }
     },

pyproject.toml

@@ -0,0 +1,30 @@
+[tool.semantic_release]
+# Формат тега С префиксом v (для совместимости с существующими тегами)
+tag_format = "v{version}"
+
+# Где обновлять версию при релизе
+version_variables = [
+    "custom_components/motion_light/manifest.json:version",
+]
+
+# Сообщение коммита
+commit_message = "chore(release): v{version}"
+
+# Настройки для Gitea
+[tool.semantic_release.remote]
+type = "gitea"
+# URL вашей Gitea (без trailing slash)
+domain = "https://192.168.200.208:3000"
+# Имя пользователя и репозитория
+api_path = "/api/v1"
+
+# Настройки веток
+[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"]