Changed date format in log

nasa · Aug 24, 2021 · 8dec013 · 8dec013
1 parent 06cefb4
commit 8dec013
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ Recommended specs:
 
 The standard installation of PuMA is performed using conda as:
 
-    conda create -n puma conda-forge::puma
+    conda create -yn puma conda-forge::puma
 
 This installs the PuMA C++ library, pumapy python package and GUI in a conda environment called "puma". 
 PuMA relies on a conda environment in order to manage its software dependencies and environment variables.

diff --git a/cpp/src/utilities/logger/logger.cpp b/cpp/src/utilities/logger/logger.cpp
@@ -30,7 +30,7 @@ bool puma::Logger::generateRunFolder() {
 
         generateFolderName();
 
-        std::cout << "Run folder generated at: " << folderName << std::endl;
+        std::cout << "Logs folder generated at: " << folderName << std::endl;
         return generateDirectory(folderName);
 }
 
@@ -44,41 +44,50 @@ bool puma::Logger::generateRunFolder(std::string folderLabel) {
 }
 
 void puma::Logger::generateFolderName() {
-    time_t now = time(0);
-    char* dt = ctime(&now);
-    std::string s = dt;
-    s = replaceAll(s," ", "_");
-    s = replaceAll(s,"\n","");
-    s = replaceAll(s,"Mon_", "");
-    s = replaceAll(s,"Tue_", "");
-    s = replaceAll(s,"Wed_", "");
-    s = replaceAll(s,"Thu_", "");
-    s = replaceAll(s,"Fri_", "");
-    s = replaceAll(s,"Sat_", "");
-    s = replaceAll(s,"Sun_", "");
-    s = replaceAll(s,"Jan", "01");
-    s = replaceAll(s,"Feb", "02");
-    s = replaceAll(s,"Mar", "03");
-    s = replaceAll(s,"Apr", "04");
-    s = replaceAll(s,"May", "05");
-    s = replaceAll(s,"Jun", "06");
-    s = replaceAll(s,"Jul", "07");
-    s = replaceAll(s,"Aug", "08");
-    s = replaceAll(s,"Sep", "09");
-    s = replaceAll(s,"Oct", "10");
-    s = replaceAll(s,"Nov", "11");
-    s = replaceAll(s,"Dec", "12");
-
+
     char buff[FILENAME_MAX]; //create string buffer to hold path
     GetCurrentDir( buff, FILENAME_MAX );
     std::string current_working_dir(buff);
 
     folderName = current_working_dir;
-    folderName.append("/logs/PuMA_Run_");
-    folderName.append(s);
+    folderName.append("/logs");
 
     logLocation = folderName;
-    logLocation.append("/log.txt");
+    logLocation.append("/puma_log_");
+
+    time_t now = time(0);
+    tm *ltm = localtime(&now);
+
+    std::string s;
+    s.append(std::to_string(1900 + ltm->tm_year));
+    if (std::to_string(1+ltm->tm_mon).length() == 1){
+        s.append("0" + std::to_string(1+ltm->tm_mon));
+    } else {
+        s.append(std::to_string(1+ltm->tm_mon));
+    }
+    if (std::to_string(ltm->tm_mday).length() == 1){
+        s.append("0" + std::to_string(ltm->tm_mday));
+    } else {
+        s.append(std::to_string(ltm->tm_mday));
+    }
+    s.append("_");
+    if (std::to_string(ltm->tm_hour).length() == 1){
+        s.append("0" + std::to_string(ltm->tm_hour));
+    } else {
+        s.append(std::to_string(ltm->tm_hour));
+    }
+    if (std::to_string(ltm->tm_min).length() == 1){
+        s.append("0" + std::to_string(ltm->tm_min));
+    } else {
+        s.append(std::to_string(ltm->tm_min));
+    }
+    if (std::to_string(ltm->tm_sec).length() == 1){
+        s.append("0" + std::to_string(ltm->tm_sec));
+    } else {
+        s.append(std::to_string(ltm->tm_sec));
+    }
+    logLocation.append(s);
+    logLocation.append(".txt");   
 }
 
 bool puma::Logger::generateDirectory(std::string directoryPath) {

diff --git a/python/pumapy/utilities/logger.py b/python/pumapy/utilities/logger.py
@@ -29,8 +29,12 @@ def __init__(self):
             os.mkdir('logs')
 
         now = datetime.datetime.now()
-        self.location = "logs/pumapy_log_" + str(now.year) + "_" + str(now.month) + "_" + str(now.day) + "_" + \
-            str(now.hour) + "_" + str(now.minute) + "_" + str(now.second) + ".txt"
+        month = str(now.month) if len(str(now.month)) == 2 else "0" + str(now.month)
+        day = str(now.day) if len(str(now.day)) == 2 else "0" + str(now.day)
+        hour = str(now.hour) if len(str(now.hour)) == 2 else "0" + str(now.hour)
+        minute = str(now.minute) if len(str(now.minute)) == 2 else "0" + str(now.minute)
+        second = str(now.second) if len(str(now.second)) == 2 else "0" + str(now.second)
+        self.location = "logs/pumapy_log_" + str(now.year) + month + day + "_" + hour + minute + second + ".txt"
 
     def set_location(self, location):
         self.location = location