mirror
/
vorta
mirror of https://github.com/borgbase/vorta
1
0
Fork 0
Code Issues Releases Wiki Activity

Avoid formatting date and time twice. Fixes #624 (#625)

This commit is contained in:
Manu 2020-09-08 11:16:29 +08:00 committed by GitHub
parent 598f57ff81
commit 1b4dea3133
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/vorta/network_status/darwin.py
View File

@ -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))