From 9e281b234736cd51e5ef3ebfa5a4068914b7b6a4 Mon Sep 17 00:00:00 2001 From: LordGrey <48840279+Lord-Grey@users.noreply.github.com> Date: Wed, 17 Feb 2021 12:29:53 +0100 Subject: [PATCH] Fix #1186 & UI last instance error (#1188) * Handle Arrays & Objects differently * Fix UI error, if "last instance used" does not longer exist --- assets/webconfig/js/ui_utils.js | 1598 +++++++++++++-------------- libsrc/hyperion/SettingsManager.cpp | 23 +- 2 files changed, 762 insertions(+), 859 deletions(-) diff --git a/assets/webconfig/js/ui_utils.js b/assets/webconfig/js/ui_utils.js index 62d8a6b4..3f9ea3ef 100644 --- a/assets/webconfig/js/ui_utils.js +++ b/assets/webconfig/js/ui_utils.js @@ -1,677 +1,591 @@ var prevTag; -function removeOverlay() -{ - $("#loading_overlay").removeClass("overlay"); +function removeOverlay() { + $("#loading_overlay").removeClass("overlay"); } -function reload() -{ - location.reload(); +function reload() { + location.reload(); } -function storageComp() -{ - if (typeof(Storage) !== "undefined") - return true; - return false; +function storageComp() { + if (typeof (Storage) !== "undefined") + return true; + return false; } -function getStorage(item, session) -{ - if(storageComp()) - { - if(session === true) - return sessionStorage.getItem(item); - else - return localStorage.getItem(item); - } - return null; +function getStorage(item, session) { + if (storageComp()) { + if (session === true) + return sessionStorage.getItem(item); + else + return localStorage.getItem(item); + } + return null; } -function setStorage(item, value, session) -{ - if(storageComp()) - { - if(session === true) - sessionStorage.setItem(item, value); - else - localStorage.setItem(item, value); - } +function setStorage(item, value, session) { + if (storageComp()) { + if (session === true) + sessionStorage.setItem(item, value); + else + localStorage.setItem(item, value); + } } -function removeStorage(item, session) -{ - if(storageComp()) - { - if(session === true) - sessionStorage.removeItem(item); - else - localStorage.removeItem(item); - } +function removeStorage(item, session) { + if (storageComp()) { + if (session === true) + sessionStorage.removeItem(item); + else + localStorage.removeItem(item); + } } -function debugMessage(msg) -{ - if (window.debugMessagesActive) - { - console.log(msg); - } +function debugMessage(msg) { + if (window.debugMessagesActive) { + console.log(msg); + } } -function updateSessions() -{ - var sess = window.serverInfo.sessions; - if (sess && sess.length) - { - window.wSess = []; - for(var i = 0; i 1) - $('#btn_instanceswitch').toggle(true); - else - $('#btn_instanceswitch').toggle(false); - } + if (window.wSess.length > 1) + $('#btn_instanceswitch').toggle(true); + else + $('#btn_instanceswitch').toggle(false); + } } -function validateDuration(d) -{ - if(typeof d === "undefined" || d < 0) - return 0; - else - return d *= 1000; +function validateDuration(d) { + if (typeof d === "undefined" || d < 0) + return 0; + else + return d *= 1000; } -function getHashtag() -{ - if(getStorage('lasthashtag', true) != null) - return getStorage('lasthashtag', true); - else - { - var tag = document.URL; - tag = tag.substr(tag.indexOf("#") + 1); - if(tag == "" || typeof tag === "undefined" || tag.startsWith("http")) - tag = "dashboard" - return tag; - } +function getHashtag() { + if (getStorage('lasthashtag', true) != null) + return getStorage('lasthashtag', true); + else { + var tag = document.URL; + tag = tag.substr(tag.indexOf("#") + 1); + if (tag == "" || typeof tag === "undefined" || tag.startsWith("http")) + tag = "dashboard" + return tag; + } } -function loadContent(event, forceRefresh) -{ - var tag; +function loadContent(event, forceRefresh) { + var tag; - var lastSelectedInstance = getStorage('lastSelectedInstance', false); + var lastSelectedInstance = getStorage('lastSelectedInstance', false); - if (lastSelectedInstance && (lastSelectedInstance != window.currentHyperionInstance)) - if (typeof(window.serverInfo.instance[lastSelectedInstance].running) !== 'undefined' && window.serverInfo.instance[lastSelectedInstance].running) - instanceSwitch(lastSelectedInstance); - else - removeStorage('lastSelectedInstance', false); + if (lastSelectedInstance && (lastSelectedInstance != window.currentHyperionInstance)) { + if (window.serverInfo.instance[lastSelectedInstance] && window.serverInfo.instance[lastSelectedInstance].running) { + instanceSwitch(lastSelectedInstance); + } else { + removeStorage('lastSelectedInstance', false); + } + } - if(typeof event != "undefined") - { - tag = event.currentTarget.hash; - tag = tag.substr(tag.indexOf("#") + 1); - setStorage('lasthashtag', tag, true); - } - else - tag = getHashtag(); + if (typeof event != "undefined") { + tag = event.currentTarget.hash; + tag = tag.substr(tag.indexOf("#") + 1); + setStorage('lasthashtag', tag, true); + } + else + tag = getHashtag(); - if(forceRefresh || prevTag != tag) - { - prevTag = tag; - $("#page-content").off(); - $("#page-content").load("/content/"+tag+".html", function(response,status,xhr){ - if(status == "error") - { - $("#page-content").html('

'+$.i18n('info_404')+'

'); - removeOverlay(); - } - updateUiOnInstance(window.currentHyperionInstance); - }); - } + if (forceRefresh || prevTag != tag) { + prevTag = tag; + $("#page-content").off(); + $("#page-content").load("/content/" + tag + ".html", function (response, status, xhr) { + if (status == "error") { + $("#page-content").html('

' + $.i18n('info_404') + '

'); + removeOverlay(); + } + updateUiOnInstance(window.currentHyperionInstance); + }); + } } -function getInstanceNameByIndex(index) -{ - var instData = window.serverInfo.instance - for(var key in instData) - { - if(instData[key].instance == index) - return instData[key].friendly_name; - } - return "unknown" +function getInstanceNameByIndex(index) { + var instData = window.serverInfo.instance + for (var key in instData) { + if (instData[key].instance == index) + return instData[key].friendly_name; + } + return "unknown" } -function updateHyperionInstanceListing() -{ - var data = window.serverInfo.instance.filter(entry => entry.running); - $('#hyp_inst_listing').html(""); - for(var key in data) - { - var currInstMarker = (data[key].instance == window.currentHyperionInstance) ? "component-on" : ""; +function updateHyperionInstanceListing() { + var data = window.serverInfo.instance.filter(entry => entry.running); + $('#hyp_inst_listing').html(""); + for (var key in data) { + var currInstMarker = (data[key].instance == window.currentHyperionInstance) ? "component-on" : ""; - var html = '
  • \ + var html = '
  • \ \
    \ - \ - '+data[key].friendly_name+' \ + \ + '+ data[key].friendly_name + ' \
    \     \
    • ' - if(data.length-1 > key) - html += '
  • ' + if (data.length - 1 > key) + html += '
  • ' - $('#hyp_inst_listing').append(html); + $('#hyp_inst_listing').append(html); - $('#hyperioninstance_'+data[key].instance).off().on("click",function(e){ - var inst = e.currentTarget.id.split("_")[1] - instanceSwitch(inst) - }); - } + $('#hyperioninstance_' + data[key].instance).off().on("click", function (e) { + var inst = e.currentTarget.id.split("_")[1] + instanceSwitch(inst) + }); + } } -function initLanguageSelection() -{ - // Initialise language selection list with languages supported - for (var i = 0; i < availLang.length; i++) - { - $("#language-select").append(''); - } +function initLanguageSelection() { + // Initialise language selection list with languages supported + for (var i = 0; i < availLang.length; i++) { + $("#language-select").append(''); + } - var langLocale = storedLang; + var langLocale = storedLang; - // If no language has been set, resolve browser locale - if ( langLocale === 'auto' ) - { - langLocale = $.i18n().locale.substring(0,2); - } + // If no language has been set, resolve browser locale + if (langLocale === 'auto') { + langLocale = $.i18n().locale.substring(0, 2); + } - // Resolve text for language code - var langText = 'Please Select'; + // Resolve text for language code + var langText = 'Please Select'; - //Test, if language is supported by hyperion - var langIdx = availLang.indexOf(langLocale); - if ( langIdx > -1 ) - { - langText = availLangText[langIdx]; - } - else - { - // If language is not supported by hyperion, try fallback language - langLocale = $.i18n().options.fallbackLocale.substring(0,2); - langIdx = availLang.indexOf(langLocale); - if ( langIdx > -1 ) - { - langText = availLangText[langIdx]; - } - } - //console.log("langLocale: ", langLocale, "langText: ", langText); - - $('#language-select').prop('title', langText); - $("#language-select").val(langIdx); - $("#language-select").selectpicker("refresh"); -} - -function updateUiOnInstance(inst) -{ - if(inst != 0) - { - var currentURL = $(location).attr("href"); - if(currentURL.indexOf('#conf_network') != -1 || currentURL.indexOf('#update') != -1 || currentURL.indexOf('#conf_webconfig') != -1 || currentURL.indexOf('#conf_grabber') != -1 || currentURL.indexOf('#conf_logging') != -1) - $("#hyperion_global_setting_notify").fadeIn("fast"); - else - $("#hyperion_global_setting_notify").attr("style", "display:none"); - - $("#dashboard_active_instance_friendly_name").html($.i18n('dashboard_active_instance') + ': ' + window.serverInfo.instance[inst].friendly_name); - $("#dashboard_active_instance").removeAttr("style"); - } - else - { - $("#hyperion_global_setting_notify").fadeOut("fast"); - $("#dashboard_active_instance").attr("style", "display:none"); - } -} - -function instanceSwitch(inst) -{ - requestInstanceSwitch(inst) - window.currentHyperionInstance = inst; - window.currentHyperionInstanceName = getInstanceNameByIndex(inst); - setStorage('lastSelectedInstance', inst, false) - updateHyperionInstanceListing() -} - -function loadContentTo(containerId, fileName) -{ - $(containerId).load("/content/"+fileName+".html"); -} - -function toggleClass(obj,class1,class2) -{ - if ( $(obj).hasClass(class1)) - { - $(obj).removeClass(class1); - $(obj).addClass(class2); - } - else - { - $(obj).removeClass(class2); - $(obj).addClass(class1); - } -} - - -function setClassByBool(obj,enable,class1,class2) -{ - if (enable) - { - $(obj).removeClass(class1); - $(obj).addClass(class2); - } - else - { - $(obj).removeClass(class2); - $(obj).addClass(class1); - } -} - -function showInfoDialog(type,header,message) -{ - if (type=="success") - { - $('#id_body').html(''); - if(header == "") - $('#id_body').append('

    '+$.i18n('infoDialog_general_success_title')+'

    '); - $('#id_footer').html(''); - } - else if (type=="warning") - { - $('#id_body').html(''); - if(header == "") - $('#id_body').append('

    '+$.i18n('infoDialog_general_warning_title')+'

    '); - $('#id_footer').html(''); - } - else if (type=="error") - { - $('#id_body').html(''); - if(header == "") - $('#id_body').append('

    '+$.i18n('infoDialog_general_error_title')+'

    '); - $('#id_footer').html(''); - } - else if (type == "select") - { - $('#id_body').html('Redefine ambient light!'); - $('#id_footer').html(''); - $('#id_footer').append(''); - } - else if (type == "iswitch") - { - $('#id_body').html('Redefine ambient light!'); - $('#id_footer').html(''); - $('#id_footer').append(''); - } - else if (type == "uilock") - { - $('#id_body').html('Redefine ambient light!'); - $('#id_footer').html(''+$.i18n('InfoDialog_nowrite_foottext')+''); - } - else if (type == "import") - { - $('#id_body').html(''); - $('#id_footer').html(''); - $('#id_footer').append(''); - } - else if (type == "delInst") - { - $('#id_body').html(''); - $('#id_footer').html(''); - $('#id_footer').append(''); - } - else if (type == "renInst") - { - $('#id_body_rename').html('
    '); - $('#id_body_rename').append('

    '+header+'

    '); - $('#id_body_rename').append(''); - $('#id_footer_rename').html(''); - $('#id_footer_rename').append(''); - } - else if (type == "changePassword") - { - $('#id_body_rename').html('
    '); - $('#id_body_rename').append('

    '+header+'

    '); - $('#id_body_rename').append('
    '); - $('#id_body_rename').append(''); - $('#id_footer_rename').html(''); - $('#id_footer_rename').append(''); - } - else if (type == "checklist") - { - $('#id_body').html('Redefine ambient light!'); - $('#id_body').append('

    '+$.i18n('infoDialog_checklist_title')+'

    '); - $('#id_body').append(header); - $('#id_footer').html(''); - } - else if (type == "newToken") - { - $('#id_body').html('Redefine ambient light!'); - $('#id_footer').html(''); - } - else if (type == "grantToken") - { - $('#id_body').html('Redefine ambient light!'); - $('#id_footer').html(''); - $('#id_footer').append(''); - } - - if(type != "renInst") - { - $('#id_body').append('

    '+header+'

    '); - $('#id_body').append(message); - } - - if(type == "select" || type == "iswitch") - $('#id_body').append(''); - - - $(type == "renInst" || type == "changePassword" ? "#modal_dialog_rename" : "#modal_dialog").modal({ - backdrop : "static", - keyboard: false, - show: true - }); - - $(document).on('click', '[data-dismiss-modal]', function () { - var target = $(this).attr('data-dismiss-modal'); - $.find(target).modal.hide(); - }); -} - -function createHintH(type, text, container) -{ - type = String(type); - if(type == "intro") - tclass = "introd"; - - $('#'+container).prepend('

    '+text+'

    '); -} - -function createHint(type, text, container, buttonid, buttontxt) -{ - var fe, tclass; - - if(type == "intro") - { - fe = ''; - tclass = "intro-hint"; - } - else if(type == "info") - { - fe = '
    Information
    '; - tclass = "info-hint"; - } - else if(type == "wizard") - { - fe = '
    Information
    '; - tclass = "wizard-hint"; - } - else if(type == "warning") - { - fe = '
    Information
    '; - tclass = "warning-hint"; - } - - if(buttonid) - buttonid = '

    '; - else - buttonid = ""; - - if(type == "intro") - $('#'+container).prepend('

    '+$.i18n("conf_helptable_expl")+'

    '+text+'
    '); - else if(type == "wizard") - $('#'+container).prepend('

    '+$.i18n("wiz_wizavail")+'

    '+$.i18n('wiz_guideyou',text)+buttonid+'
    '); - else - { - createTable('','htb',container, true, tclass); - $('#'+container+' .htb').append(createTableRow([fe ,text],false,true)); - } -} - -function createEffHint(title, text) -{ - return '

    '+title+'

    '+text+'
    '; -} - -function valValue(id,value,min,max) -{ - if(typeof max === 'undefined' || max == "") - max = 999999; - - if(Number(value) > Number(max)) - { - $('#'+id).val(max); - showInfoDialog("warning","",$.i18n('edt_msg_error_maximum_incl',max)); - return max; - } - else if(Number(value) < Number(min)) - { - $('#'+id).val(min); - showInfoDialog("warning","",$.i18n('edt_msg_error_minimum_incl',min)); - return min; - } - return value; -} - -function readImg(input,cb) -{ - if (input.files && input.files[0]) { - var reader = new FileReader(); - // inject fileName property - reader.fileName = input.files[0].name - - reader.onload = function (e) { - cb(e.target.result, e.target.fileName); - } - reader.readAsDataURL(input.files[0]); + //Test, if language is supported by hyperion + var langIdx = availLang.indexOf(langLocale); + if (langIdx > -1) { + langText = availLangText[langIdx]; + } + else { + // If language is not supported by hyperion, try fallback language + langLocale = $.i18n().options.fallbackLocale.substring(0, 2); + langIdx = availLang.indexOf(langLocale); + if (langIdx > -1) { + langText = availLangText[langIdx]; } + } + //console.log("langLocale: ", langLocale, "langText: ", langText); + + $('#language-select').prop('title', langText); + $("#language-select").val(langIdx); + $("#language-select").selectpicker("refresh"); } -function isJsonString(str) -{ - try - { - JSON.parse(str); - } - catch (e) - { - return e; - } - return ""; +function updateUiOnInstance(inst) { + if (inst != 0) { + var currentURL = $(location).attr("href"); + if (currentURL.indexOf('#conf_network') != -1 || currentURL.indexOf('#update') != -1 || currentURL.indexOf('#conf_webconfig') != -1 || currentURL.indexOf('#conf_grabber') != -1 || currentURL.indexOf('#conf_logging') != -1) + $("#hyperion_global_setting_notify").fadeIn("fast"); + else + $("#hyperion_global_setting_notify").attr("style", "display:none"); + + $("#dashboard_active_instance_friendly_name").html($.i18n('dashboard_active_instance') + ': ' + window.serverInfo.instance[inst].friendly_name); + $("#dashboard_active_instance").removeAttr("style"); + } + else { + $("#hyperion_global_setting_notify").fadeOut("fast"); + $("#dashboard_active_instance").attr("style", "display:none"); + } } -function createJsonEditor(container,schema,setconfig,usePanel,arrayre) -{ - $('#'+container).off(); - $('#'+container).html(""); - - if (typeof arrayre === 'undefined') - arrayre = true; - - var editor = new JSONEditor(document.getElementById(container), - { - theme: 'bootstrap3', - iconlib: "fontawesome4", - disable_collapse: 'true', - form_name_root: 'sa', - disable_edit_json: true, - disable_properties: true, - disable_array_reorder: arrayre, - no_additional_properties: true, - disable_array_delete_all_rows: true, - disable_array_delete_last_row: true, - access: storedAccess, - schema: { - title:'', - properties: schema - } - }); - - if(usePanel) - { - $('#'+container+' .well').first().removeClass('well well-sm'); - $('#'+container+' h4').first().remove(); - $('#'+container+' .well').first().removeClass('well well-sm'); - } - - if (setconfig) - { - for(var key in editor.root.editors) - { - editor.getEditor("root."+key).setValue(Object.assign({}, editor.getEditor("root."+key).value, window.serverConfig[key] )); - } - } - - return editor; +function instanceSwitch(inst) { + requestInstanceSwitch(inst) + window.currentHyperionInstance = inst; + window.currentHyperionInstanceName = getInstanceNameByIndex(inst); + setStorage('lastSelectedInstance', inst, false) + updateHyperionInstanceListing() } -function buildWL(link,linkt,cl) -{ - var baseLink = "https://docs.hyperion-project.org/"; - var lang; - - if(typeof linkt == "undefined") - linkt = "Placeholder"; - - if(storedLang == "de" || navigator.locale == "de") - lang = "de"; - else - lang = "en"; - - if(cl === true) - { - linkt = $.i18n(linkt); - return '

    '+linkt+'

    '+$.i18n('general_wiki_moreto',linkt)+': '+linkt+'
    ' - } - else - return ': '+linkt+''; +function loadContentTo(containerId, fileName) { + $(containerId).load("/content/" + fileName + ".html"); } -function rgbToHex(rgb) -{ - if(rgb.length == 3) - { - return "#" + - ("0" + parseInt(rgb[0],10).toString(16)).slice(-2) + - ("0" + parseInt(rgb[1],10).toString(16)).slice(-2) + - ("0" + parseInt(rgb[2],10).toString(16)).slice(-2); - } - else - debugMessage('rgbToHex: Given rgb is no array or has wrong length'); +function toggleClass(obj, class1, class2) { + if ($(obj).hasClass(class1)) { + $(obj).removeClass(class1); + $(obj).addClass(class2); + } + else { + $(obj).removeClass(class2); + $(obj).addClass(class1); + } +} + +function setClassByBool(obj, enable, class1, class2) { + if (enable) { + $(obj).removeClass(class1); + $(obj).addClass(class2); + } + else { + $(obj).removeClass(class2); + $(obj).addClass(class1); + } +} + +function showInfoDialog(type, header, message) { + if (type == "success") { + $('#id_body').html(''); + if (header == "") + $('#id_body').append('

    ' + $.i18n('infoDialog_general_success_title') + '

    '); + $('#id_footer').html(''); + } + else if (type == "warning") { + $('#id_body').html(''); + if (header == "") + $('#id_body').append('

    ' + $.i18n('infoDialog_general_warning_title') + '

    '); + $('#id_footer').html(''); + } + else if (type == "error") { + $('#id_body').html(''); + if (header == "") + $('#id_body').append('

    ' + $.i18n('infoDialog_general_error_title') + '

    '); + $('#id_footer').html(''); + } + else if (type == "select") { + $('#id_body').html('Redefine ambient light!'); + $('#id_footer').html(''); + $('#id_footer').append(''); + } + else if (type == "iswitch") { + $('#id_body').html('Redefine ambient light!'); + $('#id_footer').html(''); + $('#id_footer').append(''); + } + else if (type == "uilock") { + $('#id_body').html('Redefine ambient light!'); + $('#id_footer').html('' + $.i18n('InfoDialog_nowrite_foottext') + ''); + } + else if (type == "import") { + $('#id_body').html(''); + $('#id_footer').html(''); + $('#id_footer').append(''); + } + else if (type == "delInst") { + $('#id_body').html(''); + $('#id_footer').html(''); + $('#id_footer').append(''); + } + else if (type == "renInst") { + $('#id_body_rename').html('
    '); + $('#id_body_rename').append('

    ' + header + '

    '); + $('#id_body_rename').append(''); + $('#id_footer_rename').html(''); + $('#id_footer_rename').append(''); + } + else if (type == "changePassword") { + $('#id_body_rename').html('
    '); + $('#id_body_rename').append('

    ' + header + '

    '); + $('#id_body_rename').append('
    '); + $('#id_body_rename').append(''); + $('#id_footer_rename').html(''); + $('#id_footer_rename').append(''); + } + else if (type == "checklist") { + $('#id_body').html('Redefine ambient light!'); + $('#id_body').append('

    ' + $.i18n('infoDialog_checklist_title') + '

    '); + $('#id_body').append(header); + $('#id_footer').html(''); + } + else if (type == "newToken") { + $('#id_body').html('Redefine ambient light!'); + $('#id_footer').html(''); + } + else if (type == "grantToken") { + $('#id_body').html('Redefine ambient light!'); + $('#id_footer').html(''); + $('#id_footer').append(''); + } + + if (type != "renInst") { + $('#id_body').append('

    ' + header + '

    '); + $('#id_body').append(message); + } + + if (type == "select" || type == "iswitch") + $('#id_body').append(''); + + $(type == "renInst" || type == "changePassword" ? "#modal_dialog_rename" : "#modal_dialog").modal({ + backdrop: "static", + keyboard: false, + show: true + }); + + $(document).on('click', '[data-dismiss-modal]', function () { + var target = $(this).attr('data-dismiss-modal'); + $.find(target).modal.hide(); + }); +} + +function createHintH(type, text, container) { + type = String(type); + if (type == "intro") + tclass = "introd"; + + $('#' + container).prepend('

    ' + text + '

    '); +} + +function createHint(type, text, container, buttonid, buttontxt) { + var fe, tclass; + + if (type == "intro") { + fe = ''; + tclass = "intro-hint"; + } + else if (type == "info") { + fe = '
    Information
    '; + tclass = "info-hint"; + } + else if (type == "wizard") { + fe = '
    Information
    '; + tclass = "wizard-hint"; + } + else if (type == "warning") { + fe = '
    Information
    '; + tclass = "warning-hint"; + } + + if (buttonid) + buttonid = '

    '; + else + buttonid = ""; + + if (type == "intro") + $('#' + container).prepend('

    ' + $.i18n("conf_helptable_expl") + '

    ' + text + '
    '); + else if (type == "wizard") + $('#' + container).prepend('

    ' + $.i18n("wiz_wizavail") + '

    ' + $.i18n('wiz_guideyou', text) + buttonid + '
    '); + else { + createTable('', 'htb', container, true, tclass); + $('#' + container + ' .htb').append(createTableRow([fe, text], false, true)); + } +} + +function createEffHint(title, text) { + return '

    ' + title + '

    ' + text + '
    '; +} + +function valValue(id, value, min, max) { + if (typeof max === 'undefined' || max == "") + max = 999999; + + if (Number(value) > Number(max)) { + $('#' + id).val(max); + showInfoDialog("warning", "", $.i18n('edt_msg_error_maximum_incl', max)); + return max; + } + else if (Number(value) < Number(min)) { + $('#' + id).val(min); + showInfoDialog("warning", "", $.i18n('edt_msg_error_minimum_incl', min)); + return min; + } + return value; +} + +function readImg(input, cb) { + if (input.files && input.files[0]) { + var reader = new FileReader(); + // inject fileName property + reader.fileName = input.files[0].name + + reader.onload = function (e) { + cb(e.target.result, e.target.fileName); + } + reader.readAsDataURL(input.files[0]); + } +} + +function isJsonString(str) { + try { + JSON.parse(str); + } + catch (e) { + return e; + } + return ""; +} + +function createJsonEditor(container, schema, setconfig, usePanel, arrayre) { + $('#' + container).off(); + $('#' + container).html(""); + + if (typeof arrayre === 'undefined') + arrayre = true; + + var editor = new JSONEditor(document.getElementById(container), + { + theme: 'bootstrap3', + iconlib: "fontawesome4", + disable_collapse: 'true', + form_name_root: 'sa', + disable_edit_json: true, + disable_properties: true, + disable_array_reorder: arrayre, + no_additional_properties: true, + disable_array_delete_all_rows: true, + disable_array_delete_last_row: true, + access: storedAccess, + schema: { + title: '', + properties: schema + } + }); + + if (usePanel) { + $('#' + container + ' .well').first().removeClass('well well-sm'); + $('#' + container + ' h4').first().remove(); + $('#' + container + ' .well').first().removeClass('well well-sm'); + } + + if (setconfig) { + for (var key in editor.root.editors) { + editor.getEditor("root." + key).setValue(Object.assign({}, editor.getEditor("root." + key).value, window.serverConfig[key])); + } + } + + return editor; +} + +function buildWL(link, linkt, cl) { + var baseLink = "https://docs.hyperion-project.org/"; + var lang; + + if (typeof linkt == "undefined") + linkt = "Placeholder"; + + if (storedLang == "de" || navigator.locale == "de") + lang = "de"; + else + lang = "en"; + + if (cl === true) { + linkt = $.i18n(linkt); + return '

    ' + linkt + '

    ' + $.i18n('general_wiki_moreto', linkt) + ':     ' + linkt + '
    ' + } + else + return ': ' + linkt + ''; +} + +function rgbToHex(rgb) { + if (rgb.length == 3) { + return "#" + + ("0" + parseInt(rgb[0], 10).toString(16)).slice(-2) + + ("0" + parseInt(rgb[1], 10).toString(16)).slice(-2) + + ("0" + parseInt(rgb[2], 10).toString(16)).slice(-2); + } + else + debugMessage('rgbToHex: Given rgb is no array or has wrong length'); } function hexToRgb(hex) { - var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex); - return result ? { - r: parseInt(result[1], 16), - g: parseInt(result[2], 16), - b: parseInt(result[3], 16) - } : null; + var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex); + return result ? { + r: parseInt(result[1], 16), + g: parseInt(result[2], 16), + b: parseInt(result[3], 16) + } : null; } /* - Show a notification - @param type Valid types are "info","success","warning","danger" - @param message The message to show - @param title A title (optional) - @param addhtml Add custom html to the notification end + Show a notification + @param type Valid types are "info","success","warning","danger" + @param message The message to show + @param title A title (optional) + @param addhtml Add custom html to the notification end */ -function showNotification(type, message, title="", addhtml="") -{ - if(title == "") - { - switch(type) - { - case "info": - title = $.i18n('infoDialog_general_info_title'); - break; - case "success": - title = $.i18n('infoDialog_general_success_title'); - break; - case "warning": - title = $.i18n('infoDialog_general_warning_title'); - break; - case "danger": - title = $.i18n('infoDialog_general_error_title'); - break; - } - } +function showNotification(type, message, title = "", addhtml = "") { + if (title == "") { + switch (type) { + case "info": + title = $.i18n('infoDialog_general_info_title'); + break; + case "success": + title = $.i18n('infoDialog_general_success_title'); + break; + case "warning": + title = $.i18n('infoDialog_general_warning_title'); + break; + case "danger": + title = $.i18n('infoDialog_general_error_title'); + break; + } + } - $.notify({ - // options - title: title, - message: message - },{ - // settings - type: type, - animate: { - enter: 'animated fadeInDown', - exit: 'animated fadeOutUp' - }, - placement:{ - align:'center' - }, - mouse_over : 'pause', - template: '' - }); + $.notify({ + // options + title: title, + message: message + }, { + // settings + type: type, + animate: { + enter: 'animated fadeInDown', + exit: 'animated fadeOutUp' + }, + placement: { + align: 'center' + }, + mouse_over: 'pause', + template: '' + }); } -function createCP(id, color, cb) -{ - if(Array.isArray(color)) - color = rgbToHex(color); - else if(color == "undefined") - color = "#AA3399"; +function createCP(id, color, cb) { + if (Array.isArray(color)) + color = rgbToHex(color); + else if (color == "undefined") + color = "#AA3399"; - if(color.startsWith("#")) - { - $('#'+id).colorpicker({ - format: 'rgb', - customClass: 'colorpicker-2x', - color: color, - sliders: { - saturation: { - maxLeft: 200, - maxTop: 200 - }, - hue: { - maxTop: 200 - }, - } - }); - $('#'+id).colorpicker().on('changeColor', function(e) { - var rgb = e.color.toRGB(); - var hex = e.color.toHex(); - cb(rgb,hex,e); - }); - } - else - debugMessage('createCP: Given color is not legit'); + if (color.startsWith("#")) { + $('#' + id).colorpicker({ + format: 'rgb', + customClass: 'colorpicker-2x', + color: color, + sliders: { + saturation: { + maxLeft: 200, + maxTop: 200 + }, + hue: { + maxTop: 200 + }, + } + }); + $('#' + id).colorpicker().on('changeColor', function (e) { + var rgb = e.color.toRGB(); + var hex = e.color.toHex(); + cb(rgb, hex, e); + }); + } + else + debugMessage('createCP: Given color is not legit'); } // Creates a table with thead and tbody ids @@ -679,26 +593,25 @@ function createCP(id, color, cb) // @param string bid : a class for tbody // @param string cont : a container id to html() the table // @param string bless: if true the table is borderless -function createTable(hid, bid, cont, bless, tclass) -{ - var table = document.createElement('table'); - var thead = document.createElement('thead'); - var tbody = document.createElement('tbody'); +function createTable(hid, bid, cont, bless, tclass) { + var table = document.createElement('table'); + var thead = document.createElement('thead'); + var tbody = document.createElement('tbody'); - table.className = "table"; - if(bless === true) - table.className += " borderless"; - if(typeof tclass !== "undefined") - table.className += " "+tclass; - table.style.marginBottom = "0px"; - if(hid != "") - thead.className = hid; - tbody.className = bid; - if(hid != "") - table.appendChild(thead); - table.appendChild(tbody); + table.className = "table"; + if (bless === true) + table.className += " borderless"; + if (typeof tclass !== "undefined") + table.className += " " + tclass; + table.style.marginBottom = "0px"; + if (hid != "") + thead.className = hid; + tbody.className = bid; + if (hid != "") + table.appendChild(thead); + table.appendChild(tbody); - $('#'+cont).append(table); + $('#' + cont).append(table); } // Creates a table row @@ -707,290 +620,259 @@ function createTable(hid, bid, cont, bless, tclass) // @param bool align :if null or false no alignment // // @return : with or as child(s) -function createTableRow(list, head, align) -{ - var row = document.createElement('tr'); +function createTableRow(list, head, align) { + var row = document.createElement('tr'); - for(var i = 0; i < list.length; i++) - { - if(head === true) - var el = document.createElement('th'); - else - var el = document.createElement('td'); + for (var i = 0; i < list.length; i++) { + if (head === true) + var el = document.createElement('th'); + else + var el = document.createElement('td'); - if(align) - el.style.verticalAlign = "middle"; + if (align) + el.style.verticalAlign = "middle"; - el.innerHTML = list[i]; - row.appendChild(el); - } - return row; + el.innerHTML = list[i]; + row.appendChild(el); + } + return row; } -function createRow(id) -{ - var el = document.createElement('div'); - el.className = "row"; - el.setAttribute('id', id); - return el; +function createRow(id) { + var el = document.createElement('div'); + el.className = "row"; + el.setAttribute('id', id); + return el; } -function createOptPanel(phicon, phead, bodyid, footerid) -{ - phead = ''+phead; - var pfooter = document.createElement('button'); - pfooter.className = "btn btn-primary"; - pfooter.setAttribute("id", footerid); - pfooter.innerHTML = ''+$.i18n('general_button_savesettings'); +function createOptPanel(phicon, phead, bodyid, footerid) { + phead = '' + phead; + var pfooter = document.createElement('button'); + pfooter.className = "btn btn-primary"; + pfooter.setAttribute("id", footerid); + pfooter.innerHTML = '' + $.i18n('general_button_savesettings'); - return createPanel(phead, "", pfooter, "panel-default", bodyid); + return createPanel(phead, "", pfooter, "panel-default", bodyid); } -function sortProperties(list) -{ - for(var key in list) - { - list[key].key = key; - } - list = $.map(list, function(value, index) { - return [value]; - }); - return list.sort(function(a,b) { - return a.propertyOrder - b.propertyOrder; - }); +function sortProperties(list) { + for (var key in list) { + list[key].key = key; + } + list = $.map(list, function (value, index) { + return [value]; + }); + return list.sort(function (a, b) { + return a.propertyOrder - b.propertyOrder; + }); } -function createHelpTable(list, phead){ - var table = document.createElement('table'); - var thead = document.createElement('thead'); - var tbody = document.createElement('tbody'); - list = sortProperties(list); +function createHelpTable(list, phead) { + var table = document.createElement('table'); + var thead = document.createElement('thead'); + var tbody = document.createElement('tbody'); + list = sortProperties(list); - phead = ''+phead+' '+$.i18n("conf_helptable_expl"); + phead = '' + phead + ' ' + $.i18n("conf_helptable_expl"); - table.className = 'table table-hover borderless'; + table.className = 'table table-hover borderless'; - thead.appendChild(createTableRow([$.i18n('conf_helptable_option'), $.i18n('conf_helptable_expl')], true, false)); + thead.appendChild(createTableRow([$.i18n('conf_helptable_option'), $.i18n('conf_helptable_expl')], true, false)); - for (var key in list) - { - if(list[key].access != 'system') - { - // break one iteration (in the loop), if the schema has the entry hidden=true - if ("options" in list[key] && "hidden" in list[key].options && (list[key].options.hidden)) - continue; - if ("access" in list[key] && ((list[key].access == "advanced" && storedAccess == "default") || (list[key].access == "expert" && storedAccess != "expert"))) - continue; - var text = list[key].title.replace('title', 'expl'); - tbody.appendChild(createTableRow([$.i18n(list[key].title), $.i18n(text)], false, false)); + for (var key in list) { + if (list[key].access != 'system') { + // break one iteration (in the loop), if the schema has the entry hidden=true + if ("options" in list[key] && "hidden" in list[key].options && (list[key].options.hidden)) + continue; + if ("access" in list[key] && ((list[key].access == "advanced" && storedAccess == "default") || (list[key].access == "expert" && storedAccess != "expert"))) + continue; + var text = list[key].title.replace('title', 'expl'); + tbody.appendChild(createTableRow([$.i18n(list[key].title), $.i18n(text)], false, false)); - if(list[key].items && list[key].items.properties) - { - var ilist = sortProperties(list[key].items.properties); - for (var ikey in ilist) - { - // break one iteration (in the loop), if the schema has the entry hidden=true - if ("options" in ilist[ikey] && "hidden" in ilist[ikey].options && (ilist[ikey].options.hidden)) - continue; - if ("access" in ilist[ikey] && ((ilist[ikey].access == "advanced" && storedAccess == "default") || (ilist[ikey].access == "expert" && storedAccess != "expert"))) - continue; - var itext = ilist[ikey].title.replace('title', 'expl'); - tbody.appendChild(createTableRow([$.i18n(ilist[ikey].title), $.i18n(itext)], false, false)); - } - } - } - } - table.appendChild(thead); - table.appendChild(tbody); + if (list[key].items && list[key].items.properties) { + var ilist = sortProperties(list[key].items.properties); + for (var ikey in ilist) { + // break one iteration (in the loop), if the schema has the entry hidden=true + if ("options" in ilist[ikey] && "hidden" in ilist[ikey].options && (ilist[ikey].options.hidden)) + continue; + if ("access" in ilist[ikey] && ((ilist[ikey].access == "advanced" && storedAccess == "default") || (ilist[ikey].access == "expert" && storedAccess != "expert"))) + continue; + var itext = ilist[ikey].title.replace('title', 'expl'); + tbody.appendChild(createTableRow([$.i18n(ilist[ikey].title), $.i18n(itext)], false, false)); + } + } + } + } + table.appendChild(thead); + table.appendChild(tbody); - return createPanel(phead, table); + return createPanel(phead, table); } -function createPanel(head, body, footer, type, bodyid){ - var cont = document.createElement('div'); - var p = document.createElement('div'); - var phead = document.createElement('div'); - var pbody = document.createElement('div'); - var pfooter = document.createElement('div'); +function createPanel(head, body, footer, type, bodyid) { + var cont = document.createElement('div'); + var p = document.createElement('div'); + var phead = document.createElement('div'); + var pbody = document.createElement('div'); + var pfooter = document.createElement('div'); - cont.className = "col-lg-6"; + cont.className = "col-lg-6"; - if(typeof type == 'undefined') - type = 'panel-default'; + if (typeof type == 'undefined') + type = 'panel-default'; - p.className = 'panel '+type; - phead.className = 'panel-heading'; - pbody.className = 'panel-body'; - pfooter.className = 'panel-footer'; + p.className = 'panel ' + type; + phead.className = 'panel-heading'; + pbody.className = 'panel-body'; + pfooter.className = 'panel-footer'; - phead.innerHTML = head; + phead.innerHTML = head; - if(typeof bodyid != 'undefined') - { - pfooter.style.textAlign = 'right'; - pbody.setAttribute("id", bodyid); - } + if (typeof bodyid != 'undefined') { + pfooter.style.textAlign = 'right'; + pbody.setAttribute("id", bodyid); + } - if(typeof body != 'undefined' && body != "") - pbody.appendChild(body); + if (typeof body != 'undefined' && body != "") + pbody.appendChild(body); - if(typeof footer != 'undefined') - pfooter.appendChild(footer); + if (typeof footer != 'undefined') + pfooter.appendChild(footer); - p.appendChild(phead); - p.appendChild(pbody); + p.appendChild(phead); + p.appendChild(pbody); - if(typeof footer != 'undefined') - { - pfooter.style.textAlign = "right"; - p.appendChild(pfooter); - } + if (typeof footer != 'undefined') { + pfooter.style.textAlign = "right"; + p.appendChild(pfooter); + } - cont.appendChild(p); + cont.appendChild(p); - return cont; + return cont; } -function createSelGroup(group) -{ - var el = document.createElement('optgroup'); - el.setAttribute('label', group); - return el; +function createSelGroup(group) { + var el = document.createElement('optgroup'); + el.setAttribute('label', group); + return el; } -function createSelOpt(opt, title) -{ - var el = document.createElement('option'); - el.setAttribute('value', opt); - if (typeof title == 'undefined') - el.innerHTML = opt; - else - el.innerHTML = title; - return el; +function createSelOpt(opt, title) { + var el = document.createElement('option'); + el.setAttribute('value', opt); + if (typeof title == 'undefined') + el.innerHTML = opt; + else + el.innerHTML = title; + return el; } -function createSel(array, group, split) -{ - if (array.length != 0) - { - var el = createSelGroup(group); - for(var i=0; i", { - rel: "stylesheet", - type: "text/css", - href: "../css/darkMode.css" - }).appendTo("head"); +function handleDarkMode() { + $("", { + rel: "stylesheet", + type: "text/css", + href: "../css/darkMode.css" + }).appendTo("head"); - setStorage("darkMode", "on", false); - $('#btn_darkmode_icon').removeClass('fa fa-moon-o'); - $('#btn_darkmode_icon').addClass('fa fa-sun-o'); + setStorage("darkMode", "on", false); + $('#btn_darkmode_icon').removeClass('fa fa-moon-o'); + $('#btn_darkmode_icon').addClass('fa fa-sun-o'); } diff --git a/libsrc/hyperion/SettingsManager.cpp b/libsrc/hyperion/SettingsManager.cpp index 7922f777..b21c4c96 100644 --- a/libsrc/hyperion/SettingsManager.cpp +++ b/libsrc/hyperion/SettingsManager.cpp @@ -120,7 +120,15 @@ QJsonObject SettingsManager::getSettings() const for(const auto & key : _qconfig.keys()) { //Read all records from database to ensure that global settings are read across instances - config.insert(key, _sTable->getSettingsRecord(key).object()); + QJsonDocument doc = _sTable->getSettingsRecord(key); + if(doc.isArray()) + { + config.insert(key, doc.array()); + } + else + { + config.insert(key, doc.object()); + } } return config; } @@ -245,5 +253,18 @@ bool SettingsManager::handleConfigUpgrade(QJsonObject& config) Debug(_log,"LED Layout migrated"); } } + + if (config.contains("grabberV4L2")) + { + QJsonObject newGrabberV4L2Config = config["grabberV4L2"].toObject(); + + if (newGrabberV4L2Config.contains("encoding_format")) + { + newGrabberV4L2Config.remove("encoding_format"); + config["grabberV4L2"] = newGrabberV4L2Config; + migrated = true; + Debug(_log, "GrabberV4L2 Layout migrated"); + } + } return migrated; }