From 9ca119e4df3d72e3ef191ba2d4d6148a5b2f3c4a Mon Sep 17 00:00:00 2001 From: Sepp Jeremiah Morris Date: Wed, 14 Feb 2024 00:02:35 +0100 Subject: [PATCH] some minor improvements \\ enough work for today --- app.go | 17 +++++--- app/js/about.js | 81 ------------------------------------- app/js/jcathostinfo.js | 7 +++- app/js/jcm.js | 60 +++++++++++++++++++++++++++ app/js/jellyfin-setup.js | 28 +++++++++++-- app/js/settingloader.js | 42 +++++++++++++++++++ app/xml/about.xml | 54 +++++++++++++++++++++++++ app/xml/dvt/devtools.xml | 11 +++-- app/xml/server-settings.xml | 8 ++-- app/xml/settings.xml | 5 ++- configLoader.go | 15 +++---- dnsResolver.go | 2 +- main.go | 2 +- settings.cfg | 20 ++++----- 14 files changed, 233 insertions(+), 119 deletions(-) delete mode 100644 app/js/about.js create mode 100644 app/js/settingloader.js create mode 100644 app/xml/about.xml diff --git a/app.go b/app.go index 6fa4714..431d221 100644 --- a/app.go +++ b/app.go @@ -105,15 +105,20 @@ func displayCinfo() { fmt.Println("| |") fmt.Println("| *** DNS *** |") fmt.Println("| |") - fmt.Println("| hijack_ip = ", config.HijackIP, " |") - fmt.Println("| hijack_app = ", config.HijackApp, " |") - fmt.Println("| hijack_img = ", config.HijackImg, " |") - fmt.Println("| forward_ip = ", config.ForwardIP, " |") // any big ip address and my design tabs too far :( haha + fmt.Println("| hijack_ip = ", config.HijackIP, " |") + fmt.Println("| hijack_app = ", config.HijackApp, " |") + fmt.Println("| hijack_img = ", config.HijackImg, " |") + fmt.Println("| forward_ip = ", config.ForwardIP, " |") // any big ip address and my design tabs too far :( haha + fmt.Println("| forward_port = ", config.ForwardPort, " |") fmt.Println("| |") fmt.Println("| *** WEB *** |") fmt.Println("| |") - fmt.Println("| https_port = ", config.HttpsPort, " |") - fmt.Println("| https_port = ", config.HttpPort, " |") + fmt.Println("| https_port = ", config.HttpsPort, " |") + fmt.Println("| https_port = ", config.HttpPort, " |") + fmt.Println("| |") + fmt.Println("| *** CERTGEN *** |") + fmt.Println("| |") + fmt.Println("| common_name = ", config.CertName, " |") fmt.Println("| |") fmt.Println("=========================================") fmt.Println("| go to brain.seppjm.com/# |") diff --git a/app/js/about.js b/app/js/about.js deleted file mode 100644 index 5b8218d..0000000 --- a/app/js/about.js +++ /dev/null @@ -1,81 +0,0 @@ -// /\_/| -// { ' ' } JellyCAT -// \____\ - -//----------------------------DOMView-------------------------------------------- - -var JCATAboutXML = '\n' + - '\n' + - ' \n' + - ' \n' + - ' \n' + - ' \n' + - ' JellyCAT About\n' + - ' \n' + - ' \n' + - ' \n' + - ' Close\n' + - ' \n' + - ' \n' + - ' \n' + - ' \n' + - ''; - - -JCATAboutXML = JCATAboutXML - .replace(/\$atvcsettings\.hello/g, atv.jcathost.HelloMessage) - .replace(/\$atvcsettings\.system/g, atv.jcathost.System) - .replace(/\$atvcsettings\.version/g, atv.jcathost.Version) - .replace(/\$atvcsettings\.sighost/g, atv.jcathost.SigHost) - .replace(/\$atvcsettings\.hostip/g, atv.jcathost.HostIP); - - -function generateJCATAboutXML() { - var doc = atv.parseXML( JCATAboutXML ); - - console.log( "Creating the view --> " ); - DomViewManager.createView( "JcatAboutView" ); - - console.log( "Loading the view --> " ); - DomViewManager.loadView( "JcatAboutView", doc ); - - console.log( "View is loaded" ); -} \ No newline at end of file diff --git a/app/js/jcathostinfo.js b/app/js/jcathostinfo.js index 71d3511..5727b58 100644 --- a/app/js/jcathostinfo.js +++ b/app/js/jcathostinfo.js @@ -7,6 +7,7 @@ var JCATHOSTInfoXML = '\n' + '\n' + ' \n' + + '