Bugfixes and pretty print for json

Malte311 · Malte311 · commit a3c0977ddaa8 · 2020-01-03T17:59:05.000+01:00
diff --git a/scripts/JSONhandler.js b/scripts/JSONhandler.js
@@ -68,7 +68,7 @@ function initStorage() {
     }
     // File does not exist: Create it and write default values in it.
     else {
-        fs.appendFileSync( mainStoragePath, JSON.stringify( defaultStorageObj ) );
+        fs.appendFileSync( mainStoragePath, JSON.stringify( defaultStorageObj, null, 4 ) );
     }
 }
 
@@ -117,7 +117,7 @@ function readPreference( name ) {
     }
     // File does not exist: Create it, write default values and return a default value.
     else {
-        fs.appendFileSync( settingsPath, JSON.stringify( defaultObj ) );
+        fs.appendFileSync( settingsPath, JSON.stringify( defaultObj, null, 4 ) );
         return defaultObj[name];
     }
 }
@@ -135,17 +135,17 @@ function storePreference( name, value ) {
     if ( fs.existsSync( settingsPath ) ) {
         var settingsObj = JSON.parse( fs.readFileSync( settingsPath ) );
         settingsObj[name] = value;
-        fs.writeFileSync( settingsPath, JSON.stringify( settingsObj ) );
+        fs.writeFileSync( settingsPath, JSON.stringify( settingsObj, null, 4 ) );
     }
     // File does not exist: Create it and write default values in it.
     // When done, we can set the value.
     else {
         // Create default file.
-        fs.appendFileSync( settingsPath, JSON.stringify( defaultObj ) );
+        fs.appendFileSync( settingsPath, JSON.stringify( defaultObj, null, 4 ) );
         // Change the value of the specified field.
         var settingsObj = JSON.parse( fs.readFileSync( settingsPath ) );
         settingsObj[name] = value;
-        fs.writeFileSync( settingsPath, JSON.stringify( settingsObj ) );
+        fs.writeFileSync( settingsPath, JSON.stringify( settingsObj, null, 4 ) );
     }
 }
 
@@ -168,7 +168,7 @@ function readMainStorage( field ) {
     }
     // File does not exist: Create it, write default values and return a default value.
     else {
-        fs.appendFileSync( mainStoragePath, JSON.stringify( defaultStorageObj ) );
+        fs.appendFileSync( mainStoragePath, JSON.stringify( defaultStorageObj, null, 4 ) );
         return defaultStorageObj[field];
     }
 }
@@ -183,17 +183,17 @@ function writeMainStorage( field, value ) {
     if ( fs.existsSync( mainStoragePath ) ) {
         var mainStorageObj = JSON.parse( fs.readFileSync( mainStoragePath ) );
         mainStorageObj[field] = value;
-        fs.writeFileSync( mainStoragePath, JSON.stringify( mainStorageObj ) );
+        fs.writeFileSync( mainStoragePath, JSON.stringify( mainStorageObj, null, 4 ) );
     }
     // File does not exist: Create it and write default values in it.
     // When done, we can set the value.
     else {
         // Create default file.
-        fs.appendFileSync( mainStoragePath, JSON.stringify( defaultStorageObj ) );
+        fs.appendFileSync( mainStoragePath, JSON.stringify( defaultStorageObj, null, 4 ) );
         // Change the value of the specified field.
         var mainStorageObj = JSON.parse( fs.readFileSync( mainStoragePath ) );
         mainStorageObj[field] = value;
-        fs.writeFileSync( mainStoragePath, JSON.stringify( mainStorageObj ) );
+        fs.writeFileSync( mainStoragePath, JSON.stringify( mainStorageObj, null, 4 ) );
     }
 }
 
@@ -237,17 +237,35 @@ function getData( file, quest ) {
                 else {
                     // At least one param matched? Return true (ret=true) because connector is "or".
                     if ( quest.connector === "or" ) {
-                        if ( dat[qu[0]] === qu[1] ) {
-                            ret = true;
-                            return true;
-                        }
+						if (qu[0] === "budget") { // Handle multiple budgets like "b1, b2, b3"
+							let budgets = dat[qu[0]].split(",");
+							ret = budgets.some((value, index, array) => {
+								return value.trim() === qu[1];
+							});
+							
+							if (ret) return true;
+						} else {
+							if ( dat[qu[0]] === qu[1] ) {
+								ret = true;
+								return true;
+							}
+						}
                     }
                     // One param does not match => "and" connector can not be satisfied (ret=false).
                     else {
-                        if ( dat[qu[0]] !== qu[1] ) {
-                            ret = false;
-                            return true;
-                        }
+						if (qu[0] === "budget") { // Handle multiple budgets like "b1, b2, b3"
+							let budgets = dat[qu[0]].split(",");
+							ret = !budgets.every((value, index, array) => {
+								return value.trim() !== qu[1];
+							});
+
+							if (!ret) return true;
+						} else {
+							if ( dat[qu[0]] !== qu[1] ) {
+								ret = false;
+								return true;
+							}
+						}
                     }
                 }
             });
@@ -348,12 +366,12 @@ function storeData( data ) {
         content.push( data );
         // Sort the data (oldest data first).
         content = sortData( content );
-        fs.writeFileSync( dataPath, JSON.stringify( content ) );
+        fs.writeFileSync( dataPath, JSON.stringify( content, null, 4 ) );
     }
     // File does not exist: Create it and write the data in it.
     else {
         // The content is an array containing JSON objects.
-        fs.appendFileSync( dataPath, "[" + JSON.stringify( data ) + "]" );
+        fs.appendFileSync( dataPath, "[" + JSON.stringify( data, null, 4 ) + "]" );
     }
 }
 
@@ -366,11 +384,11 @@ function replaceData( file, data ) {
     var dataPath = readPreference( "path" ) + path.sep + file;
     // File exists: Overwrite the data in it.
     if ( fs.existsSync( dataPath ) ) {
-        fs.writeFileSync( dataPath, JSON.stringify( data ) );
+        fs.writeFileSync( dataPath, JSON.stringify( data, null, 4 ) );
     }
     // File does not exist: Create it and write the data in it.
     else {
-        fs.appendFileSync( dataPath, JSON.stringify( data ) );
+        fs.appendFileSync( dataPath, JSON.stringify( data, null, 4 ) );
     }
 }
 
@@ -415,7 +433,7 @@ function deleteData( file, data ) {
                                   "allTimeSpendings", allTimeTransactions );
             }
         }
-        fs.writeFileSync( dataPath, JSON.stringify( newContent ) );
+        fs.writeFileSync( dataPath, JSON.stringify( newContent, null, 4 ) );
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ function initStorage() {`
`68`	`68`	`}`
`69`	`69`	`// File does not exist: Create it and write default values in it.`
`70`	`70`	`else {`
`71`		`- fs.appendFileSync( mainStoragePath, JSON.stringify( defaultStorageObj ) );`
	`71`	`+ fs.appendFileSync( mainStoragePath, JSON.stringify( defaultStorageObj, null, 4 ) );`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
`@@ -117,7 +117,7 @@ function readPreference( name ) {`
`117`	`117`	`}`
`118`	`118`	`// File does not exist: Create it, write default values and return a default value.`
`119`	`119`	`else {`
`120`		`- fs.appendFileSync( settingsPath, JSON.stringify( defaultObj ) );`
	`120`	`+ fs.appendFileSync( settingsPath, JSON.stringify( defaultObj, null, 4 ) );`
`121`	`121`	`return defaultObj[name];`
`122`	`122`	`}`
`123`	`123`	`}`
`@@ -135,17 +135,17 @@ function storePreference( name, value ) {`
`135`	`135`	`if ( fs.existsSync( settingsPath ) ) {`
`136`	`136`	`var settingsObj = JSON.parse( fs.readFileSync( settingsPath ) );`
`137`	`137`	`settingsObj[name] = value;`
`138`		`- fs.writeFileSync( settingsPath, JSON.stringify( settingsObj ) );`
	`138`	`+ fs.writeFileSync( settingsPath, JSON.stringify( settingsObj, null, 4 ) );`
`139`	`139`	`}`
`140`	`140`	`// File does not exist: Create it and write default values in it.`
`141`	`141`	`// When done, we can set the value.`
`142`	`142`	`else {`
`143`	`143`	`// Create default file.`
`144`		`- fs.appendFileSync( settingsPath, JSON.stringify( defaultObj ) );`
	`144`	`+ fs.appendFileSync( settingsPath, JSON.stringify( defaultObj, null, 4 ) );`
`145`	`145`	`// Change the value of the specified field.`
`146`	`146`	`var settingsObj = JSON.parse( fs.readFileSync( settingsPath ) );`
`147`	`147`	`settingsObj[name] = value;`
`148`		`- fs.writeFileSync( settingsPath, JSON.stringify( settingsObj ) );`
	`148`	`+ fs.writeFileSync( settingsPath, JSON.stringify( settingsObj, null, 4 ) );`
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`
`@@ -168,7 +168,7 @@ function readMainStorage( field ) {`
`168`	`168`	`}`
`169`	`169`	`// File does not exist: Create it, write default values and return a default value.`
`170`	`170`	`else {`
`171`		`- fs.appendFileSync( mainStoragePath, JSON.stringify( defaultStorageObj ) );`
	`171`	`+ fs.appendFileSync( mainStoragePath, JSON.stringify( defaultStorageObj, null, 4 ) );`
`172`	`172`	`return defaultStorageObj[field];`
`173`	`173`	`}`
`174`	`174`	`}`
`@@ -183,17 +183,17 @@ function writeMainStorage( field, value ) {`
`183`	`183`	`if ( fs.existsSync( mainStoragePath ) ) {`
`184`	`184`	`var mainStorageObj = JSON.parse( fs.readFileSync( mainStoragePath ) );`
`185`	`185`	`mainStorageObj[field] = value;`
`186`		`- fs.writeFileSync( mainStoragePath, JSON.stringify( mainStorageObj ) );`
	`186`	`+ fs.writeFileSync( mainStoragePath, JSON.stringify( mainStorageObj, null, 4 ) );`
`187`	`187`	`}`
`188`	`188`	`// File does not exist: Create it and write default values in it.`
`189`	`189`	`// When done, we can set the value.`
`190`	`190`	`else {`
`191`	`191`	`// Create default file.`
`192`		`- fs.appendFileSync( mainStoragePath, JSON.stringify( defaultStorageObj ) );`
	`192`	`+ fs.appendFileSync( mainStoragePath, JSON.stringify( defaultStorageObj, null, 4 ) );`
`193`	`193`	`// Change the value of the specified field.`
`194`	`194`	`var mainStorageObj = JSON.parse( fs.readFileSync( mainStoragePath ) );`
`195`	`195`	`mainStorageObj[field] = value;`
`196`		`- fs.writeFileSync( mainStoragePath, JSON.stringify( mainStorageObj ) );`
	`196`	`+ fs.writeFileSync( mainStoragePath, JSON.stringify( mainStorageObj, null, 4 ) );`
`197`	`197`	`}`
`198`	`198`	`}`
`199`	`199`
`@@ -237,17 +237,35 @@ function getData( file, quest ) {`
`237`	`237`	`else {`
`238`	`238`	`// At least one param matched? Return true (ret=true) because connector is "or".`
`239`	`239`	`if ( quest.connector === "or" ) {`
`240`		`- if ( dat[qu[0]] === qu[1] ) {`
`241`		`- ret = true;`
`242`		`- return true;`
`243`		`- }`
	`240`	`+ if (qu[0] === "budget") { // Handle multiple budgets like "b1, b2, b3"`
	`241`	`+ let budgets = dat[qu[0]].split(",");`
	`242`	`+ ret = budgets.some((value, index, array) => {`
	`243`	`+ return value.trim() === qu[1];`
	`244`	`+ });`
	`245`	`+`
	`246`	`+ if (ret) return true;`
	`247`	`+ } else {`
	`248`	`+ if ( dat[qu[0]] === qu[1] ) {`
	`249`	`+ ret = true;`
	`250`	`+ return true;`
	`251`	`+ }`
	`252`	`+ }`
`244`	`253`	`}`
`245`	`254`	`// One param does not match => "and" connector can not be satisfied (ret=false).`
`246`	`255`	`else {`
`247`		`- if ( dat[qu[0]] !== qu[1] ) {`
`248`		`- ret = false;`
`249`		`- return true;`
`250`		`- }`
	`256`	`+ if (qu[0] === "budget") { // Handle multiple budgets like "b1, b2, b3"`
	`257`	`+ let budgets = dat[qu[0]].split(",");`
	`258`	`+ ret = !budgets.every((value, index, array) => {`
	`259`	`+ return value.trim() !== qu[1];`
	`260`	`+ });`
	`261`	`+`
	`262`	`+ if (!ret) return true;`
	`263`	`+ } else {`
	`264`	`+ if ( dat[qu[0]] !== qu[1] ) {`
	`265`	`+ ret = false;`
	`266`	`+ return true;`
	`267`	`+ }`
	`268`	`+ }`
`251`	`269`	`}`
`252`	`270`	`}`
`253`	`271`	`});`
`@@ -348,12 +366,12 @@ function storeData( data ) {`
`348`	`366`	`content.push( data );`
`349`	`367`	`// Sort the data (oldest data first).`
`350`	`368`	`content = sortData( content );`
`351`		`- fs.writeFileSync( dataPath, JSON.stringify( content ) );`
	`369`	`+ fs.writeFileSync( dataPath, JSON.stringify( content, null, 4 ) );`
`352`	`370`	`}`
`353`	`371`	`// File does not exist: Create it and write the data in it.`
`354`	`372`	`else {`
`355`	`373`	`// The content is an array containing JSON objects.`
`356`		`- fs.appendFileSync( dataPath, "[" + JSON.stringify( data ) + "]" );`
	`374`	`+ fs.appendFileSync( dataPath, "[" + JSON.stringify( data, null, 4 ) + "]" );`
`357`	`375`	`}`
`358`	`376`	`}`
`359`	`377`
`@@ -366,11 +384,11 @@ function replaceData( file, data ) {`
`366`	`384`	`var dataPath = readPreference( "path" ) + path.sep + file;`
`367`	`385`	`// File exists: Overwrite the data in it.`
`368`	`386`	`if ( fs.existsSync( dataPath ) ) {`
`369`		`- fs.writeFileSync( dataPath, JSON.stringify( data ) );`
	`387`	`+ fs.writeFileSync( dataPath, JSON.stringify( data, null, 4 ) );`
`370`	`388`	`}`
`371`	`389`	`// File does not exist: Create it and write the data in it.`
`372`	`390`	`else {`
`373`		`- fs.appendFileSync( dataPath, JSON.stringify( data ) );`
	`391`	`+ fs.appendFileSync( dataPath, JSON.stringify( data, null, 4 ) );`
`374`	`392`	`}`
`375`	`393`	`}`
`376`	`394`
`@@ -415,7 +433,7 @@ function deleteData( file, data ) {`
`415`	`433`	`"allTimeSpendings", allTimeTransactions );`
`416`	`434`	`}`
`417`	`435`	`}`
`418`		`- fs.writeFileSync( dataPath, JSON.stringify( newContent ) );`
	`436`	`+ fs.writeFileSync( dataPath, JSON.stringify( newContent, null, 4 ) );`
`419`	`437`	`}`
`420`	`438`	`}`
`421`	`439`