|
@@ -31,11 +31,12 @@ namespace LOTRO_DAT {
|
|
dat->GetStatusModule().SetStatus(DatStatus::E_EXTRACTING);
|
|
dat->GetStatusModule().SetStatus(DatStatus::E_EXTRACTING);
|
|
dat->GetStatusModule().SetPercentage(0);
|
|
dat->GetStatusModule().SetPercentage(0);
|
|
dat->GetStatusModule().SetDebugMessage("Starting extracting files of type " + std::to_string(type));
|
|
dat->GetStatusModule().SetDebugMessage("Starting extracting files of type " + std::to_string(type));
|
|
|
|
+ LOG(INFO) << "Extracting files by type " + std::to_string(type) + "to database...";
|
|
|
|
|
|
auto operation = dat->GetFileSystem().PerformOperationOnAllFiles([&iterated_files, &success_exported, this, type, &output_directory_path](std::shared_ptr<SubFile>& file) -> void {
|
|
auto operation = dat->GetFileSystem().PerformOperationOnAllFiles([&iterated_files, &success_exported, this, type, &output_directory_path](std::shared_ptr<SubFile>& file) -> void {
|
|
iterated_files++;
|
|
iterated_files++;
|
|
dat->GetStatusModule().SetPercentage(iterated_files * 100u / dat->GetFileSystem().GetInitialisedFilesNumber());
|
|
dat->GetStatusModule().SetPercentage(iterated_files * 100u / dat->GetFileSystem().GetInitialisedFilesNumber());
|
|
- if ((file->FileType() & type) == 0)
|
|
|
|
|
|
+ if ((file->FileType() & type) == NO_TYPE)
|
|
return;
|
|
return;
|
|
|
|
|
|
SubfileData export_file = file->PrepareForExport(dat->GetFileSystem().GetFileData(file->file_id(), 8).value);
|
|
SubfileData export_file = file->PrepareForExport(dat->GetFileSystem().GetFileData(file->file_id(), 8).value);
|
|
@@ -55,6 +56,7 @@ namespace LOTRO_DAT {
|
|
success_exported++;
|
|
success_exported++;
|
|
});
|
|
});
|
|
|
|
|
|
|
|
+ LOG(INFO) << "Extracting files: successfully exported " << success_exported << " files";
|
|
dat->GetStatusModule().ClearAll();
|
|
dat->GetStatusModule().ClearAll();
|
|
return DatOperationResult<int>(success_exported, SUCCESS);
|
|
return DatOperationResult<int>(success_exported, SUCCESS);
|
|
}
|
|
}
|
|
@@ -123,6 +125,7 @@ namespace LOTRO_DAT {
|
|
dat->GetStatusModule().SetStatus(DatStatus::E_EXTRACTING);
|
|
dat->GetStatusModule().SetStatus(DatStatus::E_EXTRACTING);
|
|
dat->GetStatusModule().SetPercentage(0);
|
|
dat->GetStatusModule().SetPercentage(0);
|
|
dat->GetStatusModule().SetDebugMessage("Initialising extraction of files by type " + std::to_string(type) + "to database...");
|
|
dat->GetStatusModule().SetDebugMessage("Initialising extraction of files by type " + std::to_string(type) + "to database...");
|
|
|
|
+ LOG(INFO) << "Extracting files by type " + std::to_string(type) + "to database...";
|
|
|
|
|
|
int success_exported = 0;
|
|
int success_exported = 0;
|
|
int iterated_files = 0;
|
|
int iterated_files = 0;
|
|
@@ -131,10 +134,10 @@ namespace LOTRO_DAT {
|
|
iterated_files++;
|
|
iterated_files++;
|
|
dat->GetStatusModule().SetPercentage(iterated_files * 100u / dat->GetFileSystem().GetInitialisedFilesNumber());
|
|
dat->GetStatusModule().SetPercentage(iterated_files * 100u / dat->GetFileSystem().GetInitialisedFilesNumber());
|
|
|
|
|
|
- if ((file->FileType() & type) == 0)
|
|
|
|
|
|
+ if ((file->FileType() & type) == NO_TYPE)
|
|
return;
|
|
return;
|
|
|
|
|
|
- dat->GetStatusModule().SetDebugMessage("Extracting file " + std::to_string(file->file_id()) + " (Files by type -> directory)");
|
|
|
|
|
|
+ dat->GetStatusModule().SetDebugMessage("Extracting file " + std::to_string(file->file_id()) + " (Files by type -> database)");
|
|
|
|
|
|
SubfileData export_file = file->PrepareForExport(dat->GetFileSystem().GetFileData(file->file_id(), 8).value);
|
|
SubfileData export_file = file->PrepareForExport(dat->GetFileSystem().GetFileData(file->file_id(), 8).value);
|
|
|
|
|
|
@@ -144,6 +147,7 @@ namespace LOTRO_DAT {
|
|
success_exported++;
|
|
success_exported++;
|
|
});
|
|
});
|
|
|
|
|
|
|
|
+ LOG(INFO) << "Extracting files: successfully exported " << success_exported << " files";
|
|
dat->GetStatusModule().ClearAll();
|
|
dat->GetStatusModule().ClearAll();
|
|
return DatOperationResult<int>(success_exported, SUCCESS);
|
|
return DatOperationResult<int>(success_exported, SUCCESS);
|
|
}
|
|
}
|