zv0n/game
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mario: formatting

Browse Source
This commit is contained in:
zvon
2022-07-21 20:17:24 +02:00
parent 6558329547
commit 58fd1a37a8
9 changed files with 373 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mario/filesystem/unix/filesystem.cpp
+55 -58
View File
@@ -10,44 +10,42 @@
char FSLib::dir_divisor = '/';
FSLib::Directory::Directory( const string &path_ ) : dir_path( path_ ) {}
FSLib::Directory::Directory(const string &path_) : dir_path(path_) {}
FSLib::Directory::Iterator::Iterator( const Directory &d_ )
: d( opendir( d_.path() ) ) {
if ( !exists( d_.path() ) || !isDirectory( d_.path() ) ) {
throw std::runtime_error(
std::string( "Directory " ) + d_.path() +
" either doesn't exist or isn't a directory" );
FSLib::Directory::Iterator::Iterator(const Directory &d_)
: d(opendir(d_.path())) {
if (!exists(d_.path()) || !isDirectory(d_.path())) {
throw std::runtime_error(std::string("Directory ") + d_.path() +
" either doesn't exist or isn't a directory");
}
current_entry = readdir( d );
current_entry = readdir(d);
// skip "." and ".."
if ( current_entry != nullptr &&
( !strcmp( current_entry->d_name, "." ) ||
!strcmp( current_entry->d_name, ".." ) ) )
++( *this );
if (current_entry != nullptr && (!strcmp(current_entry->d_name, ".") ||
!strcmp(current_entry->d_name, "..")))
++(*this);
}
FSLib::Directory::Iterator::Iterator( const Directory &d_,
const struct dirent *current_entry_ )
: d( opendir( d_.path() ) ), current_entry( current_entry_ ) {}
FSLib::Directory::Iterator::Iterator(const Directory &d_,
const struct dirent *current_entry_)
: d(opendir(d_.path())), current_entry(current_entry_) {}
FSLib::Directory::Iterator::~Iterator() {
if ( d )
closedir( d );
if (d)
closedir(d);
}
bool FSLib::exists( const string &path ) {
bool FSLib::exists(const string &path) {
struct stat path_stat;
return stat( path.c_str(), &path_stat ) == 0;
return stat(path.c_str(), &path_stat) == 0;
}
string FSLib::canonical( const string &path ) {
string FSLib::canonical(const string &path) {
char_t *canonical_path = new char_t[PATH_MAX];
auto failed = realpath( path.c_str(), canonical_path ) == nullptr;
auto failed = realpath(path.c_str(), canonical_path) == nullptr;
if ( failed ) {
if (failed) {
delete[] canonical_path;
return string();
}
@@ -57,76 +55,76 @@ string FSLib::canonical( const string &path ) {
return canonical_string;
}
bool FSLib::isDirectory( const string &path ) {
bool FSLib::isDirectory(const string &path) {
struct stat path_stat;
if ( stat( path.c_str(), &path_stat ) != 0 )
if (stat(path.c_str(), &path_stat) != 0)
return false;
return S_ISDIR( path_stat.st_mode );
return S_ISDIR(path_stat.st_mode);
}
bool FSLib::rename( const string &file_a, const string &file_b ) {
bool FSLib::rename(const string &file_a, const string &file_b) {
// TODO log
std::cout << file_a << " -> " << file_b << std::endl;
return ::rename( file_a.c_str(), file_b.c_str() ) == 0;
return ::rename(file_a.c_str(), file_b.c_str()) == 0;
}
// TODO do windows version
bool deleteRecursive(const string &dir) {
for(const auto &file : FSLib::Directory(dir)) {
for (const auto &file : FSLib::Directory(dir)) {
auto path = dir + "/" + file;
if(FSLib::isDirectory(path)) {
if(!deleteRecursive(path)) {
if (FSLib::isDirectory(path)) {
if (!deleteRecursive(path)) {
return false;
}
} else if(unlink(path.c_str()) != 0) {
} else if (unlink(path.c_str()) != 0) {
return false;
}
}
return rmdir(dir.c_str()) == 0;
}
bool FSLib::deleteFile( const string &file ) {
bool FSLib::deleteFile(const string &file) {
// TODO log
auto canon = canonical( file );
if(canon.empty()) {
auto canon = canonical(file);
if (canon.empty()) {
return false;
}
if(isDirectory(canon)) {
if (isDirectory(canon)) {
return deleteRecursive(canon);
}
return unlink(canon.c_str()) == 0;
}
bool FSLib::createDirectoryFull( const string &path ) {
bool FSLib::createDirectoryFull(const string &path) {
uint64_t pos{};
// go through all directories leading to the last one
// and create them if they don't exist
do {
// get partial directory path
pos = path.find_first_of( "/", pos );
if ( pos > 0 ) {
auto dirname = path.substr( 0, pos );
pos = path.find_first_of("/", pos);
if (pos > 0) {
auto dirname = path.substr(0, pos);
// create it if it doesn't exist
if ( !FSLib::exists( dirname ) ) {
if ( mkdir( dirname.c_str(),
S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH ) != 0 )
if (!FSLib::exists(dirname)) {
if (mkdir(dirname.c_str(),
S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0)
return false;
}
}
pos++;
} while ( pos < path.length() && pos != 0 );
} while (pos < path.length() && pos != 0);
return true;
}
FSLib::Directory::iterator FSLib::Directory::end() {
return Iterator( *this, nullptr );
return Iterator(*this, nullptr);
}
FSLib::Directory::const_iterator FSLib::Directory::end() const {
return Iterator( *this, nullptr );
return Iterator(*this, nullptr);
}
char_t const *FSLib::Directory::Iterator::operator*() const {
@@ -134,40 +132,39 @@ char_t const *FSLib::Directory::Iterator::operator*() const {
}
FSLib::Directory::Iterator &FSLib::Directory::Iterator::operator++() {
if ( current_entry == nullptr )
if (current_entry == nullptr)
return *this;
current_entry = readdir( d );
current_entry = readdir(d);
// skip . and ..
if ( current_entry != nullptr &&
( !strcmp( current_entry->d_name, "." ) ||
!strcmp( current_entry->d_name, ".." ) ) )
if (current_entry != nullptr && (!strcmp(current_entry->d_name, ".") ||
!strcmp(current_entry->d_name, "..")))
return operator++();
return *this;
}
bool FSLib::Directory::Iterator::operator==( const Iterator &i_other ) const {
bool FSLib::Directory::Iterator::operator==(const Iterator &i_other) const {
return i_other.current_entry == current_entry;
}
string FSLib::getContainingDirectory( const string &path ) {
string FSLib::getContainingDirectory(const string &path) {
auto pos = path.find_last_of('/');
if(pos == string::npos) {
if (pos == string::npos) {
return ".";
}
return path.substr(0, pos);
}
string FSLib::getFileName( const string &path ) {
string FSLib::getFileName(const string &path) {
auto pos = path.find_last_of('/');
if(pos == string::npos) {
if (pos == string::npos) {
return path;
}
return path.substr(pos+1);
return path.substr(pos + 1);
}
string FSLib::getFileExtension( const string &path ) {
string FSLib::getFileExtension(const string &path) {
auto pos = path.find_last_of('.');
if(pos == string::npos) {
if (pos == string::npos) {
return "";
}
return path.substr(pos + 1);
mario/filesystem/windows/filesystem.cpp
+46 -47
View File
@@ -6,21 +6,20 @@
char FSLib::dir_divisor = '\\';
FSLib::Directory::Directory( const string &path_ ) : dir_path( path_ ) {
FSLib::Directory::Directory(const string &path_) : dir_path(path_) {
// need to append \\* for windows to search files in directory
dir_path.append( L"\\*" );
dir_path.append(L"\\*");
}
FSLib::Directory::Iterator::Iterator( const Directory &d_ ) {
if ( !exists( d_.validPath() ) || !isDirectory( d_.validPath() ) ) {
FSLib::Directory::Iterator::Iterator(const Directory &d_) {
if (!exists(d_.validPath()) || !isDirectory(d_.validPath())) {
throw std::runtime_error(
"Directory either doesn't exist or isn't a directory" );
"Directory either doesn't exist or isn't a directory");
}
hFind = FindFirstFileW( d_.path(), &data );
if ( hFind != INVALID_HANDLE_VALUE ) {
if ( !wcscmp( data.cFileName, L"." ) ||
!wcscmp( data.cFileName, L".." ) ) {
++( *this );
hFind = FindFirstFileW(d_.path(), &data);
if (hFind != INVALID_HANDLE_VALUE) {
if (!wcscmp(data.cFileName, L".") || !wcscmp(data.cFileName, L"..")) {
++(*this);
}
} else {
ended = true;
@@ -28,37 +27,37 @@ FSLib::Directory::Iterator::Iterator( const Directory &d_ ) {
}
FSLib::Directory::Iterator::~Iterator() {
if ( hFind )
FindClose( hFind );
if (hFind)
FindClose(hFind);
}
// this is definitely not a good way to create the "end" iterator
// but it was the only way I thought of with my limited knowledge of
// windows.h
FSLib::Directory::Iterator::Iterator( bool ended_ ) : ended( ended_ ) {}
FSLib::Directory::Iterator::Iterator(bool ended_) : ended(ended_) {}
bool FSLib::exists( const string &path ) {
bool FSLib::exists(const string &path) {
struct _stat path_stat;
return _wstat( path.c_str(), &path_stat ) == 0;
return _wstat(path.c_str(), &path_stat) == 0;
}
string FSLib::canonical( const string &path ) {
string FSLib::canonical(const string &path) {
char_t *full_path = new char_t[MAX_PATH];
char_t *canonical_path = new char_t[MAX_PATH];
auto failed = !GetFullPathName( path.c_str(), MAX_PATH, full_path, NULL );
auto failed = !GetFullPathName(path.c_str(), MAX_PATH, full_path, NULL);
if ( failed ) {
if (failed) {
delete[] canonical_path;
delete[] full_path;
return string();
}
failed = !PathCanonicalizeW( canonical_path, full_path );
failed = !PathCanonicalizeW(canonical_path, full_path);
delete[] full_path;
if ( failed ) {
if (failed) {
delete[] canonical_path;
return string();
}
@@ -68,46 +67,46 @@ string FSLib::canonical( const string &path ) {
return canonical_string;
}
bool FSLib::isDirectory( const string &path ) {
bool FSLib::isDirectory(const string &path) {
struct _stat path_stat;
if ( _wstat( path.c_str(), &path_stat ) != 0 )
if (_wstat(path.c_str(), &path_stat) != 0)
return false;
return path_stat.st_mode & _S_IFDIR;
}
bool FSLib::rename( const string &file_a, const string &file_b ) {
return MoveFileExW( file_a.c_str(), file_b.c_str(),
MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING );
bool FSLib::rename(const string &file_a, const string &file_b) {
return MoveFileExW(file_a.c_str(), file_b.c_str(),
MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING);
}
bool FSLib::createDirectoryFull( const string &path ) {
uint64_t pos = path.find_first_of( L":", 0 ) + 2;
if ( pos == string::npos )
bool FSLib::createDirectoryFull(const string &path) {
uint64_t pos = path.find_first_of(L":", 0) + 2;
if (pos == string::npos)
pos = 0;
// go through all directories leading to the last one
// and create them if they don't exist
do {
// get partial directory path
pos = path.find_first_of( L"\\", pos );
auto dirname = path.substr( 0, pos );
pos = path.find_first_of(L"\\", pos);
auto dirname = path.substr(0, pos);
// create it if it doesn't exist
if ( !FSLib::exists( dirname ) ) {
if ( !CreateDirectoryW( dirname.c_str(), NULL ) )
if (!FSLib::exists(dirname)) {
if (!CreateDirectoryW(dirname.c_str(), NULL))
return false;
}
pos++;
} while ( pos < path.length() && pos != 0 );
} while (pos < path.length() && pos != 0);
return true;
}
FSLib::Directory::iterator FSLib::Directory::end() {
return Iterator( true );
return Iterator(true);
}
FSLib::Directory::const_iterator FSLib::Directory::end() const {
return Iterator( true );
return Iterator(true);
}
char_t const *FSLib::Directory::Iterator::operator*() const {
@@ -115,41 +114,41 @@ char_t const *FSLib::Directory::Iterator::operator*() const {
}
FSLib::Directory::Iterator &FSLib::Directory::Iterator::operator++() {
if ( ended == true )
if (ended == true)
return *this;
// skip . and ..
if ( FindNextFileW( hFind, &data ) == 0 ) {
if (FindNextFileW(hFind, &data) == 0) {
ended = true;
} else if ( !wcscmp( data.cFileName, L"." ) ||
!wcscmp( data.cFileName, L".." ) ) {
} else if (!wcscmp(data.cFileName, L".") ||
!wcscmp(data.cFileName, L"..")) {
return operator++();
}
return *this;
}
bool FSLib::Directory::Iterator::operator==( const Iterator &i_other ) const {
bool FSLib::Directory::Iterator::operator==(const Iterator &i_other) const {
return i_other.ended == ended;
}
string FSLib::getContainingDirectory( const string &path ) {
string FSLib::getContainingDirectory(const string &path) {
auto pos = path.find_last_of('\\');
if(pos == string::npos) {
if (pos == string::npos) {
return ".";
}
return path.substr(0, pos);
}
string FSLib::getFileName( const string &path ) {
string FSLib::getFileName(const string &path) {
auto pos = path.find_last_of('\\');
if(pos == string::npos) {
if (pos == string::npos) {
return path;
}
return path.substr(pos+1);
return path.substr(pos + 1);
}
string FSLib::getFileExtension( const string &path ) {
string FSLib::getFileExtension(const string &path) {
auto pos = path.find_last_of('.');
if(pos == string::npos) {
if (pos == string::npos) {
return "";
}
return path.substr(pos + 1);