refactor to be more readable (#65)

This commit is contained in:
Lynn 2017-04-24 12:51:35 -07:00 committed by GitHub
parent db6736491c
commit a9bcb275b1

View File

@ -24,21 +24,27 @@ var symphonyRegistryHKLM6432 = new Registry({
*/ */
var getRegistry = function (name) { var getRegistry = function (name) {
var promise = new Promise(function(resolve, reject) { var promise = new Promise(function(resolve, reject) {
if (isMac){ if (isMac) {
reject('Mac OS. Using default url from config.json.'); reject('registry is not supported for mac osx.');
} else{ return;
}
//Try to get registry on HKEY_CURRENT_USER //Try to get registry on HKEY_CURRENT_USER
symphonyRegistryHKCU.get( name, function( err1, reg1 ) { symphonyRegistryHKCU.get( name, function( err1, reg1 ) {
if ( !err1 && reg1!==null && reg1.value) { if (!err1 && reg1 !==null && reg1.value) {
resolve(reg1.value); resolve(reg1.value);
} else{ return;
}
//Try to get registry on HKEY_LOCAL_MACHINE //Try to get registry on HKEY_LOCAL_MACHINE
symphonyRegistryHKLM.get( name, function( err2, reg2 ) { symphonyRegistryHKLM.get( name, function( err2, reg2 ) {
if ( !err2 && reg2!==null && reg2.value) { if ( !err2 && reg2!==null && reg2.value) {
resolve(reg2.value); resolve(reg2.value);
} else{ return;
//Try to get registry on HKEY_LOCAL_MACHINE in case 32bit app installed on 64bit system. }
//winreg does not merge keys as normally windows does.
// Try to get registry on HKEY_LOCAL_MACHINE in case 32bit app installed on 64bit system.
// winreg does not merge keys as normally windows does.
symphonyRegistryHKLM6432.get( name, function( err3, reg3 ) { symphonyRegistryHKLM6432.get( name, function( err3, reg3 ) {
if ( !err3 && reg3!==null && reg3.value) { if ( !err3 && reg3!==null && reg3.value) {
resolve(reg3.value); resolve(reg3.value);
@ -46,12 +52,10 @@ var getRegistry = function (name) {
reject('Cannot find PodUrl Registry. Using default url.'); reject('Cannot find PodUrl Registry. Using default url.');
} }
}); });
}
}); });
}
}); });
}
}); });
return promise; return promise;
} }