Token Management, Database, ...

.codedocs

@@ -0,0 +1,76 @@
+# Hyperion.NG .codedocs Configuration File
+
+#---------------------------------------------------------------------------
+# CodeDocs Configuration
+#---------------------------------------------------------------------------
+
+# Include the Doxygen configuration from another file.
+# The file must be a relative path with respect to the root of the repository.
+
+DOXYFILE =
+
+# Specify external repository to link documentation with.
+# This is similar to Doxygen's TAGFILES option, but will automatically link to
+# tags of other repositories already using CodeDocs. List each repository to
+# link with by giving its location in the form of owner/repository.
+# For example:
+#   TAGLINKS = doxygen/doxygen CodeDocs/osg
+# Note: these repositories must already be built on CodeDocs.
+
+TAGLINKS =
+
+#---------------------------------------------------------------------------
+# Doxygen Configuration
+#---------------------------------------------------------------------------
+
+# Doxygen configuration may also be placed in this file.
+# Currently, the following Doxygen configuration options are available. Refer
+# to http://doxygen.org/manual/config.html for detailed explanation of the
+# options. To request support for more options, contact [email protected].
+#
+# ABBREVIATE_BRIEF =
+# ALIASES =
+# ALPHABETICAL_INDEX =
+# ALWAYS_DETAILED_SEC =
+# CASE_SENSE_NAMES =
+# CLASS_DIAGRAMS =
+# DISABLE_INDEX =
+# DISTRIBUTE_GROUP_DOC =
+# EXAMPLE_PATH =
+  EXCLUDE = .ci/ \
+            assets/ \
+            bin/
+            config/ \
+            effects/ \
+            test/ \
+# EXCLUDE_PATTERNS =
+# EXCLUDE_SYMBOLS =
+# EXTENSION_MAPPING =
+# EXTRACT_LOCAL_CLASSES =
+# FILE_PATTERNS =
+# GENERATE_TAGFILE =
+# GENERATE_TREEVIEW =
+# HIDE_COMPOUND_REFERENCE =
+# HIDE_SCOPE_NAMES =
+# HIDE_UNDOC_CLASSES =
+# HIDE_UNDOC_MEMBERS =
+# HTML_TIMESTAMP =
+# INLINE_GROUPED_CLASSES =
+# INPUT_ENCODING =
+# INTERNAL_DOCS =
+# OPTIMIZE_OUTPUT_FOR_C =
+  PROJECT_BRIEF = "The successor to Hyperion aka Hyperion Next Generation"
+  PROJECT_NAME = "Hyperion.NG"
+# PROJECT_NUMBER =
+# SHORT_NAMES =
+# SHOW_FILES =
+# SHOW_INCLUDE_FILES =
+# SHOW_NAMESPACES =
+# SORT_BRIEF_DOCS =
+# SORT_BY_SCOPE_NAME =
+# SORT_MEMBER_DOCS =
+# STRICT_PROTO_MATCHING =
+# TYPEDEF_HIDES_STRUCT =
+  USE_MDFILE_AS_MAINPAGE = README.md
+# VERBATIM_HEADERS =
+#

CMakeLists.txt

@@ -311,7 +311,7 @@ IF ( CMAKE_CROSSCOMPILING )
 ENDIF()
 
 SET(QT_MIN_VERSION "5.5.0")
-find_package(Qt5 COMPONENTS Core Gui Network SerialPort REQUIRED)
+find_package(Qt5 COMPONENTS Core Gui Network SerialPort Sql REQUIRED)
 message( STATUS "Found Qt Version: ${Qt5Core_VERSION}" )
 IF ( "${Qt5Core_VERSION}" VERSION_LESS "${QT_MIN_VERSION}" )
 	message( FATAL_ERROR "Your Qt version is to old! Minimum required ${QT_MIN_VERSION}" )
@@ -354,9 +354,6 @@ endif ()
 # Add resources directory
 add_subdirectory(resources)
 
-# Add the doxygen generation directory
-add_subdirectory(doc)
-
 # remove generated files on make cleaan too
 LIST( APPEND GENERATED_QRC
 	${CMAKE_BINARY_DIR}/EffectEngine.qrc

CompileHowto.md

@@ -1,7 +1,7 @@
 # With Docker
 If you are using [Docker](https://www.docker.com/), you can compile Hyperion inside a docker container. This keeps your system clean and with a simple script it's easy to use. Supported is also cross compiling for Raspberry Pi (Debian Stretch or higher). To compile Hyperion just execute one of the following commands.
 
-The compiled binaries and packages will be available at the deploy folder next to the script
+The compiled binaries and packages will be available at the deploy folder next to the script.<br/>
 Note: call the script with `./docker-compile.sh -h` for more options
 
 ## Native compiling on Raspberry Pi
@@ -40,7 +40,7 @@ wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/
 
 ```
 sudo apt-get update
-sudo apt-get install git cmake build-essential qtbase5-dev libqt5serialport5-dev libusb-1.0-0-dev python3-dev libxrender-dev libavahi-core-dev libavahi-compat-libdnssd-dev libjpeg-dev
+sudo apt-get install git cmake build-essential qtbase5-dev libqt5serialport5-dev libusb-1.0-0-dev python3-dev libxrender-dev libavahi-core-dev libavahi-compat-libdnssd-dev libjpeg-dev libqt5sql5-sqlite
 ```
 
 **on RPI you need the videocore IV headers**

README.md

@@ -4,6 +4,7 @@
 [![Azure-Pipeline](https://dev.azure.com/Hyperion-Project/Hyperion.NG/_apis/build/status/Hyperion.NG?branchName=master)](https://dev.azure.com/Hyperion-Project/Hyperion.NG/_build/latest?definitionId=7&branchName=master)
 [![Travis-CI](https://travis-ci.org/hyperion-project/hyperion.ng.svg?branch=master)](https://travis-ci.org/hyperion-project/hyperion.ng)
 [![LGTM](https://img.shields.io/lgtm/alerts/g/hyperion-project/hyperion.ng.svg)](https://lgtm.com/projects/g/hyperion-project/hyperion.ng/alerts/)
+[![Documentation](https://codedocs.xyz/hyperion-project/hyperion.ng.svg)](https://codedocs.xyz/hyperion-project/hyperion.ng/)
 
 ## About Hyperion
 

assets/webconfig/content/conf_general.html

@@ -4,6 +4,27 @@
 			<h3 class="page-header"><i class="fa fa-wrench fa-fw"></i><span  data-i18n="conf_general_label_title">General</span></h3>
 			<div class="row" id="conf_cont"></div>
 			<div class="row">
+				<div class="col-lg-6" id="inst_desc">
+					<div class="panel panel-default">
+						<div class="panel-heading"><i class="fa fa-plus fa-fw"></i><span data-i18n="conf_general_inst_title"></span></div>
+						<div class="panel-body">
+							<div id="inst_desc_cont"></div>
+							<div id="itable"></div>
+							<div style="margin: 30px 0; border-top:1px solid #d0d0d0"></div>
+							<div class="row">
+								<div class="col-lg-6">
+									<p data-i18n="conf_general_inst_name_title" style="font-weight:bold"></p>
+								</div>
+								<div class="col-lg-6">
+									<input class="form-control" id="inst_name" type="text"></input>
+								</div>
+							</div>
+							<div>
+								<button class="btn btn-primary" id="btn_create_inst" data-i18n="conf_general_createInst_btn" disabled>Create New Token</button>
+							</div>
+						</div>
+					</div>
+				</div>
 				<div class="col-lg-6" id="conf_imp">
 					<div class="panel panel-default">
 						<div class="panel-heading"><i class="fa fa-wrench fa-fw"></i><span data-i18n="conf_general_impexp_title"></span></div>

assets/webconfig/content/conf_network.html

@@ -2,9 +2,36 @@
 	<div class="row">
 		<div class="col-lg-12">
 			<h3 class="page-header"><i class="fa fa-sitemap fa-fw"></i><span  data-i18n="main_menu_network_conf_token">Network Services</span></h3> 
-			<div id="conf_cont"></div>
+			<div id="conf_cont">
+				<div class="row" id="conf_cont_tok">
+					<div class="col-lg-6" id="tok_desc">
+						<div class="panel panel-default">
+							<div class="panel-heading"><i class="fa fa-key fa-fw"></i><span data-i18n="conf_network_tok_title"></span></div>
+							<div class="panel-body">
+								<div id="tok_desc_cont"></div>
+								<div id="tktable"></div>
+								<div style="margin: 30px 0; border-top:1px solid #d0d0d0"></div>
+								<div class="row">
+									<div class="col-lg-6">
+										<p data-i18n="conf_network_tok_comment_title" style="font-weight:bold"></p>
+									</div>
+									<div class="col-lg-6">
+										<input class="form-control" id="tok_comment" type="text"></input>
+									</div>
+									<div class="col-lg-6">
+										<span id="tok_chars_needed"><br /></span>
+									</div>
+								</div>
+							</div>
+							<div class="panel-footer" style="text-align: right;">
+								<button class="btn btn-primary" id="btn_create_tok" data-i18n="conf_network_createToken_btn" disabled>Create New Token</button>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
 		</div>
 	</div>
 </div>
 
-<script src="/js/content_network.js"></script>
+<script src="/js/content_network.js"></script>

assets/webconfig/content/connection_lost.html

@@ -27,7 +27,7 @@ <h4 class="reconstop" data-i18n="info_conlost_label_autorecon">We reconnect agai
 var connectionTimer;
 var count = 1;
 var reconnectInterval = 4000;
-var connURL = location.protocol+"//"+location.hostname+":"+window.jsonPort+location.pathname+location.hash;
+var connURL = window.location.protocol+"//"+window.location.hostname+":"+window.jsonPort+window.location.pathname+window.location.hash;
 
 function tryReconnect()
 {
@@ -41,7 +41,14 @@ <h4 class="reconstop" data-i18n="info_conlost_label_autorecon">We reconnect agai
 
 	$.ajax({ url: connURL }).done(function(data) {
 		window.clearInterval(connectionTimer);
-		window.location.href = connURL;
+		if(reconnectInterval <= 2000){
+			let url = connURL;
+			if (window.connURL.includes("#"))
+				url = window.connURL.slice(0,window.connURL.indexOf("#"));
+			window.location.replace(url);
+		} else {
+			window.location.reload();
+		}
 	})
 	.fail( function( jqXHR, textStatus ) {
 		count++;
@@ -55,7 +62,7 @@ <h4 class="reconstop" data-i18n="info_conlost_label_autorecon">We reconnect agai
 	{
 		connectionLost = true;
 		// if we changed the webui port we connect faster
-		if(window.fastReconnect){
+		if(window.fastReconnect) {
 			window.fastReconnect = false;
 			reconnectInterval = 2000;
 		}

assets/webconfig/content/remote.html

@@ -70,16 +70,16 @@ <h3 class="page-header"><i class="fa fa-wifi fa-fw"></i><span data-i18n="main_me
 		</div>
 		<div class="col-md-6 col-lg-6 col-xxl-5">
 			<div class="panel panel-default" >
-				<div class="panel-heading"><i class="fa fa-wifi fa-fw"></i><span data-i18n="remote_adjustment_label"></span></div>
-				<div class="panel-body" id="adjust_content">
+				<div class="panel-heading"><i class="fa fa-wifi fa-fw"></i><span data-i18n="remote_videoMode_label"></span></div>
+				<div class="panel-body" id="videomode_intro">
+					<div id="videomodebtns"></div>
 				</div>
 			</div>
 		</div>
 		<div class="col-md-6 col-lg-6 col-xxl-5">
 			<div class="panel panel-default" >
-				<div class="panel-heading"><i class="fa fa-wifi fa-fw"></i><span data-i18n="remote_videoMode_label"></span></div>
-				<div class="panel-body" id="videomode_intro">
-					<div id="videomodebtns"></div>
+				<div class="panel-heading"><i class="fa fa-wifi fa-fw"></i><span data-i18n="remote_adjustment_label"></span></div>
+				<div class="panel-body" id="adjust_content">
 				</div>
 			</div>
 		</div>

assets/webconfig/css/hyperion.css

@@ -10,11 +10,11 @@ body{font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15
 	padding-bottom:50px;
 }
 body{
-    overflow-y: scroll; 
+    overflow-y: scroll;
 }
 .btn{margin: 2px 0;}
 /*
-#page-wrapper a[target=_blank]::after { 
+#page-wrapper a[target=_blank]::after {
     content:"\f08e";
 	position:relative;
 	font:normal normal normal 10px/1 FontAwesome;
@@ -109,7 +109,7 @@ table label{margin:0}
 .colorpicker-2x .colorpicker-saturation {width: 200px;height: 200px;}
 .colorpicker-2x .colorpicker-hue,.colorpicker-2x .colorpicker-alpha {width: 30px;height: 200px;}
 .colorpicker-2x .colorpicker-color,.colorpicker-2x .colorpicker-color div {height: 30px;}
-	
+
 /*Hint*/
 .info-hint{
 	background-color:rgb(236,236,236);
@@ -123,7 +123,7 @@ table label{margin:0}
 	box-shadow: 1px 1px 1px 0px rgba(0,0,0,0.25);
 	font-size:97%;
 }
-	
+
 /*Support page*/
 .unlink,.unlink:hover{color:#333;text-decoration:none;}
 .support-container ul{padding-left:0px;list-style-type: none;}
@@ -196,6 +196,10 @@ table label{margin:0}
 	background-color:#d1322e;
 }
 
+.modal-icon-edit{
+	background-color:#3579b6;
+}
+
 .overlay {
 	background-image: url('/img/hyperion/hyperionwhitelogo.png');
 	background-repeat: no-repeat;

assets/webconfig/i18n/cs.json

@@ -16,7 +16,6 @@
     "general_comp_BLACKBORDER": "Detekce černýh pruh",
     "general_comp_KODICHECKER": "Kodi Snímač",
     "general_comp_FORWARDER": "Zasílat",
-    "general_comp_UDPLISTENER": "UDP server",
     "general_comp_BOBLIGHTSERVER": "Boblight Server",
     "general_comp_GRABBER": "Platforma zachycení",
     "general_comp_V4L": "USB zachycení",
@@ -142,7 +141,6 @@
     "conf_network_json_intro": "The JSON-RPC-Port této instance Hyperion, který se používá pro dálkové ovládání.",
     "conf_network_proto_intro": "PROTO-Port této instance Hyperion, používaný pro obrazové proudy (Hyperion ScreenCap, Kodi Addon, ...)",
     "conf_network_bobl_intro": "Přijímač pro Boblight",
-    "conf_network_udpl_intro": "Přijímač pro UDP",
     "conf_network_forw_intro": "Předat všechny vstupy na druhou instanci Hyperion, která by mohla být řízena jiným LED ovladačem",
     "conf_kodi_label_title": "Kodi Snímač",
     "conf_kodi_intro": "Kodi Snímač umožňuje zapnout a vypnout obrazovku v závislosti na stavu Kodi. Nastavení není omezeno na stejný stroj, můžete pozorovat i Kodi na libovolně jiném zařízení v síti.",
@@ -518,13 +516,6 @@
     "edt_conf_js_heading_title": "JSON Server",
     "edt_conf_ps_heading_title": "PROTO Server",
     "edt_conf_bobls_heading_title": "Boblight Server",
-    "edt_conf_udpl_heading_title": "UDP Listener",
-    "edt_conf_udpl_address_title": "Adresa",
-    "edt_conf_udpl_address_expl": "Adresa, kde jsou přijaty balíčky UDP.",
-    "edt_conf_udpl_timeout_title": "Čas vypršel",
-    "edt_conf_udpl_timeout_expl": "Pokud pro danou dobu nejsou přijaty žádné pakety, bude součást (soft) zakázána.",
-    "edt_conf_udpl_shared_title": "Sdíled",
-    "edt_conf_udpl_shared_expl": "Sdíleny všemi instancemi Hyperion.",
     "edt_conf_webc_heading_title": "Webová konfigurace",
     "edt_conf_webc_docroot_title": "Document Root",
     "edt_conf_webc_docroot_expl": "Místní kořenová cesta webového rozhraní (pouze pro vývojáře webui)",