Skip to content
This repository was archived by the owner on Jan 22, 2024. It is now read-only.

Commit 1d20d2d

Browse files
committed
Save settings in a new directory
1 parent 4cdc01d commit 1d20d2d

3 files changed

Lines changed: 28 additions & 6 deletions

File tree

digexp-dashboard/js/dashConfig.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ var dashConfig = (function(){
3030
var fs = require('fs');
3131
var data = fs.readFileSync('./dashboard-config.json', 'utf8');
3232
configInfo = JSON.parse(data);
33-
if(fs.existsSync('./user-settings.json')){
34-
var data = fs.readFileSync('./user-settings.json', 'utf8');
33+
if(fs.existsSync(utils.getUserSettingsName())){
34+
var data = fs.readFileSync(utils.getUserSettingsName(), 'utf8');
3535
var userConfig = JSON.parse(data);
3636
// Copy settings
3737
userConfig.servers.forEach(function(server){

digexp-dashboard/js/settings.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@ var settings = (function() {
3434
} catch (e) {}
3535

3636
// update user-settings.json
37-
fs.writeFileSync('./user-settings.json', JSON.stringify(configInfo, null, 4));
37+
fs.writeFileSync(utils.getUserSettingsName(), JSON.stringify(configInfo, null, 4));
3838
dashConfig.clearConfig();
3939
},
4040
setSettings: function(newSettings) {
4141
var configInfo = dashConfig.getConfigInfo();
4242

43-
fs.exists("./user-settings.json", function (exists) {
43+
fs.exists(utils.getUserSettingsName(), function (exists) {
4444
if (exists) {
4545
utils.copyProperties(newSettings, configInfo);
46-
fs.writeFile("./user-settings.json", JSON.stringify(configInfo, null, ' '));
46+
fs.writeFile(utils.getUserSettingsName(), JSON.stringify(configInfo, null, ' '));
4747
}
4848
});
4949
}

digexp-dashboard/js/utils.js

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ var getModified = function(dirName, dateString, ignore, callback){
101101

102102
var utils = utils || {};
103103

104-
104+
var userHome = getUserHome();
105+
var settingsFileName;
105106
// Copy the properties of a onto b
106107
utils.copyProperties = function(a, b) {
107108
for (var key in a) {
@@ -114,6 +115,27 @@ utils.copyProperties = function(a, b) {
114115
}
115116
};
116117

118+
// get the user settings file name
119+
utils.getUserSettingsName = function(){
120+
if(settingsFileName)
121+
return settingsFileName;
122+
var Path = require('path');
123+
if(userHome.length != 0){
124+
// make sure the path ends in a path separator
125+
if(userHome.lastIndexOf(Path.sep) != userHome.length -1)
126+
userHome += Path.sep;
127+
}
128+
else
129+
userHome = '.' + Path.sep;
130+
settingsFileName = userHome + 'user-settings.json';
131+
return settingsFileName;
132+
};
133+
134+
function getUserHome() {
135+
return process.env[(process.platform == 'win32') ? 'USERPROFILE' : 'HOME'];
136+
}
137+
138+
117139
utils.debugLogger = debugLogger;
118140
utils.encrypt = encrypt;
119141
utils.decrypt = decrypt;

0 commit comments

Comments
 (0)