Skip to content

Commit

Permalink
rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
tomaae committed Aug 31, 2023
2 parents e1e9f61 + 4d957ae commit c872823
Show file tree
Hide file tree
Showing 10 changed files with 142 additions and 19 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

![GitHub commits since latest release](https://img.shields.io/github/commits-since/tomaae/homeassistant-mikrotik_router/latest?style=plastic)
![GitHub commit activity](https://img.shields.io/github/commit-activity/m/tomaae/homeassistant-mikrotik_router?style=plastic)
![GitHub Workflow Status](https://img.shields.io/github/workflow/status/tomaae/homeassistant-mikrotik_router/CI?label=CI&style=plastic)
![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/tomaae/homeassistant-mikrotik_router/ci.yml?style=plastic)

[![Help localize](https://img.shields.io/badge/lokalise-join-green?style=plastic&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyhpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ1IDc5LjE2MzQ5OSwgMjAxOC8wOC8xMy0xNjo0MDoyMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6REVCNzgzOEY4NDYxMTFFQUIyMEY4Njc0NzVDOUZFMkMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6REVCNzgzOEU4NDYxMTFFQUIyMEY4Njc0NzVDOUZFMkMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDozN0ZDRUY4Rjc0M0UxMUU3QUQ2MDg4M0Q0MkE0NjNCNSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDozN0ZDRUY5MDc0M0UxMUU3QUQ2MDg4M0Q0MkE0NjNCNSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pjs1zyIAAABVSURBVHjaYvz//z8DOYCJgUxAtkYW9+mXyXIrI7l+ZGHc0k5nGxkupdHZxve1yQR1CjbPZURXh9dGoGJZIPUI2QC4JEgjIfyuJuk/uhgj3dMqQIABAPEGTZ/+h0kEAAAAAElFTkSuQmCC)](https://app.lokalise.com/public/581188395e9778a6060128.17699416/)

Expand Down
8 changes: 5 additions & 3 deletions custom_components/mikrotik_router/coordinator.py
Original file line number Diff line number Diff line change
Expand Up @@ -442,9 +442,9 @@ def set_value(self, path, param, value, mod_param, mod_value):
# ---------------------------
# execute
# ---------------------------
def execute(self, path, command, param, value):
def execute(self, path, command, param, value, attributes=None):
"""Change value using Mikrotik API"""
return self.api.execute(path, command, param, value)
return self.api.execute(path, command, param, value, attributes)

# ---------------------------
# run_script
Expand Down Expand Up @@ -1487,7 +1487,9 @@ def get_firmware_update(self) -> None:
):
return

self.execute("/system/package/update", "check-for-updates", None, None)
self.execute(
"/system/package/update", "check-for-updates", None, None, {"duration": 10}
)
self.ds["fw-update"] = parse_api(
data=self.ds["fw-update"],
source=self.api.query("/system/package/update"),
Expand Down
5 changes: 4 additions & 1 deletion custom_components/mikrotik_router/mikrotikapi.py
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ def set_value(self, path, param, value, mod_param, mod_value) -> bool:
# ---------------------------
# execute
# ---------------------------
def execute(self, path, command, param, value) -> bool:
def execute(self, path, command, param, value, attributes=None) -> bool:
"""Execute a command"""
entry_found = None
params = {}
Expand Down Expand Up @@ -292,6 +292,9 @@ def execute(self, path, command, param, value) -> bool:

params = {".id": entry_found}

if attributes:
params.update(attributes)

self.lock.acquire()
try:
tuple(response(command, **params))
Expand Down
6 changes: 3 additions & 3 deletions custom_components/mikrotik_router/sensor_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ class MikrotikSensorEntityDescription(SensorEntityDescription):
icon="mdi:lan",
native_unit_of_measurement=None,
device_class=None,
state_class=None,
state_class=SensorStateClass.MEASUREMENT,
entity_category=None,
ha_group="System",
data_path="resource",
Expand All @@ -346,7 +346,7 @@ class MikrotikSensorEntityDescription(SensorEntityDescription):
icon="mdi:wifi",
native_unit_of_measurement=None,
device_class=None,
state_class=None,
state_class=SensorStateClass.MEASUREMENT,
entity_category=None,
ha_group="System",
data_path="resource",
Expand All @@ -361,7 +361,7 @@ class MikrotikSensorEntityDescription(SensorEntityDescription):
icon="mdi:key-wireless",
native_unit_of_measurement=None,
device_class=None,
state_class=None,
state_class=SensorStateClass.MEASUREMENT,
entity_category=None,
ha_group="System",
data_path="resource",
Expand Down
2 changes: 1 addition & 1 deletion custom_components/mikrotik_router/translations/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"sensor_mangle": "Mangle spínače",
"sensor_ppp": "Uživatelé PPP",
"sensor_filter": "Přepínače filtrů",
"sensor_client_captive": "Captive portal data"
"sensor_client_captive": "Captive portál data"
},
"title": "Nastavení Mikrotik Router (2\/2)",
"description": "Povolit senzory a přepínače"
Expand Down
14 changes: 7 additions & 7 deletions custom_components/mikrotik_router/translations/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"error": {
"name_exists": "Name existiert bereits",
"cannot_connect": "Verbindung zu Mikrotik nicht möglich.",
"ssl_handshake_failure": "SSL Vereinbarung-Fehler",
"ssl_handshake_failure": "SSL Handshake Fehler",
"connection_timeout": "Mikrotik-Verbindungstimeout.",
"wrong_login": "Ungültiger Benutzername oder Passwort."
}
Expand All @@ -38,18 +38,18 @@
"sensor_select": {
"data": {
"track_network_hosts": "Verfolgen Sie Netzwerkgeräte",
"sensor_port_tracker": "Hafentracker-Sensoren",
"sensor_port_traffic": "Hafen-Verkehrssensoren",
"sensor_client_traffic": "Kunden-Verkehrssensoren",
"sensor_port_tracker": "Port-Statussensoren",
"sensor_port_traffic": "Port-Durchsatz Sensoren",
"sensor_client_traffic": "Client-Durchsatz Sensoren",
"sensor_simple_queues": "Einfache Endschalter",
"sensor_nat": "NAT-Schalter",
"sensor_scripts": "Skript-Schalter",
"sensor_environment": "Umwelt variable Sensoren",
"sensor_environment": "umgebungsvariablen-Sensoren",
"sensor_kidcontrol": "Kinderkontrolle",
"sensor_mangle": "Mangle-Schalter",
"sensor_ppp": "PPP-Nutzer",
"sensor_filter": "Schalter filtern",
"sensor_client_captive": "Captive portal data"
"sensor_filter": "Schalter für Filterregeln",
"sensor_client_captive": "Captive-Portal Daten"
},
"title": "Mikrotik-Router-Optionen (2\/2)",
"description": "Sensoren und Schalter aktivieren"
Expand Down
59 changes: 59 additions & 0 deletions custom_components/mikrotik_router/translations/no.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"config": {
"step": {
"user": {
"title": "Sett opp Mikrotik router",
"description": "Sett opp Mikrotik Router integrasjon",
"data": {
"name": "Navn på integreringen",
"host": "Adresse",
"port": "Port",
"username": "Brukernavn",
"password": "Passord",
"ssl": "Bruk SSL"
}
}
},
"error": {
"name_exists": "Navnet eksisterer allerede",
"cannot_connect": "Kunne ikke koble til Mikrotik",
"ssl_handshake_failure": "SSH håndtrykkfeil",
"connection_timeout": "Mikrotik tilkoblingen fikk tidsavbrudd",
"wrong_login": "Feil brukernavn og\/eller passord"
}
},
"options": {
"step": {
"basic_options": {
"data": {
"scan_interval": "Søke interval (krever HA omstart)",
"track_iface_clients": "Vis klient MAC og IP på grensesnittet",
"unit_of_measurement": "Måleenhet",
"track_network_hosts_timeout": "Spor nettverks enhet tidsavbrudd (sekunder)",
"zone": "Sone for enhetssporer"
},
"title": "Mikrotik Router alternativer",
"description": "Konfigurer integrasjon"
},
"sensor_select": {
"data": {
"track_network_hosts": "Spor nettverksenheter",
"sensor_port_tracker": "Port sporings sensorer",
"sensor_port_traffic": "Port trafikk sensorer",
"sensor_client_traffic": "Klient trafikk sensorer",
"sensor_simple_queues": "Enklel kø brytere",
"sensor_nat": "NAT Brytere",
"sensor_scripts": "Script brytere",
"sensor_environment": "Miljøvariabel sensorer",
"sensor_kidcontrol": "Barnekontroll",
"sensor_mangle": "Mangle brytere",
"sensor_ppp": "PPP Brukere",
"sensor_filter": "Filter brytere",
"sensor_client_captive": "Captive portal data"
},
"title": "Mikrotik Router options (2\/2)",
"description": "Skru på sensorer og brytere"
}
}
}
}
2 changes: 1 addition & 1 deletion custom_components/mikrotik_router/translations/pt_BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"sensor_mangle": "Interruptores Mangle",
"sensor_ppp": "Usuários de PPP",
"sensor_filter": "Interruptores de filtro",
"sensor_client_captive": "Captive portal data"
"sensor_client_captive": "sensores de cliente cativo"
},
"title": "Opções de roteador Mikrotik (2\/2)",
"description": "Ativar sensores e interruptores"
Expand Down
4 changes: 2 additions & 2 deletions custom_components/mikrotik_router/translations/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"description": "Настройка Home Assistant для интеграции с Mikrotik.",
"data": {
"name": "Название интеграции",
"host": "Адрес маршрутизатора",
"host": "Адрес хоста",
"port": "Порт",
"username": "Имя пользователя",
"password": "Пароль",
Expand Down Expand Up @@ -49,7 +49,7 @@
"sensor_mangle": "Переключатели Mangle",
"sensor_ppp": "PPP-пользователи",
"sensor_filter": "Переключатели фильтров",
"sensor_client_captive": "Captive portal data"
"sensor_client_captive": "Данные портала авторизации"
},
"title": "Параметры Mikrotik Router (2\/2)",
"description": "Включить датчики и переключатели"
Expand Down
59 changes: 59 additions & 0 deletions custom_components/mikrotik_router/translations/uk.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"config": {
"step": {
"user": {
"title": "Налаштувати Mikrotik Router",
"description": "Налаштувати Mikrotik Router інтеграцію",
"data": {
"name": "Назва інтеграції",
"host": "Хост",
"port": "Порт",
"username": "Користувач",
"password": "Пароль",
"ssl": "Використовувати SSL"
}
}
},
"error": {
"name_exists": "Назва вже існує.",
"cannot_connect": "Cannot connect to Mikrotik.",
"ssl_handshake_failure": "SSL handshake failure",
"connection_timeout": "Mikrotik connection timeout.",
"wrong_login": "Invalid user name or password."
}
},
"options": {
"step": {
"basic_options": {
"data": {
"scan_interval": "Scan interval (requires HA restart)",
"track_iface_clients": "Show client MAC and IP on interfaces",
"unit_of_measurement": "Unit of measurement",
"track_network_hosts_timeout": "Track network devices timeout (seconds)",
"zone": "Zone for device tracker"
},
"title": "Mikrotik Router options (1\/2)",
"description": "Налаштувати інтеграцію"
},
"sensor_select": {
"data": {
"track_network_hosts": "Track network devices",
"sensor_port_tracker": "Port tracker sensors",
"sensor_port_traffic": "Port traffic sensors",
"sensor_client_traffic": "Client traffic sensors",
"sensor_simple_queues": "Simple queues switches",
"sensor_nat": "NAT switches",
"sensor_scripts": "Script switches",
"sensor_environment": "Environment variable sensors",
"sensor_kidcontrol": "Дитячий контроль",
"sensor_mangle": "Mangle switches",
"sensor_ppp": "Користувачі PPP",
"sensor_filter": "Filter switches",
"sensor_client_captive": "Captive portal data"
},
"title": "Mikrotik Router options (2\/2)",
"description": "Enable sensors and switches"
}
}
}
}

0 comments on commit c872823

Please sign in to comment.