diff --git a/.gitignore b/.gitignore
index fb9b5fb5..2690176a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -109,10 +109,8 @@ venv.bak/
test/videos
test/archive
-# local configs
-config/local.yaml
-config/local.yaml.bak
-config/inventories.yaml
+# testing configs
+test/config/*
app/package-lock.json
modules/node_modules/
diff --git a/app/src/api.js b/app/src/api.js
index b03346e4..c9f6182a 100644
--- a/app/src/api.js
+++ b/app/src/api.js
@@ -1,4 +1,12 @@
-import {API_URI, ARCHIVES_API, DEFAULT_LIMIT, OTP_API, secondsToDateTime, VIDEOS_API} from "./components/Common";
+import {
+ API_URI,
+ ARCHIVES_API,
+ DEFAULT_LIMIT,
+ emptyToNull,
+ OTP_API,
+ secondsToDateTime,
+ VIDEOS_API
+} from "./components/Common";
import {toast} from 'react-semantic-toasts';
function timeoutPromise(ms, promise) {
@@ -87,12 +95,13 @@ let apiPatch = async (url, body) => {
return await apiCall(url, 'PATCH', body)
};
-
export async function updateChannel(link, channel) {
+ channel = emptyToNull(channel);
return await apiPut(`${VIDEOS_API}/channels/${link}`, channel);
}
export async function createChannel(channel) {
+ channel = emptyToNull(channel);
return await apiPost(`${VIDEOS_API}/channels`, channel);
}
@@ -160,14 +169,13 @@ export async function getDirectories(search_str) {
return [];
}
-export async function getConfig() {
+export async function getSettings() {
let response = await apiGet(`${API_URI}/settings`);
- let data = await response.json();
- return data['config'];
+ return await response.json();
}
-export async function saveConfig(config) {
- return await apiPatch(`${API_URI}/settings`, config);
+export async function saveSettings(settings) {
+ return await apiPatch(`${API_URI}/settings`, settings);
}
export async function getDownloads() {
@@ -291,10 +299,12 @@ export async function getItems(inventoryId) {
}
export async function saveItem(inventoryId, item) {
+ item = emptyToNull(item);
return await apiPost(`${API_URI}/inventory/${inventoryId}/item`, item);
}
export async function updateItem(itemId, item) {
+ item = emptyToNull(item);
return await apiPut(`${API_URI}/inventory/item/${itemId}`, item);
}
@@ -438,25 +448,8 @@ export async function getVersion() {
}
export async function getHotspotStatus() {
- let response = await apiGet(`${API_URI}/hotspot`);
- if (response.status === 200) {
- let {status} = await response.json();
- return status;
- } else {
- let code = (await response.json())['code'];
- if (response.status === 400 && code === 34) {
- // Must not be running on a RPi. Don't warn the user.
- return null;
- } else {
- toast({
- type: 'error',
- title: "Can't get Hotspot status",
- description: 'Failed to get Hotspot status. Check client and server logs.',
- time: 5000,
- });
- }
- }
- return null;
+ let response = await getSettings();
+ return response['hotspot_status'];
}
export async function setHotspot(on) {
@@ -489,25 +482,8 @@ export async function setHotspot(on) {
}
export async function getThrottleStatus() {
- let response = await apiGet(`${API_URI}/throttle`);
- if (response.status === 200) {
- let {status} = await response.json();
- return status;
- } else {
- let code = (await response.json())['code'];
- if (response.status === 400 && code === 34) {
- // Must not be running on a RPi. Don't warn the user.
- return null;
- } else {
- toast({
- type: 'error',
- title: "Can't get throttle status",
- description: 'Failed to get CPU Throttle status. Check client and server logs.',
- time: 5000,
- });
- }
- }
- return null;
+ let response = await getSettings();
+ return response['throttle_status'];
}
export async function setThrottle(on) {
diff --git a/app/src/components/Admin.js b/app/src/components/Admin.js
index 8efbcc9a..a400b701 100644
--- a/app/src/components/Admin.js
+++ b/app/src/components/Admin.js
@@ -11,7 +11,7 @@ import {
Placeholder,
Table
} from "semantic-ui-react";
-import {getConfig, getDownloads, killDownload, postDownload, saveConfig} from "../api";
+import {getDownloads, getSettings, killDownload, postDownload, saveSettings} from "../api";
import TimezoneSelect from 'react-timezone-select';
import {
DisableDownloadsToggle,
@@ -33,42 +33,51 @@ class Settings extends React.Component {
this.state = {
disabled: false,
ready: false,
- validTimezone: true,
- timezone: '',
+
+ download_on_startup: null,
+ hotspot_on_startup: null,
+ hotspot_status: null,
+ throttle_on_startup: null,
+ throttle_status: null,
+ timezone: {timezone: null},
}
- this.mediaDirectory = React.createRef();
this.handleSubmit = this.handleSubmit.bind(this);
}
async componentDidMount() {
- let config = await getConfig();
+ const settings = await getSettings();
this.setState({
ready: true,
- disabled: config.wrol_mode,
- timezone: config.timezone || '',
+ disabled: settings.wrol_mode,
+ download_on_startup: settings.download_on_startup,
+ hotspot_on_startup: settings.hotspot_on_startup,
+ hotspot_status: settings.hotspot_status,
+ throttle_on_startup: settings.throttle_on_startup,
+ throttle_status: settings.throttle_status,
+ timezone: {value: settings.timezone, label: settings.timezone},
});
- this.mediaDirectory.current.value = config.media_directory;
}
async handleSubmit(e) {
e.preventDefault();
- let config = {
- media_directory: this.mediaDirectory.current.value,
+ let settings = {
+ download_on_startup: this.state.download_on_startup,
+ hotspot_on_startup: this.state.hotspot_on_startup,
+ throttle_on_startup: this.state.throttle_on_startup,
timezone: this.state.timezone.value,
- };
- this.setState({validTimezone: true});
- let response = await saveConfig(config);
- if (response.status !== 200) {
- let json = await response.json();
- if (json.api_error === 'Invalid timezone') {
- this.setState({validTimezone: false});
- }
}
+ console.log(settings);
+ await saveSettings(settings);
}
handleTimezoneChange = async (timezone) => {
- this.setState({timezone});
+ this.setState({timezone: timezone});
+ }
+
+ handleInputChange = async (e, name, checked) => {
+ e.preventDefault();
+ this.setState({[name]: checked});
}
render() {
@@ -76,6 +85,8 @@ class Settings extends React.Component {
return
}
+ let {disabled, download_on_startup, hotspot_on_startup, throttle_on_startup, timezone} = this.state;
+
return (
@@ -83,46 +94,52 @@ class Settings extends React.Component {
-
-
- The global settings for your server.
-
+
+
+ The settings for your WROLPi.
+
- When saved, these will be written to your local.yaml file. Storing these settings in your
- local configuration file (rather than the database) allows your WROLPi to be rebuilt and save your
- settings.
+ Any changes will be written to config/wrolpi.yaml.
-
+