chore(release): v1.1.0

Reviewed-on: #1

.gitea/workflows/update_version.yml

@@ -5,14 +5,13 @@ on:
     branches:
       - main
       - master
-
-env:
-  GIT_SSL_NO_VERIFY: true
+      - 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
@@ -41,29 +40,7 @@ jobs:
         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
+          semantic-release version

.github/workflows/release.yml

@@ -4,10 +4,9 @@ on:
   push:
     tags:
       - 'v*'
-  workflow_dispatch:  # Позволяет запускать вручную
+  workflow_dispatch:
 
 jobs:
-  # Шаг 1: Валидация структуры HA интеграции
   validate:
     name: Validate Integration
     runs-on: ubuntu-latest
@@ -23,7 +22,6 @@ jobs:
         with:
           category: "integration"
 
-  # Шаг 2: Запуск тестов (если есть)
   test:
     name: Run Tests
     runs-on: ubuntu-latest
@@ -51,7 +49,6 @@ jobs:
             echo "No tests directory found, skipping tests"
           fi
 
-  # Шаг 3: Проверка стиля кода
   lint:
     name: Code Quality
     runs-on: ubuntu-latest
@@ -77,7 +74,6 @@ jobs:
         run: |
           ruff check custom_components/motion_light/ || echo "Ruff issues found"
 
-  # Шаг 4: Создание релиза (только если все проверки пройдены)
   release:
     name: Create Release
     runs-on: ubuntu-latest
@@ -97,6 +93,15 @@ jobs:
           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
@@ -115,18 +120,26 @@ jobs:
         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
-          ## Изменения в версии $TAG
+          ## $TITLE
           
           $COMMITS
           EOF
           
           gh release create "$TAG" \
-            --title "Release $TAG" \
+            --title "$TITLE" \
             --notes-file /tmp/release_notes.md \
-            --target main
+            --target main \
+            ${IS_BETA:+--prerelease}
           
           echo "✅ Релиз создан!"

CHANGELOG.md

@@ -2,6 +2,49 @@
 
 <!-- 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

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.

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

custom_components/motion_light/coordinator.py

@@ -619,6 +619,20 @@ class MotionLightCoordinator(DataUpdateCoordinator):
                 "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."""
@@ -655,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)
@@ -670,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)
@@ -735,6 +750,7 @@ class MotionLightCoordinator(DataUpdateCoordinator):
 
     async def _enter_manual_on(self):
         """Enter manual_on state."""
+        self._cancel_lux_cooldown()
         await self._update_state(STATE_MANUAL_ON)
         if self.manual_idle_timeout > 0:
             self._reset_manual_idle_timer()

custom_components/motion_light/manifest.json

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

custom_components/motion_light/translations/en.json

@@ -1,101 +1,85 @@
 {
-  "config": {
-    "step": {
-      "user": {
-        "title": "Motion Light",
-        "description": "Motion-based lighting control setup",
-        "data": {
-          "name": "Name",
-          "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"
+    "config": {
+        "step": {
+            "user": {
+                "title": "Motion Light",
+                "description": "Motion-based lighting control setup",
+                "data": {
+                    "name": "Name",
+                    "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"
+                }
+            }
         }
-      }
-    }
-  },
-  "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": {
-      "motion_light_status": {
-        "name": "Status",
-        "state": {
-          "idle": "Idle",
-          "detecting": "Detecting",
-          "on": "On",
-          "delaying": "Delaying",
-          "active": "Extended",
-          "off": "Off",
-          "manual_on": "Manual on",
-          "manual_off_cooldown": "Manual off cooldown",
-          "force_stopped":  "Force stopped",
-          "error": "Error",
-          "disabled": "Disabled"
+    "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"
+            }
         },
-        "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"
+        "sensor": {
+            "motion_light_status": {
+                "name": "Status",
+                "state": {
+                    "idle": "Idle",
+                    "detecting": "Detecting",
+                    "on": "On",
+                    "delaying": "Delaying",
+                    "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"
+            }
         }
-      }
-    },
-    "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,101 +1,85 @@
 {
-  "config": {
-    "step": {
-      "user": {
-        "title": "Motion Light",
-        "description": "Настройка управления освещением по движению",
-        "data": {
-          "name": "Название",
-          "main_sensors": "Главные триггеры",
-          "extend_sensors": "Датчики продления (опционально)",
-          "switch_entities": "Управляемые выключатели",
-          "lux_sensor": "Датчик освещённости (опционально)",
-          "force_stop_sensor": "Датчик принудительной остановки (опционально)",
-          "force_stop_state": "Состояние датчика принудительной остановки",
-          "log_level": "Уровень логирования"
+    "config": {
+        "step": {
+            "user": {
+                "title": "Motion Light",
+                "description": "Настройка управления освещением по движению",
+                "data": {
+                    "name": "Название",
+                    "main_sensors": "Главные триггеры",
+                    "extend_sensors": "Датчики продления (опционально)",
+                    "switch_entities": "Управляемые выключатели",
+                    "lux_sensor": "Датчик освещённости (опционально)",
+                    "force_stop_sensor": "Датчик принудительной остановки (опционально)",
+                    "force_stop_state": "Состояние датчика принудительной остановки",
+                    "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": {
-      "motion_light_status": {
-        "name": "Статус",
-        "state": {
-          "idle": "Ожидание",
-          "detecting": "Обнаружение",
-          "on": "Включено",
-          "delaying": "Задержка выключения",
-          "active": "Продлено",
-          "off": "Выключено",
-          "manual_on": "Ручное включение",
-          "manual_off_cooldown": "Пауза после ручного выкл.",
-          "force_stopped":  "Принудительная остановка",
-          "error": "Ошибка",
-          "disabled": "Отключено"
+    "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": "Приоритет ручного"
+            }
         },
-        "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": "Последнее движение"
+        "sensor": {
+            "motion_light_status": {
+                "name": "Статус",
+                "state": {
+                    "idle": "Ожидание",
+                    "detecting": "Обнаружение",
+                    "on": "Включено",
+                    "delaying": "Задержка выключения",
+                    "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 ручного выкл."
+            }
         }
-      }
-    },
-    "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

@@ -7,18 +7,25 @@ version_variables = [
 
 commit_message = "chore(release): v{version}"
 
-# ВАЖНО: не создаём релиз в Gitea (релиз будет в GitHub)
+# Отключаем создание релиза через API 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"
+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"]