From 4309487562fbf1bc547942d69684270e3adebdcb Mon Sep 17 00:00:00 2001
From: "s.galanskiy" <s.galanskiy@gossys.dev>
Date: Thu, 19 Jun 2025 11:13:06 +0500
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81=D0=B0=20?=
 =?UTF-8?q?=D1=82=D0=B5=D0=BA=D1=83=D1=89=D0=B5=D0=B3=D0=BE=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BA?=
 =?UTF-8?q?=20Wi-Fi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SRV/services/connect_service.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/SRV/services/connect_service.py b/SRV/services/connect_service.py
index e8d02e9..181c64b 100644
--- a/SRV/services/connect_service.py
+++ b/SRV/services/connect_service.py
@@ -21,7 +21,7 @@ class WifiConnectionService:
                         logger.info(f"Используется Wi-Fi-интерфейс: {iface}")
                         return iface
                 logger.warning("Wi-Fi-интерфейс не найден или не подключён")
-                return "wlan0"  # Значение по умолчанию
+                return "wlan0"
             logger.error("Wi-Fi радио отключено")
             return ""
         except Exception as e:
@@ -33,11 +33,9 @@ class WifiConnectionService:
         try:
             if not self.interface:
                 return False, "Wi-Fi-интерфейс не доступен"
-            # Проверяем, доступна ли сеть
             result = subprocess.run(["nmcli", "-f", "SSID", "device", "wifi", "list"], capture_output=True, text=True)
             if ssid not in result.stdout:
                 return False, f"Сеть с SSID {ssid} не найдена"
-            # Подключаемся к сети
             cmd = ["nmcli", "device", "wifi", "connect", ssid, "password", password]
             subprocess.run(cmd, capture_output=True, text=True, check=True)
             logger.info(f"Успешное подключение к сети {ssid}")
@@ -54,18 +52,15 @@ class WifiConnectionService:
         try:
             if not self.interface:
                 return False, "Wi-Fi-интерфейс не доступен"
-            # Проверяем активные соединения
             result = subprocess.run(["nmcli", "connection", "show", "--active"], capture_output=True, text=True)
             active_connections = result.stdout.strip().splitlines()
             if not active_connections:
                 logger.info(f"Нет активных подключений для SSID {ssid}")
                 return True, f"Нет активного подключения для SSID {ssid}"
-            # Ищем соединение с указанным SSID
             for conn in active_connections:
                 conn_details = conn.split()
                 if len(conn_details) > 1:
                     conn_name = conn_details[0]
-                    # Получаем SSID для этого соединения
                     conn_info = subprocess.run(["nmcli", "connection", "show", conn_name], capture_output=True, text=True).stdout
                     if "802-11-wireless.ssid:" in conn_info and ssid in conn_info:
                         subprocess.run(["nmcli", "connection", "down", conn_name], capture_output=True, text=True, check=True)
@@ -87,7 +82,7 @@ class WifiConnectionService:
                 return False, "Wi-Fi-интерфейс не доступен"
             result = subprocess.run(["nmcli", "connection", "show", "--active"], capture_output=True, text=True)
             if result.stdout.strip():
-                ssid = result.stdout.splitlines()[0].split()[0]
+                ssid = result.stdout.splitlines()[1].split()[0]
                 logger.info(f"Текущая сеть: {ssid}")
                 return True, ssid
             return False, "Не подключено к Wi-Fi"