rt/wrolpi
1
0
Fork 0
mirror of https://github.com/lrnselfreliance/wrolpi.git synced 2026-10-26 19:01:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restoring JSON date conversion. Handling when psutil temperatures are None. Updating Toggle.onChange usage in Settings.

Browse source
This commit is contained in:
Roland 2022-10-15 19:27:20 -06:00
parent ddcc2c0674
commit c97af1060b
No known key found for this signature in database
GPG key ID: 9D6DBD3ACF11AB93
5 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/components/Common.js
View file

@ -566,7 +566,7 @@ export function HotspotToggle() {
label='WiFi Hotspot'
disabled={disabled}
checked={on === true}
onChange={(e, data) => setHotspot(data.checked)}
onChange={checked => setHotspot(checked)}
/>
{disabled && <HelpPopup content='Hotspot is not supported on this server'/>}
</div>);
@ -580,7 +580,7 @@ export function ThrottleToggle() {
label='CPU Power-save'
disabled={disabled}
checked={on === true}
onChange={(e, data) => setThrottle(data.checked)}
onChange={checked => setThrottle(checked)}
/>
{disabled && <HelpPopup content='CPU Power-save is not supported on this server'/>}
</div>);

6
app/src/components/admin/Settings.js
View file

@ -144,7 +144,7 @@ export class Settings extends React.Component {
label='Download on Startup'
disabled={disabled || download_on_startup === null}
checked={download_on_startup === true}
onChange={(checked) => this.handleInputChange(null, 'download_on_startup', checked)}
onChange={checked => this.handleInputChange(null, 'download_on_startup', checked)}
/>
</div>
@ -153,7 +153,7 @@ export class Settings extends React.Component {
label='WiFi Hotspot on Startup'
disabled={disabled || hotspot_on_startup === null}
checked={hotspot_on_startup === true}
onChange={(checked) => this.handleInputChange(null, 'hotspot_on_startup', checked)}
onChange={checked => this.handleInputChange(null, 'hotspot_on_startup', checked)}
/>
</div>
@ -162,7 +162,7 @@ export class Settings extends React.Component {
label='CPU Power-save on Startup'
disabled={disabled || throttle_on_startup === null}
checked={throttle_on_startup === true}
onChange={(checked) => this.handleInputChange(null, 'throttle_on_startup', checked)}
onChange={checked => this.handleInputChange(null, 'throttle_on_startup', checked)}
/>
</div>

6
wrolpi/admin.py
View file

@ -47,9 +47,9 @@ def hotspot_status() -> HotspotStatus:
def enable_hotspot():
"""Turn the wifi interface into a hotspot.
"""Turn the Wi-Fi interface into a hotspot.
If wifi is already running, replace that with a hotspot.
If Wi-Fi is already running, replace that with a hotspot.
"""
status = hotspot_status()
logger.warning(f'Hotspot status: {status}')
@ -76,7 +76,7 @@ def enable_hotspot():
def disable_hotspot():
"""Turn off the wifi interface."""
"""Turn off the Wi-Fi interface."""
cmd = (SUDO_BIN, NMCLI_BIN, 'radio', 'wifi', 'off')
try:
subprocess.check_call(cmd)

2
wrolpi/root_api.py
View file

@ -327,6 +327,8 @@ class CustomJSONEncoder(json.JSONEncoder):
return obj.__json__()
elif isinstance(obj, datetime):
return obj.timestamp()
elif isinstance(obj, date):
return datetime(obj.year, obj.month, obj.day).timestamp()
elif isinstance(obj, Decimal):
return str(obj)
elif isinstance(obj, Base):

7
wrolpi/status.py
View file

@ -117,9 +117,10 @@ def get_cpu_info_psutil() -> CPUInfo:
# Prefer "coretemp", fallback to the first temperature.
temp = psutil.sensors_temperatures()
name = 'coretemp' if 'coretemp' in temp else list(temp.keys())[0]
temperature = int(temp.get(name)[0].current)
high_temperature = int(temp.get(name)[0].high)
critical_temperature = int(temp.get(name)[0].critical)
# Temperatures may be None.
temperature = int(temp.get(name)[0].current or 0)
high_temperature = int(temp.get(name)[0].high or 0)
critical_temperature = int(temp.get(name)[0].critical or 0)
info = CPUInfo(
cores=psutil.cpu_count(logical=True),