Minor changes
This commit is contained in:
@@ -15,13 +15,11 @@ GOVERNMENT.
|
||||
|
||||
UNPUBLISHED WORK - COPYRIGHT RAYTHEON COMPANY.
|
||||
-------------------------------------------------------------------------*/
|
||||
using Raytheon.Common;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using Raytheon.Common;
|
||||
using System.Reflection;
|
||||
|
||||
namespace ProgramLib
|
||||
{
|
||||
@@ -44,9 +42,9 @@ namespace ProgramLib
|
||||
{
|
||||
_programConfig = programConfig;
|
||||
|
||||
buildFolders();
|
||||
createFolders();
|
||||
buildFiles();
|
||||
ConstructFolderPaths();
|
||||
CreateFolders();
|
||||
ConstructFilePaths();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -54,16 +52,18 @@ namespace ProgramLib
|
||||
/// </summary>
|
||||
/// <param name="iniObj"></param>
|
||||
/// <returns></returns>
|
||||
private void buildFolders()
|
||||
private void ConstructFolderPaths()
|
||||
{
|
||||
string dataBasePath = _programConfig.ReadValue(ProgramConfigIni.GENERAL.ToString(), ProgramConfigIni.DATA_BASE_PATH.ToString(), "NOT SET");
|
||||
foldersDict[Folders.DATA] = dataBasePath;
|
||||
string assemblyFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
|
||||
|
||||
string dataRootPath = _programConfig.ReadValue(ProgramConfigIni.GENERAL.ToString(), ProgramConfigIni.DATA_BASE_PATH.ToString(), "NOT SET");
|
||||
if (!Path.IsPathRooted(dataRootPath))
|
||||
dataRootPath = Path.Combine(assemblyFolder, dataRootPath);
|
||||
|
||||
foldersDict[Folders.DATA] = Path.GetFullPath(dataRootPath);
|
||||
|
||||
string val = _programConfig.ReadValue(ProgramConfigIni.GENERAL.ToString(), ProgramConfigIni.DATA_TEMP_PATH.ToString(), "NOT SET");
|
||||
foldersDict[Folders.DATA_TEMP] = Path.Combine(dataBasePath, val);
|
||||
|
||||
string appBasePath = _programConfig.ReadValue(ProgramConfigIni.GENERAL.ToString(), ProgramConfigIni.APP_BASE_PATH.ToString(), "NOT SET");
|
||||
foldersDict[Folders.APP] = dataBasePath;
|
||||
foldersDict[Folders.DATA_TEMP] = Path.Combine(dataRootPath, val);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -71,7 +71,7 @@ namespace ProgramLib
|
||||
/// </summary>
|
||||
/// <param name="iniObj"></param>
|
||||
/// <returns></returns>
|
||||
private void createFolders()
|
||||
private void CreateFolders()
|
||||
{
|
||||
Directory.CreateDirectory(foldersDict[Folders.DATA_TEMP]);
|
||||
}
|
||||
@@ -81,7 +81,7 @@ namespace ProgramLib
|
||||
/// </summary>
|
||||
/// <param name="iniObj"></param>
|
||||
/// <returns></returns>
|
||||
private void buildFiles()
|
||||
private void ConstructFilePaths()
|
||||
{
|
||||
string val = _programConfig.ReadValue(ProgramConfigIni.GENERAL.ToString(), ProgramConfigIni.POWER_SUPPLY_SELF_TEST_DATETIME.ToString(), "NOT SET");
|
||||
filesDict[Files.POWER_SUPPLY_SELF_TEST_DATETIME] = Path.Combine(foldersDict[Folders.DATA_TEMP], val);
|
||||
|
||||
Reference in New Issue
Block a user