Skip to content

Check for nmcli in network screen #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gregkopp wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Check for nmcli in network screen #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 25 additions & 9 deletions rcp/components/setup/network_screen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@ class NetworkScreen(Screen):
def __init__(self, **kv):
super().__init__(**kv)
self.ids['grid_layout'].bind(minimum_height=self.ids['grid_layout'].setter('height'))
self.wifi_enabled = nmcli.radio().wifi
try:
self.wifi_enabled = nmcli.radio().wifi
except FileNotFoundError:
log.warning("nmcli not found, network features will be disabled.")
self.wifi_enabled = False

Clock.schedule_once(lambda dt: asyncio.ensure_future(self.refresh()))
self.status_update_task = Clock.schedule_interval(lambda dt: asyncio.ensure_future(self.status_update()), timeout=1)
Expand All @@ -53,6 +57,8 @@ def log(self, message: str):
self.status_text += f"{message}\n"

async def status_update(self):
if not self.wifi_enabled:
return
if self.device != "":
data = await asyncio.to_thread(nmcli.device.show, self.device)
new_state = data.get("GENERAL.STATE")
Expand All @@ -61,6 +67,9 @@ async def status_update(self):
await self.refresh()

async def refresh(self):
if not self.wifi_enabled:
self.log("nmcli not available, network features disabled")
return
log.debug("Refresh properties invoked")

# Scan Devices
Expand Down Expand Up @@ -103,6 +112,9 @@ async def refresh(self):
self.lock = False

async def connect(self):
if not self.wifi_enabled:
self.log("nmcli not available, network features disabled")
return
self.log("Request Wifi Connection")

connections_dict = await asyncio.to_thread(nmcli.connection)
Expand Down Expand Up @@ -134,14 +146,18 @@ async def connect(self):
self.log(f"Unable to connect: {e.__str__()}")

def on_wifi_enabled(self, instance, value):
if self.wifi_enabled:
self.log("Enable Wifi Connections")
nmcli.radio.wifi_on()
self.log("Run Scan to find the available access points")
else:
self.log("Disable Wifi Connections")
nmcli.radio.wifi_off()

try:
if self.wifi_enabled:
self.log("Enable Wifi Connections")
nmcli.radio.wifi_on()
self.log("Run Scan to find the available access points")
else:
self.log("Disable Wifi Connections")
nmcli.radio.wifi_off()
except FileNotFoundError:
log.warning("nmcli not found, network features will be disabled.")
self.wifi_enabled = False

def apply(self):
self.lock = True
Clock.schedule_once(lambda dt: asyncio.ensure_future(self.connect()))
Expand Down