diff --git a/app.go b/app.go
index 431d221..ab0e1ee 100644
--- a/app.go
+++ b/app.go
@@ -91,39 +91,53 @@ func displayHelp() {
}
func displayCinfo() {
- // Current config information, also so I can see what the actual value is
+ var dnsStatus string
+ var webStatus string
+
+ if config.DnsServEN {
+ dnsStatus = "Enabled"
+ } else {
+ dnsStatus = "Disabled"
+ }
+
+ if config.WebServEN {
+ webStatus = "Enabled"
+ } else {
+ webStatus = "Disabled"
+ }
+
fmt.Println()
- fmt.Println("=========== JellyCAT Config =============")
- fmt.Println("| Current config & Information: |")
- fmt.Println("=========================================")
- fmt.Println("| *** Services *** |")
- fmt.Println("| |")
- fmt.Println("| DNS SERVER : Enabled |") // nice static print, nerd hehehe
- fmt.Println("| WEB SERVER : Enabled |")
- fmt.Println("| |")
- fmt.Println("| *** Current Config *** |")
- 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("| 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("| |")
- fmt.Println("| *** CERTGEN *** |")
- fmt.Println("| |")
- fmt.Println("| common_name = ", config.CertName, " |")
- fmt.Println("| |")
- fmt.Println("=========================================")
- fmt.Println("| go to brain.seppjm.com/# |")
- fmt.Println("| for more information & example cfg |")
- fmt.Println("=========================================")
+ fmt.Println("============ JellyCAT Config =============")
+ fmt.Println("| Current config & Information: |")
+ fmt.Println("==========================================")
+ fmt.Println("| *** Services *** |")
+ fmt.Println("| |")
+ fmt.Println("| DNS SERVER :", dnsStatus, " |")
+ fmt.Println("| WEB SERVER :", webStatus, " |")
+ fmt.Println("| |")
+ fmt.Println("| *** Current Config *** |")
+ 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("| 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("| |")
+ fmt.Println("| *** CERTGEN *** |")
+ fmt.Println("| |")
+ fmt.Println("| common_name = ", config.CertName, " |")
+ fmt.Println("| |")
+ fmt.Println("==========================================")
+ fmt.Println("| https://github.com/SEPPDROID/JellyCAT |")
+ fmt.Println("| for more information & example cfg |")
+ fmt.Println("==========================================")
fmt.Println()
fmt.Println()
}
diff --git a/app/js/jellyfin-setup.js b/app/js/jellyfin-setup.js
index 3d72694..e8be6fd 100644
--- a/app/js/jellyfin-setup.js
+++ b/app/js/jellyfin-setup.js
@@ -207,9 +207,11 @@ function authenticateJellyfin(){
// Extracting ServerId and AccessToken
var serverId = responseJson.ServerId;
var accessToken = responseJson.AccessToken;
+ var userID = responseJson.SessionInfo.UserId;
// Storing ServerId and AccessToken in atv storage
atv.localStorage['jellyfin_serverid'] = serverId;
atv.localStorage['jellyfin_authtoken'] = accessToken;
+ atv.localStorage['jellyfin_user_id'] = userID;
atv.localStorage['jellyfin_loggedin'] = '1';
showAuthSuccessScreen();
} else {
diff --git a/app/js/search.js b/app/js/search.js
index 242b0b5..fa5ed3b 100644
--- a/app/js/search.js
+++ b/app/js/search.js
@@ -25,7 +25,7 @@ function renderSearchScreen() {
' Search' +
' ' +
' ' +
- ' ' +
+ ' http://jcathost.dns/xml/sni.xml?s=' +
' ' +
' ' +
'';
diff --git a/app/js/storagetest.js b/app/js/storagetest.js
index 29cb404..aa15b75 100644
--- a/app/js/storagetest.js
+++ b/app/js/storagetest.js
@@ -20,7 +20,7 @@ function printSessionStorage() {
function printLocalStorage() {
console.log("======== Printing ATV Local storage ===========")
- var keys = ['test', 'jellyfin_server_address', 'jellyfin_username', 'jellyfin_password', 'jellyfin_serverid', 'jellyfin_authtoken', 'jellyfin_loggedin'];
+ var keys = ['test', 'jellyfin_server_address', 'jellyfin_username', 'jellyfin_password', 'jellyfin_serverid', 'jellyfin_authtoken', 'jellyfin_loggedin', 'jellyfin_user_id'];
keys.forEach(function(key) {
var value = atv.localStorage.getItem(key);
diff --git a/app/xml/sni.xml b/app/xml/sni.xml
new file mode 100644
index 0000000..937edf6
--- /dev/null
+++ b/app/xml/sni.xml
@@ -0,0 +1,25 @@
+
+