From 1b4dea31333057af29bd8703caccdc004b6d202c Mon Sep 17 00:00:00 2001 From: Manu <3916435+m3nu@users.noreply.github.com> Date: Tue, 8 Sep 2020 11:16:29 +0800 Subject: [PATCH] Avoid formatting date and time twice. Fixes #624 (#625) --- src/vorta/network_status/darwin.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/vorta/network_status/darwin.py b/src/vorta/network_status/darwin.py index ee64735d..6d2e8501 100644 --- a/src/vorta/network_status/darwin.py +++ b/src/vorta/network_status/darwin.py @@ -43,14 +43,14 @@ class DarwinNetworkStatus(NetworkStatusMonitor): result = [] if wifis is not None: for wifi in wifis.values(): - raw_last_connected = wifi.get('LastConnected', None) - last_connected = None if not raw_last_connected \ - else format_date_time(raw_last_connected, WifiSettingModel.last_connected.formats) ssid = wifi.get('SSIDString', None) - if ssid is None: continue + last_connected = wifi.get('LastConnected', None) or wifi.get('LastAutoJoinAt', None) + if isinstance(last_connected, str): # TODO: Maybe not needed any more? + last_connected = format_date_time(last_connected, WifiSettingModel.last_connected.formats) + result.append(SystemWifiInfo(ssid=ssid, last_connected=last_connected)) return result @@ -71,7 +71,7 @@ def call_ipconfig_getpacket(bsd_device): try: return subprocess.check_output(cmd) except subprocess.CalledProcessError: - logger.warn("Command %s failed", shlex.join(cmd)) + logger.debug("Command %s failed", shlex.join(cmd)) return b'' @@ -80,4 +80,4 @@ def call_networksetup_listallhardwareports(): try: return subprocess.check_output(cmd) except subprocess.CalledProcessError: - logger.warn("Command %s failed", shlex.join(cmd)) + logger.debug("Command %s failed", shlex.join(cmd))