Add List Dir Functionality

Author: 年迈的老秋风Windy

examples/File/FileInfo/DirFileList/main.cpp

@@ -0,0 +1,14 @@
+#include <EasyCrossPlatform.h>
+#include <iostream>
+int main(int argc, char** args) {
+	std::string APPPath = EasyCrossPlatform::Runtime::Path::APPPath();
+	std::string CWDPath = EasyCrossPlatform::Runtime::Path::CWDPath();
+	std::vector<std::string> PathFileList = EasyCrossPlatform::File::FileInfo::FileInfoCls::getDirectoryFileList(CWDPath);
+	std::cout << "Path: " << CWDPath << std::endl;
+	std::cout << "----------------------------------------" << std::endl;
+	for (std::string i : PathFileList) {
+		std::cout << i << std::endl;
+	}
+	std::cout << "----------------------------------------" << std::endl;
+	system("pause");
+}

examples/File/FileInfo/233.txt examples/File/FileInfo/FileInfo/233.txtexamples/File/FileInfo/233.txt renamed to examples/File/FileInfo/FileInfo/233.txt

@@ -2,11 +2,18 @@
 	#define __EasyCrossPlatform_APPRuntimeFile__
 	#include <EasyCP_Common.h>
 	#include <whereami/whereami.h>
+	#ifdef EASYCROSSPLATFORM_PLATFORM_WINDOWS
+		#include <direct.h>  
+	#else //if defined(EASYCROSSPLATFORM_PLATFORM_UNIX)
+		#include <unistd.h>  
+	#endif
 	namespace EasyCrossPlatform {
 		namespace Runtime {
 			namespace Path {
+				const constexpr unsigned int PathMaxSize = 1024U;
 				std::string APPPath(); //Returns the directory that the program is in, ending with "\\" or "/"
 				std::string APPExeName();
+				std::string CWDPath();
 			}
 		}
 	}

examples/File/FileInfo/main.cpp examples/File/FileInfo/FileInfo/main.cppexamples/File/FileInfo/main.cpp renamed to examples/File/FileInfo/FileInfo/main.cpp

@@ -6,11 +6,14 @@
 	//#include <filewatcher/FileWatch.hpp> //Add FileWatcher Functionality
 	#ifdef EASYCROSSPLATFORM_PLATFORM_WINDOWS
 		#include <Windows.h>
+		#include <direct.h>
+		#include <io.h>
 	#else //if defined(EASYCROSSPLATFORM_PLATFORM_UNIX)
 		#include <sys/stat.h>  
 		#include <fcntl.h>  
 		#include <stdio.h> 
 		#include <time.h> 
+		#include <dirent.h>
 		#include <unistd.h>
 	#endif
 	namespace EasyCrossPlatform {
@@ -47,6 +50,7 @@
 					#endif
 				public:
 					static FileInfos readFileInfo(const std::string& Path);
+					static std::vector<std::string> getDirectoryFileList(const std::string& DirectoryPath);
 				};
 			}
 		}

include/XSYDAPPRuntime.h

@@ -3,11 +3,21 @@
 std::string EasyCrossPlatform::Runtime::Path::APPPath()
 {
 	int ExePathLength = wai_getExecutablePath(NULL, 0, NULL);
-	char* myPath = new char[ExePathLength+1];
+	char* myPath = new char[ExePathLength + 1];
 	int DirPathLength = 0;
 	wai_getExecutablePath(myPath, ExePathLength, &DirPathLength);
 	myPath[ExePathLength] = '\0';
-	std::string mPath = std::string(myPath, DirPathLength+1);
+	std::string mPath = std::string(myPath, DirPathLength);
+	if (mPath[mPath.length() - 1U] == '\\' || mPath[mPath.length() - 1U] == '/') {
+		//Directory Separator Ended.
+	}
+	else {
+		#ifdef EASYCROSSPLATFORM_PLATFORM_WINDOWS
+			mPath += "\\";
+		#else //if EASYCROSSPLATFORM_PLATFORM_UNIX
+			mPath += "/";
+		#endif
+	}
 	delete[] myPath;
 	return mPath;
 }
@@ -23,3 +33,27 @@ std::string EasyCrossPlatform::Runtime::Path::APPExeName()
 	delete[] myPath;
 	return mPath;
 }
+
+std::string EasyCrossPlatform::Runtime::Path::CWDPath()
+{
+	char buffer[Path::PathMaxSize];
+#ifdef EASYCROSSPLATFORM_PLATFORM_WINDOWS
+	if (_getcwd(buffer, Path::PathMaxSize) == NULL) {
+#else //if EASYCROSSPLATFORM_PLATFORM_UNIX
+	if (getcwd(buffer, Path::PathMaxSize) == NULL) {
+#endif
+		throw std::runtime_error("Encountered an error while getting the current working directory.");
+	}
+	std::string mResult = std::string(buffer);
+	if (mResult[mResult.length() - 1U] == '\\' || mResult[mResult.length() - 1U] == '/') {
+		//Directory Separator Ended
+	}
+	else {
+#ifdef EASYCROSSPLATFORM_PLATFORM_WINDOWS
+		mResult += "\\";
+#else //if EASYCROSSPLATFORM_PLATFORM_UNIX
+		mResult += "/";
+#endif
+	}
+	return mResult;
+}

include/XSYDFileInfo.h

@@ -101,6 +101,68 @@ EasyCrossPlatform::File::FileInfo::FileInfos EasyCrossPlatform::File::FileInfo::
 	return mResult;
 }
 
+std::vector<std::string> EasyCrossPlatform::File::FileInfo::FileInfoCls::getDirectoryFileList(const std::string& DirectoryPath)
+{
+	std::vector<std::string> files;//存放文件名  
+	std::string NSDirPath = DirectoryPath;
+	if (NSDirPath[NSDirPath.length() - 1U] != '/' && NSDirPath[NSDirPath.length() - 1U] != '\\') {
+		NSDirPath += File::FolderSeparator;
+	}
+
+#ifdef WIN32  
+	NSDirPath += "*";
+	_finddata_t file;
+	long lf;
+	//输入文件夹路径  
+	if ((lf = _findfirst(NSDirPath.c_str(), &file)) == -1) {
+		throw std::runtime_error("Directory not found");
+	}
+	else {
+		while (_findnext(lf, &file) == 0) {
+			//输出文件名  
+			//cout<<file.name<<endl;  
+			if (strcmp(file.name, ".") == 0 || strcmp(file.name, "..") == 0)
+				continue;
+			files.push_back(file.name);
+		}
+	}
+	_findclose(lf);
+#endif  
+
+#ifdef linux  
+	DIR *dir;
+	struct dirent *ptr;
+	//char base[1000];
+
+	if ((dir = opendir(NSDirPath.c_str())) == NULL)
+	{
+		throw std::runtime_error("Directory not found");
+	}
+
+	while ((ptr = readdir(dir)) != NULL)
+	{
+		if (strcmp(ptr->d_name, ".") == 0 || strcmp(ptr->d_name, "..") == 0)    ///current dir OR parrent dir  
+			continue;
+		else if(ptr->d_type == DT_REG || ptr->d_type == DT_DIR || ptr->d_type == DT_SOCK || ptr->d_type == DT_LNK || ptr->d_type == DT_UNKNOWN)
+		{
+			files.push_back(ptr->d_name);
+			/*
+			memset(base,'\0',sizeof(base));
+			strcpy(base,basePath);
+			strcat(base,"/");
+			strcat(base,ptr->d_nSame);
+			readFileList(base);
+			*/
+		}
+	}
+	closedir(dir);
+#endif  
+
+	//排序，按从小到大排序  
+	std::sort(files.begin(), files.end());
+	return files;
+}
+
 void EasyCrossPlatform::File::FileInfo::CleanFileTypesVar(FileTypes & VarToDeal)
 {
 	VarToDeal.disabled = false;