- bugfix

Author: janbender

CMake/Common.cmake

@@ -33,10 +33,11 @@ if (MSVC)
     set(CMAKE_USE_RELATIVE_PATHS "1")
     # Set compiler flags
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MP /bigobj")
-    set(CMAKE_CXX_FLAGS_RELEASE "/MD /MP /Ox /Ob2 /Oi /Ot /fp:fast /D NDEBUG")
-	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD /Zi /MP /Ox /Ob2 /Oi /Ot /fp:fast /D NDEBUG /bigobj") 
-    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/INCREMENTAL")
-    set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/INCREMENTAL")
+    set(CMAKE_CXX_FLAGS_RELEASE "/MD /MP /Ox /Ob2 /Oi /Ot /D NDEBUG")
+	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD /Zi /MP /Ox /Ob2 /Oi /Ot /D NDEBUG /bigobj") 
+    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/INCREMENTAL:NO")
+    set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/INCREMENTAL:NO")
+    set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "/INCREMENTAL:NO")
 endif (MSVC)
 
 if (UNIX OR MINGW)

Utils/FileSystem.h

@@ -2,21 +2,25 @@
 #define __FileSystem_h__
 
 #include "StringTools.h"
-#include "Logger.h"
 #include "extern/md5/md5.h"
-#if WIN32
+#include <sys/stat.h>
+#ifdef WIN32
 #include <direct.h>
 #define NOMINMAX
 #include "windows.h"
+#include <commdlg.h>
 #else
-#include <sys/stat.h>
 #include <unistd.h>
+#include <dirent.h>
 #endif
 
-#if (defined(__MINGW32__) || defined(__MINGW64__))
-#include <sys/stat.h>
+#ifndef S_ISDIR
+#define S_ISDIR(mode)  (((mode) & S_IFMT) == S_IFDIR)
 #endif
 
+#ifndef S_ISREG
+#define S_ISREG(mode)  (((mode) & S_IFMT) == S_IFREG)
+#endif
 
 namespace Utilities
 {
@@ -171,6 +175,8 @@ namespace Utilities
 
 		static std::string normalizePath(const std::string &path)
 		{
+			if (path.size() == 0)
+				return path;
 			std::string result = path;
 			std::replace(result.begin(), result.end(), '\\', '/');
 			std::vector<std::string> tokens;
@@ -181,7 +187,7 @@ namespace Utilities
 				if ((tokens[index] == "..") && (index > 0))
 				{
 					tokens.erase(tokens.begin() + index - 1, tokens.begin() + index + 1);
-					index--;
+					index-=2;
 				}
 				index++;
 			}
@@ -244,6 +250,54 @@ namespace Utilities
 
 			return true;
 		}
+
+		static bool isFile(const std::string &path) 
+		{
+			struct stat st;
+			if (!stat(path.c_str(), &st))
+				return S_ISREG(st.st_mode);
+			return false;
+		}
+
+		static bool isDirectory(const std::string &path)
+		{
+			struct stat st;
+			if (!stat(path.c_str(), &st))
+				return S_ISDIR(st.st_mode);
+			return false;
+		}
+
+		static bool getFilesInDirectory(const std::string& path, std::vector<std::string> &res)
+		{
+#ifdef WIN32
+			std::string p = path + "\\*";
+			WIN32_FIND_DATA data;
+			HANDLE hFind = FindFirstFile(p.c_str(), &data);
+			if (hFind  != INVALID_HANDLE_VALUE) 
+			{
+				do 
+				{
+					res.push_back(data.cFileName);
+				} 
+				while (FindNextFile(hFind, &data) != 0);
+				FindClose(hFind);
+				return true;
+			}
+			return false;
+#else
+			DIR* dir = opendir(path.c_str());
+			if (dir != NULL)
+			{
+				struct dirent *dp;
+				while ((dp = readdir(dir)) != NULL) 
+					res.push_back(dp->d_name);
+				closedir(dir);
+				return true;
+			}
+			return false;
+#endif
+		}
+
 
 		/** Compute the MD5 hash of a file.
 		*/
@@ -252,14 +306,14 @@ namespace Utilities
 			std::ifstream file(filename);
 
 			if (!file)
-				LOG_ERR << "Cannot open file: " << filename;
+				std::cerr << "Cannot open file: " << filename << std::endl;
 			else
 			{
 				MD5 context(file);
-				char * hexDigestPtr(context.hex_digest());
-				std::string digest(hexDigestPtr);
-				delete hexDigestPtr;
-				return digest;
+				char *md5hex = context.hex_digest();
+				std::string res(md5hex);
+				delete[] md5hex;
+				return res;
 			}
 			return "";
 		}
@@ -272,7 +326,7 @@ namespace Utilities
 			fstream.open(md5File.c_str(), std::ios::out);
 			if (fstream.fail())
 			{
-				LOG_ERR << "Failed to open file: " << md5File;
+				std::cerr << "Failed to open file: " << md5File << "\n";
 				return false;
 			}
 			std::string md5 = getFileMD5(fileName);
@@ -290,7 +344,7 @@ namespace Utilities
 			fstream.open(md5File.c_str(), std::ios::in);
 			if (fstream.fail())
 			{
-				LOG_ERR << "Failed to open file: " << md5File;
+				std::cerr << "Failed to open file: " << md5File << "\n";
 				return false;
 			}
 			std::string str((std::istreambuf_iterator<char>(fstream)),
@@ -299,6 +353,47 @@ namespace Utilities
 
 			return str == md5Hash;
 		}
+
+#ifdef WIN32
+		/** Open windows file dialog.\n
+		* dialogType 0 = Open file dialog\n
+		* dialogType 1 = Save file dialog\n
+		*/
+		static const std::string fileDialog(int dialogType,
+			const std::string &initialDir,
+			const std::string &filter)
+		{
+			std::string initDir = normalizePath(initialDir);
+			std::replace(initDir.begin(), initDir.end(), '/', '\\');
+
+			OPENFILENAME ofn;       // common dialog box structure
+			char fileNameBuffer[512]; 
+			fileNameBuffer[0] = '\0';			
+
+			const std::string filterWithEscape = filter + '\0';
+			
+			ZeroMemory(&ofn, sizeof(ofn));
+			ofn.lStructSize = sizeof(ofn);
+			ofn.lpstrFile = fileNameBuffer;
+			ofn.nMaxFile = sizeof(fileNameBuffer);
+			ofn.lpstrFilter = filterWithEscape.c_str();
+			ofn.nFilterIndex = 1;
+			ofn.lpstrInitialDir = (LPSTR)initDir.c_str();
+			ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_NOCHANGEDIR;
+
+			if (dialogType == 0)
+			{
+				if (GetOpenFileName(&ofn))
+					return std::string(fileNameBuffer);
+			}
+			else
+			{
+				if (GetSaveFileName(&ofn))
+					return std::string(fileNameBuffer);
+			}
+			return "";
+		}
+#endif
 	};
 }