Skip to content

Use c++ filesystem in MixFileCreator and MixFileFactoryClass #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
madebr wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use c++ filesystem in MixFileCreator and MixFileFactoryClass #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions Code/wwlib/mixfile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#include "pathutil.h"
#include "bittype.h"
#include <algorithm>
#include <filesystem>

/*
**
Expand Down Expand Up @@ -309,19 +310,17 @@ MixFileFactoryClass::Flush_Changes (void)
return ;
}

std::filesystem::path mix_filename = MixFilename.Peek_Buffer();

//
// Get the path of the mix file
//
char drive[_MAX_DRIVE] = { 0 };
char dir[_MAX_DIR] = { 0 };
::_splitpath (MixFilename, drive, dir, nullptr, nullptr);
StringClass path = drive;
path += dir;
std::filesystem::path path = mix_filename.parent_path();

//
// Try to find a temp filename
//
StringClass full_path;
std::filesystem::path full_path;
if (Get_Temp_Filename (path, full_path)) {
MixFileCreator new_mix_file (full_path);

Expand Down Expand Up @@ -365,8 +364,11 @@ MixFileFactoryClass::Flush_Changes (void)
//
// Delete the old mix file and rename the new one
//
::DeleteFileA (MixFilename);
::MoveFileA (full_path, MixFilename);
std::error_code ec;
std::filesystem::remove(mix_filename, ec);
WWASSERT(!ec && "Failed to remove the previous MIX file");
std::filesystem::rename(full_path, mix_filename, ec);
WWASSERT(!ec && "Failed to move the temporary MIX back to its final location");

//
// Reset the lists
Expand All @@ -381,18 +383,19 @@ MixFileFactoryClass::Flush_Changes (void)
**
*/
bool
MixFileFactoryClass::Get_Temp_Filename (const char *path, StringClass &full_path)
MixFileFactoryClass::Get_Temp_Filename (const std::filesystem::path &path, std::filesystem::path &full_path)
{
bool retval = false;

StringClass temp_path = path;
temp_path += "_tmpmix";
std::filesystem::path temp_path = path;
StringClass filename;

//
// Try to find a unique temp filename
//
for (int index = 0; index < 20; index ++) {
full_path.Format ("%s%.2d.dat", (const char *)temp_path, index + 1);
filename.Format ("_tmpmix%.2d.dat", index + 1);
full_path = path / filename.Peek_Buffer();
if (!cPathUtil::PathExists (full_path)) {
retval = true;
break;
Expand All @@ -408,6 +411,11 @@ MixFileFactoryClass::Get_Temp_Filename (const char *path, StringClass &full_path
*/
SimpleFileFactoryClass _SimpleFileFactory;

MixFileCreator::MixFileCreator( const std::filesystem::path & path )
: MixFileCreator(path.generic_string().c_str())
{
}

MixFileCreator::MixFileCreator( const char * filename )
{
WWDEBUG_SAY(( "Creating Mix File %s\n", filename ));
Expand Down Expand Up @@ -597,30 +605,22 @@ void MixFileCreator::Add_File( const char * filename, FileClass *file )
*/
void Add_Files( const char * dir, MixFileCreator & mix )
{
BOOL bcontinue = true;
HANDLE hfile_find;
WIN32_FIND_DATAA find_info = {0};
StringClass path;
path.Format( "data/makemix/%s*.*", dir );
WWDEBUG_SAY(( "Adding files from %s\n", path.Peek_Buffer() ));

for (hfile_find = ::FindFirstFileA( path, &find_info);
(hfile_find != INVALID_HANDLE_VALUE) && bcontinue;
bcontinue = ::FindNextFileA(hfile_find, &find_info)) {
if ( find_info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) {
if ( find_info.cFileName[0] != '.' ) {
StringClass sub_path;
sub_path.Format( "%s%s/", dir, find_info.cFileName );
Add_Files( sub_path, mix );
}
} else {
StringClass name;
name.Format( "%s%s", dir, find_info.cFileName );
StringClass source;
source.Format( "makemix/%s", name.Peek_Buffer() );
mix.Add_File( source, name );
// WWDEBUG_SAY(( "Adding file from %s %s\n", source, name ));
std::error_code ec;
for (auto & dir_entry : std::filesystem::recursive_directory_iterator{dir, ec}) {
if (!dir_entry.is_regular_file()) {
continue;
}
StringClass name;
name.Format( "%s", dir_entry.path().generic_string().c_str() );
StringClass source;
source.Format( "makemix/%s", name.Peek_Buffer() );

mix.Add_File( source, name );
// WWDEBUG_SAY(( "Adding file from %s %s\n", source, name ));
}
}

Expand Down
4 changes: 3 additions & 1 deletion Code/wwlib/mixfile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
#endif

#include "vector.h"
#include <filesystem>

class FileClass;

Expand Down Expand Up @@ -93,7 +94,7 @@ class MixFileFactoryClass : public FileFactoryClass {
//
// Utility functions
//
bool Get_Temp_Filename (const char *path, StringClass &full_path);
bool Get_Temp_Filename (const std::filesystem::path &path, std::filesystem::path &full_path);

struct FileInfoStruct {
bool operator== (const FileInfoStruct &/* src*/) { return false; }
Expand Down Expand Up @@ -132,6 +133,7 @@ class MixFileFactoryClass : public FileFactoryClass {
class MixFileCreator {

public:
MixFileCreator( const std::filesystem::path &filename );
MixFileCreator( const char * filename );
~MixFileCreator( void );

Expand Down
Loading