Made changes for issue #20 - Modify how 'override' argument is implemented

* Implemented getOutputFileModifiedDate() function to get the modified date of an embedded file.
* Modified logic in main.cpp to follow issue #20 suggested behavior.

Author: end2endzone

src/BaseGenerator.cpp

@@ -48,14 +48,14 @@ namespace bin2cpp
   std::string BaseGenerator::getFileHeading(const char * iInputFilename)
   {
     std::string filename = getFilename(iInputFilename);
-    uint64_t fileDateModified = getFileModifiedDate(iInputFilename);
+    uint64_t lastModifiedDate = getFileModifiedDate(iInputFilename);
 
     std::string header;
     header << 
     header << "/**\n";
     header << " * This file was generated by bin2cpp v" << getVersionString() << "\n";
     header << " * Copyright (C) 2013-" << bin2cpp::getCopyrightYear() << " end2endzone.com. All rights reserved.\n";
-    header << " * Source code for file '" << filename << "', last modified " << fileDateModified << ".\n";
+    header << " * Source code for file '" << filename << "', last modified " << lastModifiedDate << ".\n";
     header << " * Do not modify this file.\n";
     header << " */\n";
     return header;

src/common.cpp

@@ -20,6 +20,33 @@
 
 namespace bin2cpp
 {
+  template <class T>
+  inline bool parseValueT (const std::string& str, T & t)
+  {
+    static const T ZERO = (T)0;
+    static const T MULTIPLIER = (T)10;
+    static const T SIGN_MULTIPLIER = (T)-1;
+    bool parseOK = false;
+    t = ZERO;
+    for(size_t i=0; i<str.size(); i++)
+    {
+      char c = str[i];
+      if (c >= '0' && c <= '9')
+      {
+        t *= MULTIPLIER;
+        c -= '0'; //convert character to numeric value
+        t += (T)c;
+        parseOK = true;
+      }
+      else if (c == '-')
+      {
+        t *= SIGN_MULTIPLIER;
+        parseOK = true;
+      }
+    }
+    return parseOK;
+  }
+
   //Note: http://www.parashift.com/c++-faq-lite/misc-technical-issues.html#faq-39.2
   template <class T>
   inline std::string toStringT (const T & t)
@@ -448,6 +475,43 @@ namespace bin2cpp
     return mod_time;
   }
 
+  uint64_t getOutputFileModifiedDate(const std::string & iPath)
+  {
+    uint64_t mod_time = 0;
+
+    FILE * f = fopen(iPath.c_str(), "r");
+    if (!f)
+      return mod_time;
+
+    //create buffer for each chunks from input buffer
+    static const size_t BUFFER_SIZE = 10240;
+    char buffer[BUFFER_SIZE];
+    while(/*!feof(f)*/ fgets(buffer, BUFFER_SIZE, f) != NULL )
+    {
+      //read a text line of the file
+      std::string text = buffer;
+
+      static const char * lastModifiedTag = "last modified";
+      size_t lastModifiedIndex = text.find(lastModifiedTag);
+      if (lastModifiedIndex != std::string::npos)
+      {
+        std::string date = text.substr(lastModifiedIndex);
+        strReplace(date, lastModifiedTag, "");
+        strReplace(date, " ", "");
+        strReplace(date, ".", "");
+
+        //parse date into mod_time
+        bool parseOK = parseValue(date, mod_time);
+        if (parseOK)
+          fclose(f); //force existing while loop
+      }
+    }
+
+    fclose(f);
+
+    return mod_time;
+  }
+
   std::string toString(const uint64_t & value)
   {
     return toStringT(value);
@@ -483,4 +547,9 @@ namespace bin2cpp
     return str;
   }
 
+  bool parseValue(const std::string& str, uint64_t & oValue)
+  {
+    return parseValueT(str, oValue);
+  }
+
 }; //bin2cpp

src/common.h

@@ -160,6 +160,13 @@ namespace bin2cpp
   ///<return>Returns the modified date of the given file.<return>
   uint64_t getFileModifiedDate(const std::string & iPath);
 
+  ///<summary>
+  ///Returns the modified date from an embedded file's c++ header/source file.
+  ///</summary>
+  ///<param name="iPath">The valid path to a c++ header/source file.</param>
+  ///<return>Returns the modified date from an embedded file's c++ header/source file.<return>
+  uint64_t getOutputFileModifiedDate(const std::string & iPath);
+
   ///<summary>
   ///Converts the given value to string.
   ///</summary>
@@ -195,4 +202,12 @@ namespace bin2cpp
   ///<return>Returns the given string.<return>
   std::string& operator<<(std::string& str, const uint64_t & value);
 
+  ///<summary>
+  ///Parse the given string into the given numeric variable.
+  ///</summary>
+  ///<param name="str">The input string which contains a numeric value.</param>
+  ///<param name="value">The output numeric value.</param>
+  ///<return>Returns true when the parsing is successful.<return>
+  bool parseValue(const std::string& str, uint64_t & oValue);
+
 }; //bin2cpp

src/main.cpp

@@ -209,25 +209,90 @@ int main(int argc, char* argv[])
   info << "...";
   bin2cpp::log(bin2cpp::LOG_INFO, info.c_str());
 
-  //generate header
+  //prepare output files path
   std::string outputHeaderPath = outputFolder + "\\" + headerFilename;
-  bin2cpp::log(bin2cpp::LOG_INFO, "Writing file \"%s\"...", outputHeaderPath.c_str());
+  std::string outputCppPath = outputFolder + "\\" + headerFilename;         bin2cpp::strReplace(outputCppPath, ".h", ".cpp");
+  std::string cppFilename = headerFilename;                                 bin2cpp::strReplace(cppFilename, ".h", ".cpp");
+  uint64_t lastModifiedDate = getFileModifiedDate(inputFile);
+  
   bin2cpp::ErrorCodes headerResult = bin2cpp::ErrorCodes::Success;
+  bin2cpp::ErrorCodes cppResult = bin2cpp::ErrorCodes::Success;
 
   //check if header file already exists
   if (bin2cpp::fileExists(outputHeaderPath.c_str()))
   {
-    if (!overrideExisting)
+    uint64_t outputModifiedDate = getOutputFileModifiedDate(outputHeaderPath);
+    bool outputFileOutdated = (outputModifiedDate == 0 || lastModifiedDate > outputModifiedDate);
+    if (outputFileOutdated)
+    {
+      //should we force override flag ?
+      if (overrideExisting)
+      {
+        //no problem, user has already choosen to update the output files.
+      }
+      else
+      {
+        //force overriding output files.
+        std::string message;
+        message << "Output file \'" << headerFilename << "\' is out of date. Forcing override flag";
+        bin2cpp::log(bin2cpp::LOG_INFO, message.c_str());
+        overrideExisting = true;
+      }
+    }
+    else if (lastModifiedDate == outputModifiedDate)
+    {
+      //output file already up to date.
+      headerResult = bin2cpp::ErrorCodes::OutputFilesSkipped;
+    }
+    else if (!overrideExisting)
+    {
+      //fail if not overriding output file
+      bin2cpp::ErrorCodes error = bin2cpp::ErrorCodes::OutputFileAlreadyExist;
+      bin2cpp::log(bin2cpp::LOG_ERROR, "%s (%s)", getErrorCodeDescription(error), outputHeaderPath.c_str());
+      return error;
+    }
+  }
+
+  //check if cpp file already exists
+  if (bin2cpp::fileExists(outputCppPath.c_str()))
+  {
+    uint64_t outputModifiedDate = getOutputFileModifiedDate(outputCppPath);
+    bool outputFileOutdated = (outputModifiedDate == 0 || lastModifiedDate > outputModifiedDate);
+    if (outputFileOutdated)
     {
+      //should we force override flag ?
+      if (overrideExisting)
+      {
+        //no problem, user has already choosen to update the output files.
+      }
+      else
+      {
+        //force overriding output files.
+        std::string message;
+        message << "Output file \'" << cppFilename << "\' is out of date. Forcing override flag";
+        bin2cpp::log(bin2cpp::LOG_INFO, message.c_str());
+        overrideExisting = true;
+      }
+    }
+    else if (lastModifiedDate == outputModifiedDate)
+    {
+      //output file already up to date.
+      cppResult = bin2cpp::ErrorCodes::OutputFilesSkipped;
+    }
+    else if (!overrideExisting)
+    {
+      //fail if not overriding output file
       bin2cpp::ErrorCodes error = bin2cpp::ErrorCodes::OutputFileAlreadyExist;
       bin2cpp::log(bin2cpp::LOG_ERROR, "%s (%s)", getErrorCodeDescription(error), outputHeaderPath.c_str());
       return error;
     }
   }
 
+  //generate header
   if (headerResult == bin2cpp::ErrorCodes::Success)
   {
     //generate file or override existing
+    bin2cpp::log(bin2cpp::LOG_INFO, "Writing file \"%s\"...", outputHeaderPath.c_str());
     headerResult = generator->createHeaderEmbededFile(inputFile.c_str(), outputHeaderPath.c_str(), functionIdentifier.c_str());
   }
   if (headerResult == bin2cpp::ErrorCodes::Success)
@@ -246,27 +311,10 @@ int main(int argc, char* argv[])
   }
 
   //generate cpp
-  std::string outputCppPath = outputFolder + "\\" + headerFilename;
-  bin2cpp::strReplace(outputCppPath, ".h", ".cpp");
-  bin2cpp::log(bin2cpp::LOG_INFO, "Writing file \"%s\"...", outputCppPath.c_str());
-  bin2cpp::ErrorCodes cppResult = bin2cpp::ErrorCodes::Success;
- 
-  //check if cpp file already exists
-  std::string cppFilename = headerFilename;
-  bin2cpp::strReplace(cppFilename, ".h", ".cpp");
-  if (bin2cpp::fileExists(outputCppPath.c_str()))
-  {
-    if (!overrideExisting)
-    {
-      bin2cpp::ErrorCodes error = bin2cpp::ErrorCodes::OutputFileAlreadyExist;
-      bin2cpp::log(bin2cpp::LOG_ERROR, "%s (%s)", getErrorCodeDescription(error), outputCppPath.c_str());
-      return error;
-    }
-  }
-
   if (cppResult == bin2cpp::ErrorCodes::Success)
   {
     //generate file or override existing
+    bin2cpp::log(bin2cpp::LOG_INFO, "Writing file \"%s\"...", outputCppPath.c_str());
     cppResult = generator->createCppEmbeddedFile(inputFile.c_str(), outputCppPath.c_str(), functionIdentifier.c_str(), chunkSize);
   }
   if (cppResult == bin2cpp::ErrorCodes::Success)