卡组，录像，残局排序

Classes/gframe/game.cpp

@@ -8,11 +8,8 @@
 #include "duelclient.h"
 #include "netserver.h"
 #include "single_mode.h"
+#include "myfilesystem.h"
 
-#ifndef _WIN32
-#include <sys/types.h>
-#include <dirent.h>
-#endif
 #ifdef _IRR_ANDROID_PLATFORM_
 #include <android/AndroidSoundEffectPlayer.h>
 #include <android/CAndroidGUIEditBox.h>
@@ -1305,37 +1302,15 @@ void Game::LoadExpansions() {
 }
 void Game::RefreshDeck(irr::gui::IGUIComboBox* cbDeck) {
 	cbDeck->clear();
-#ifdef _WIN32
-	WIN32_FIND_DATAW fdataw;
-	HANDLE fh = FindFirstFileW(L"./deck/*.ydk", &fdataw);
-	if(fh == INVALID_HANDLE_VALUE)
-		return;
-	do {
-		if(!(fdataw.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
-			wchar_t* pf = fdataw.cFileName;
-			while(*pf) pf++;
-			while(*pf != L'.') pf--;
-			*pf = 0;
-			cbDeck->addItem(fdataw.cFileName);
+	FileSystem::TraversalDir(L"./deck", [cbDeck](const wchar_t* name, bool isdir) {
+		if(!isdir && wcsrchr(name, '.') && !wcsncasecmp(wcsrchr(name, '.'), L".ydk", 4)) {
+			size_t len = wcslen(name);
+			wchar_t deckname[256];
+			wcsncpy(deckname, name, len - 4);
+			deckname[len - 4] = 0;
+			cbDeck->addItem(deckname);
 		}
-	} while(FindNextFileW(fh, &fdataw));
-	FindClose(fh);
-#else
-	DIR * dir;
-	struct dirent * dirp;
-	if((dir = opendir("./deck/")) == NULL)
-		return;
-	while((dirp = readdir(dir)) != NULL) {
-		size_t len = strlen(dirp->d_name);
-		if(len < 5 || strcasecmp(dirp->d_name + len - 4, ".ydk") != 0)
-			continue;
-		dirp->d_name[len - 4] = 0;
-		wchar_t wname[256];
-		BufferIO::DecodeUTF8(dirp->d_name, wname);
-		cbDeck->addItem(wname);
-	}
-	closedir(dir);
-#endif
+	});
 	for(size_t i = 0; i < cbDeck->getItemCount(); ++i) {
 		if(!wcscmp(cbDeck->getItem(i), gameConf.lastdeck)) {
 			cbDeck->setSelected(i);
@@ -1345,37 +1320,18 @@ void Game::RefreshDeck(irr::gui::IGUIComboBox* cbDeck) {
 }
 void Game::RefreshReplay() {
 	lstReplayList->clear();
-	DIR * dir;
-	struct dirent * dirp;
-	if((dir = opendir("./replay/")) == NULL)
-		return;
-	while((dirp = readdir(dir)) != NULL) {
-		size_t len = strlen(dirp->d_name);
-		if(len < 5 || strcasecmp(dirp->d_name + len - 4, ".yrp") != 0)
-			continue;
-		wchar_t wname[256];
-		BufferIO::DecodeUTF8(dirp->d_name, wname);
-		if(Replay::CheckReplay(wname))
-			lstReplayList->addItem(wname);
-	}
-	closedir(dir);
+	FileSystem::TraversalDir(L"./replay", [this](const wchar_t* name, bool isdir) {
+		if(!isdir && wcsrchr(name, '.') && !wcsncasecmp(wcsrchr(name, '.'), L".yrp", 4) && Replay::CheckReplay(name))
+			lstReplayList->addItem(name);
+	});
 }
 void Game::RefreshSingleplay() {
 	lstSinglePlayList->clear();
 	stSinglePlayInfo->setText(L"");
-	DIR * dir;
-	struct dirent * dirp;
-	if((dir = opendir("./single/")) == NULL)
-		return;
-	while((dirp = readdir(dir)) != NULL) {
-		size_t len = strlen(dirp->d_name);
-		if(len < 5 || strcasecmp(dirp->d_name + len - 4, ".lua") != 0)
-			continue;
-		wchar_t wname[256];
-		BufferIO::DecodeUTF8(dirp->d_name, wname);
-		lstSinglePlayList->addItem(wname);
-	}
-	closedir(dir);
+	FileSystem::TraversalDir(L"./single", [this](const wchar_t* name, bool isdir) {
+		if(!isdir && wcsrchr(name, '.') && !wcsncasecmp(wcsrchr(name, '.'), L".lua", 4))
+			lstSinglePlayList->addItem(name);
+	});
 }
 void Game::RefreshBot() {
 	if(!gameConf.enable_bot_mode)

Classes/gframe/myfilesystem.h

+#ifndef FILESYSTEM_H
+#define FILESYSTEM_H
+
+#include <string.h>
+#include <functional>
+#include "bufferio.h"
+
+#ifndef _WIN32
+#include <dirent.h>
+#include <sys/stat.h>
+#include <vector>
+#include <algorithm>
+#endif
+
+#ifdef _WIN32
+
+#include <Windows.h>
+
+class FileSystem {
+public:
+	static bool IsFileExists(const wchar_t* wfile) {
+		DWORD attr = GetFileAttributesW(wfile);
+		return attr != INVALID_FILE_ATTRIBUTES && !(attr & FILE_ATTRIBUTE_DIRECTORY);
+	}
+
+	static bool IsFileExists(const char* file) {
+		wchar_t wfile[1024];
+		BufferIO::DecodeUTF8(file, wfile);
+		return IsFileExists(wfile);
+	}
+
+	static bool IsDirExists(const wchar_t* wdir) {
+		DWORD attr = GetFileAttributesW(wdir);
+		return attr != INVALID_FILE_ATTRIBUTES && (attr & FILE_ATTRIBUTE_DIRECTORY);
+	}
+
+	static bool IsDirExists(const char* dir) {
+		wchar_t wdir[1024];
+		BufferIO::DecodeUTF8(dir, wdir);
+		return IsDirExists(wdir);
+	}
+
+	static bool MakeDir(const wchar_t* wdir) {
+		return CreateDirectoryW(wdir, NULL);
+	}
+
+	static bool MakeDir(const char* dir) {
+		wchar_t wdir[1024];
+		BufferIO::DecodeUTF8(dir, wdir);
+		return MakeDir(wdir);
+	}
+
+	static void TraversalDir(const wchar_t* wpath, const std::function<void(const wchar_t*, bool)>& cb) {
+		wchar_t findstr[1024];
+		wcscpy(findstr, wpath);
+		wcscat(findstr, L"/*");
+		WIN32_FIND_DATAW fdataw;
+		HANDLE fh = FindFirstFileW(findstr, &fdataw);
+		if(fh == INVALID_HANDLE_VALUE)
+			return;
+		do {
+			cb(fdataw.cFileName, (fdataw.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY));
+		} while(FindNextFileW(fh, &fdataw));
+		FindClose(fh);
+	}
+
+	static void TraversalDir(const char* path, const std::function<void(const char*, bool)>& cb) {
+		wchar_t wpath[1024];
+		BufferIO::DecodeUTF8(path, wpath);
+		TraversalDir(wpath, [&cb](const wchar_t* wname, bool isdir) {
+			char name[1024];
+			BufferIO::EncodeUTF8(wname, name);
+			cb(name, isdir);
+		});
+	}
+};
+
+#else
+
+class FileSystem {
+public:
+	static bool IsFileExists(const char* file) {
+		struct stat fileStat;
+		return (stat(file, &fileStat) == 0) && !S_ISDIR(fileStat.st_mode);
+	}
+
+	static bool IsFileExists(const wchar_t* wfile) {
+		char file[1024];
+		BufferIO::EncodeUTF8(wfile, file);
+		return IsFileExists(file);
+	}
+
+	static bool IsDirExists(const char* dir) {
+		struct stat fileStat;
+		return (stat(dir, &fileStat) == 0) && S_ISDIR(fileStat.st_mode);
+	}
+
+	static bool IsDirExists(const wchar_t* wdir) {
+		char dir[1024];
+		BufferIO::EncodeUTF8(wdir, dir);
+		return IsDirExists(dir);
+	}
+
+	static bool MakeDir(const char* dir) {
+		return mkdir(dir, 0775) == 0;
+	}
+
+	static bool MakeDir(const wchar_t* wdir) {
+		char dir[1024];
+		BufferIO::EncodeUTF8(wdir, dir);
+		return MakeDir(dir);
+	}
+
+	struct file_unit {
+		std::string filename;
+		bool is_dir;
+	};
+
+	static void TraversalDir(const char* path, const std::function<void(const char*, bool)>& cb) {
+		DIR* dir = nullptr;
+		struct dirent* dirp = nullptr;
+		if((dir = opendir(path)) == nullptr)
+			return;
+		struct stat fileStat;
+		std::vector<file_unit> file_list;
+		while((dirp = readdir(dir)) != nullptr) {
+			file_unit funit;
+			char fname[1024];
+			strcpy(fname, path);
+			strcat(fname, "/");
+			strcat(fname, dirp->d_name);
+			stat(fname, &fileStat);
+			funit.filename = std::string(dirp->d_name);
+			funit.is_dir = S_ISDIR(fileStat.st_mode);
+			file_list.push_back(funit);
+		}
+		closedir(dir);
+		std::sort(file_list.begin(), file_list.end(), TraversalDirSort);
+		for (file_unit funit : file_list)
+			cb(funit.filename.c_str(), funit.is_dir);
+	}
+
+	static bool TraversalDirSort(file_unit file1, file_unit file2) {
+		if(file1.is_dir != file2.is_dir) {
+			return file2.is_dir;
+		} else {
+			return file1.filename < file2.filename;
+		}
+	}
+
+	static void TraversalDir(const wchar_t* wpath, const std::function<void(const wchar_t*, bool)>& cb) {
+		char path[1024];
+		BufferIO::EncodeUTF8(wpath, path);
+		TraversalDir(path, [&cb](const char* name, bool isdir) {
+			wchar_t wname[1024];
+			BufferIO::DecodeUTF8(name, wname);
+			cb(wname, isdir);
+		});
+	}
+};
+
+#endif // _WIN32
+
+#endif //FILESYSTEM_H