profile/util: getFilesInDir can browse files on Windows

Clement Champetier · Clement Champetier · commit ed32e8c6ab3e · 2015-03-02T16:00:04.000+01:00
* Add system.hpp to detect the OS. * Fix #55
diff --git a/src/AvTranscoder/common.hpp b/src/AvTranscoder/common.hpp
@@ -1,6 +1,8 @@
 #ifndef _AV_TRANSCODER_COMMON_HPP_
 #define _AV_TRANSCODER_COMMON_HPP_
 
+#include <AvTranscoder/system.hpp>
+
 extern "C" {
 #ifndef __STDC_CONSTANT_MACROS
     #define __STDC_CONSTANT_MACROS
diff --git a/src/AvTranscoder/profile/util.hpp b/src/AvTranscoder/profile/util.hpp
@@ -1,8 +1,33 @@
 #ifndef _AV_TRANSCODER_PROFILE_UTIL_HPP_
 #define _AV_TRANSCODER_PROFILE_UTIL_HPP_
 
-#include <string>
+#if defined ( __LINUX__ )
+
+ #define DIRLIST_SEP_CHARS ":;"
+ #define DIRSEP "/"
+#include <dirent.h>
+
+#elif defined ( __MACOS__ )
+
+ #define DIRLIST_SEP_CHARS ";:"
+ #define DIRSEP "/"
 #include <dirent.h>
+
+#elif defined ( __WINDOWS__ )
+
+ #define DIRLIST_SEP_CHARS ";"
+ #define DIRSEP "\\"
+
+ // CINTERFACE needs to be declared if compiling with VC++
+ #include <shlobj.h>
+ #include <tchar.h>
+ #ifndef _MSC_VER
+	#define SHGFP_TYPE_CURRENT 0
+ #endif
+
+#endif
+
+#include <string>
 #include <iostream>
 
 namespace avtranscoder
@@ -20,22 +45,49 @@ void split( std::vector< std::string >& splitString, const std::string& inputStr
 
 int getFilesInDir( const std::string& dir, std::vector< std::string >& files )
 {
+#if defined ( __WINDOWS__ )
+	WIN32_FIND_DATA findData;
+	HANDLE findHandle;
+
+#else
 	DIR *dp;
 	struct dirent *dirp;
-	if( ( dp  = opendir( dir.c_str() ) ) == NULL )
+	if( ( dp = opendir( dir.c_str() ) ) == NULL )
 	{
 		std::cerr << "Error(" << errno << ") opening " << dir << std::endl;
 		return errno;
 	}
+#endif
 
+#if defined ( __WINDOWS__ )
+	findHandle = FindFirstFile( ( dir + "\\*" ).c_str(), &findData );
+	if( findHandle == INVALID_HANDLE_VALUE )
+	{
+		return -1;
+	}
+	while(1)
+	{
+		const std::string filename( findData.cFileName );
+		bool isdir = ( findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) != 0;
+		if( ! isdir )
+			files.push_back( filename );
+
+		int rval = FindNextFile( findHandle, &findData );
+		if( rval == 0 )
+			break;
+	}
+
+#else
 	while( ( dirp = readdir( dp ) ) != NULL )
 	{
-		std::string filename( dirp->d_name );
+		const std::string filename( dirp->d_name );
 		if( filename == "." || filename == ".." )
 			continue;
 		files.push_back( filename );
 	}
 	closedir( dp );
+#endif
+
 	return 0;
 }
 
diff --git a/src/AvTranscoder/system.hpp b/src/AvTranscoder/system.hpp
@@ -0,0 +1,49 @@
+#ifndef _AV_TRANSCODER_SYSTEM_HPP_
+#define _AV_TRANSCODER_SYSTEM_HPP_
+
+#if defined( linux ) \
+    || defined( __linux ) \
+    || defined( LINUX ) \
+    || defined( _LINUX ) \
+    || defined( __LINUX__ ) \
+
+ #ifndef __LINUX__
+  #define __LINUX__
+ #endif
+
+
+#elif defined( macintosh ) \
+    || defined( Macintosh ) \
+    || defined( __APPLE__ ) \
+    || defined( __MACH__ ) \
+    || defined( MACOS ) \
+    || defined( MACOSX ) \
+    || defined( __MACOS__ ) \
+
+ #ifndef __MACOS__
+  #define __MACOS__
+ #endif
+
+
+#elif defined( WIN32 ) \
+    || defined( _WIN32 ) \
+    || defined( __WIN32__ ) \
+    || defined( WIN64 ) \
+    || defined( _WIN64 ) \
+    || defined( __WIN64__ ) \
+    || defined( __TOS_WIN__ ) \
+    || defined( WINDOWS ) \
+    || defined( _WINDOWS ) \
+    || defined( __WINDOWS__ ) \
+
+ #ifndef __WINDOWS__
+  #define __WINDOWS__
+ #endif
+
+#else
+
+ #warning "Your operating system is not recognized."
+
+#endif
+
+#endif
