frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Initial Write Config Support (#230)

Browse Source 
* Initial JSON Write

* Initial Write Config Support

* .
This commit is contained in:
b1rdhous3
2016-09-09 10:15:35 +02:00
committed by redPanther
parent 0e941795d5
commit 4649786f68
3 changed files with 67 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
assets/webconfig/js/content_generalconf.js
View File

@@ -25,23 +25,23 @@ $(hyperion).one("cmd-config-getschema", function(event) {
//removeAdvanced(parsedConfSchemaJSON, []); // not working atm
//console.log(JSON.stringify(parsedConfSchemaJSON));
schema = parsedConfSchemaJSON.properties;
schema_blackborderdetector = schema.blackborderdetector;
schema_color = schema.color;
schema_effects = schema.effects;
schema_forwarder = schema.forwarder;
schema_initialEffect = schema.initialEffect;
schema_kodiVideoChecker = schema.kodiVideoChecker;
schema_smoothing = schema.smoothing;
schema_logger = schema.logger;
schema_jsonServer = schema.jsonServer;
schema_protoServer = schema.protoServer;
schema_boblightServer = schema.boblightServer;
schema_udpListener = schema.udpListener;
schema_webConfig = schema.webConfig;
blackborderdetector = schema.blackborderdetector;
color = schema.color;
effects = schema.effects;
forwarder = schema.forwarder;
initialEffect = schema.initialEffect;
kodiVideoChecker = schema.kodiVideoChecker;
smoothing = schema.smoothing;
logger = schema.logger;
jsonServer = schema.jsonServer;
protoServer = schema.protoServer;
boblightServer = schema.boblightServer;
udpListener = schema.udpListener;
webConfig = schema.webConfig;
var element = document.getElementById('editor_holder');
//JSONEditor.defaults.options.theme = 'bootstrap3';
var general_conf_editor = new JSONEditor(element,{
theme: 'bootstrap3',
disable_collapse: 'true',
@@ -52,32 +52,42 @@ $(hyperion).one("cmd-config-getschema", function(event) {
schema: {
title:' ',
properties: {
schema_blackborderdetector,
schema_color,
schema_effects,
schema_forwarder,
schema_initialEffect,
schema_kodiVideoChecker,
schema_smoothing,
schema_logger,
schema_jsonServer,
schema_protoServer,
schema_boblightServer,
schema_udpListener,
schema_webConfig
/*blackborderdetector,
color,
effects,
forwarder,
initialEffect,
kodiVideoChecker,
smoothing,*/
logger//,
/*jsonServer,
protoServer,
boblightServer,
udpListener,
webConfig*/
}
}
});
});
//Called everytime a Input Field is changed = No need for save button
general_conf_editor.on('change',function() {
console.log(JSON.stringify(general_conf_editor.getValue()));
requestWriteConfig(general_conf_editor.getValue());
});
//Alternative Function with submit button to get Values
document.getElementById('submit').addEventListener('click',function() {
console.log(general_conf_editor.getValue());
});
$(hyperion).on("cmd-config-setconfig",function(event){
parsedServerInfoJSON = event.response;
console.log(parsedServerInfoJSON);
});
});
$(document).ready( function() {
requestServerConfigSchema();
document.getElementById('submit').addEventListener('click',function() {
// Get the value from the editor
//console.log(general_conf_editor.getValue());
});
// $("[type='checkbox']").bootstrapSwitch();
//$("[type='checkbox']").bootstrapSwitch();
});

12
assets/webconfig/js/hyperion.js
View File

@@ -38,7 +38,7 @@ var cronId = 0;
var ledStreamActive=false;
var watchdog = 0;
//
//
function cron()
{
if ( watchdog > 3)
@@ -67,7 +67,7 @@ function initWebSocket()
websocket.onopen = function (event) {
$(hyperion).trigger({type:"open"});
$(hyperion).on("cmd-serverinfo", function(event) {
watchdog = 0;
});
@@ -183,7 +183,7 @@ function requestSetComponentState(comp, state){
console.log(comp+' state: '+state_str);
}
function requestSetSource( prio )
function requestSetSource(prio)
{
if ( prio == "auto" )
websocket.send('{"command":"sourceselect", "tan":'+wsTan+', "auto" : true}');
@@ -191,3 +191,9 @@ function requestSetSource( prio )
websocket.send('{"command":"sourceselect", "tan":'+wsTan+', "priority" : '+prio+'}');
}
function requestWriteConfig(config, create, overwrite)
{
var create = (typeof create !== 'undefined') ? create : false;
var overwrite = (typeof overwrite !== 'undefined') ? overwrite : false;
websocket.send('{"command":"config","subcommand":"setconfig", "tan":'+wsTan+', "config":'+JSON.stringify(config)+',"create":'+create+', "overwrite":'+overwrite+'}');
}