Fix for some data not updating

Xeue · Sep 3, 2023 · 5a3dce7 · 5a3dce7
1 parent b14b746
commit 5a3dce7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homestudio-remote",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "description": "Homestudio for on-site production",
   "main": "server.js",
   "scripts": {

diff --git a/server.js b/server.js
@@ -401,7 +401,7 @@ function expressRoutes(expressApp) {
 	expressApp.use(express.json());
 	expressApp.use(express.static(__static));
 
-	const homeOptions = {
+	function getHomeOptions() {return {
 		systemName: config.get('systemName'),
 		version: version,
 		homestudioKey: config.get('homestudioKey'),
@@ -412,11 +412,12 @@ function expressRoutes(expressApp) {
 		dockerCommand: dockerCommand,
 		reconnectTimeoutSeconds: config.get('reconnectTimeoutSeconds'),
 		allowLowres: config.get('allowLowres')
-	}
+	}}
 
 	expressApp.get('/',  (req, res) =>  {
 		logger.log('New client connected', 'A');
 		res.header('Content-type', 'text/html');
+		const homeOptions = getHomeOptions();
 		homeOptions.config = false;
 		homeOptions.layout = config.get('defaultLayout');
 		homeOptions.inApp = false;
@@ -425,6 +426,7 @@ function expressRoutes(expressApp) {
 	expressApp.get('/config',  (req, res) =>  {
 		logger.log('New client connected', 'A');
 		res.header('Content-type', 'text/html');
+		const homeOptions = getHomeOptions();
 		homeOptions.config = true;
 		homeOptions.layout = "thumbnail";
 		homeOptions.inApp = false;
@@ -433,6 +435,7 @@ function expressRoutes(expressApp) {
 	expressApp.get('/advanced',  (req, res) =>  {
 		logger.log('New client connected', 'A');
 		res.header('Content-type', 'text/html');
+		const homeOptions = getHomeOptions();
 		homeOptions.config = false;
 		homeOptions.layout = "advanced";
 		homeOptions.inApp = false;
@@ -441,6 +444,7 @@ function expressRoutes(expressApp) {
 	expressApp.get('/basic',  (req, res) =>  {
 		logger.log('New client connected', 'A');
 		res.header('Content-type', 'text/html');
+		const homeOptions = getHomeOptions();
 		homeOptions.config = false;
 		homeOptions.layout = "basic";
 		homeOptions.inApp = false;
@@ -449,6 +453,7 @@ function expressRoutes(expressApp) {
 	expressApp.get('/thumbnails',  (req, res) =>  {
 		logger.log('New client connected', 'A');
 		res.header('Content-type', 'text/html');
+		const homeOptions = getHomeOptions();
 		homeOptions.config = false;
 		homeOptions.layout = "thumbnail";
 		homeOptions.inApp = false;
@@ -457,6 +462,7 @@ function expressRoutes(expressApp) {
 	expressApp.get('/app',  (req, res) =>  {
 		logger.log('New client connected', 'A');
 		res.header('Content-type', 'text/html');
+		const homeOptions = getHomeOptions();
 		homeOptions.config = true;
 		homeOptions.layout = "thumbnail";
 		homeOptions.inApp = true;
@@ -674,17 +680,17 @@ function loadData(file) {
 							"colEnd": 1
 						},
 						"2": {
-							"rowStart": 2,
-							"rowEnd": 2,
-							"colStart": 1,
-							"colEnd": 1
-						},
-						"3": {
 							"rowStart": 1,
 							"rowEnd": 1,
 							"colStart": 2,
 							"colEnd": 2
 						},
+						"3": {
+							"rowStart": 2,
+							"rowEnd": 2,
+							"colStart": 1,
+							"colEnd": 1
+						},
 						"4": {
 							"rowStart": 2,
 							"rowEnd": 2,