浏览代码

Fixed output and messages

Ivan Arkhipov 5 年之前
父节点
当前提交
fbf5981e10
共有 3 个文件被更改,包括 9 次插入4 次删除
  1. 1 0
      src/DatSubsystems/DatBackupManager.cpp
  2. 7 3
      src/DatSubsystems/DatExporter.cpp
  3. 1 1
      src/DatSubsystems/DatFileSystem.cpp

+ 1 - 0
src/DatSubsystems/DatBackupManager.cpp

@@ -6,6 +6,7 @@
 #include <DatSubsystems/DatBackupManager.h>
 
 #include "DatSubsystems/DatBackupManager.h"
+
 #include "EasyLogging++/easylogging++.h"
 
 namespace LOTRO_DAT {

+ 7 - 3
src/DatSubsystems/DatExporter.cpp

@@ -31,11 +31,12 @@ namespace LOTRO_DAT {
         dat->GetStatusModule().SetStatus(DatStatus::E_EXTRACTING);
         dat->GetStatusModule().SetPercentage(0);
         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 {
             iterated_files++;
             dat->GetStatusModule().SetPercentage(iterated_files * 100u / dat->GetFileSystem().GetInitialisedFilesNumber());
-            if ((file->FileType() & type) == 0)
+            if ((file->FileType() & type) == NO_TYPE)
                 return;
 
             SubfileData export_file = file->PrepareForExport(dat->GetFileSystem().GetFileData(file->file_id(), 8).value);
@@ -55,6 +56,7 @@ namespace LOTRO_DAT {
                 success_exported++;
         });
 
+        LOG(INFO) << "Extracting files: successfully exported " << success_exported << " files";
         dat->GetStatusModule().ClearAll();
         return DatOperationResult<int>(success_exported, SUCCESS);
     }
@@ -123,6 +125,7 @@ namespace LOTRO_DAT {
         dat->GetStatusModule().SetStatus(DatStatus::E_EXTRACTING);
         dat->GetStatusModule().SetPercentage(0);
         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 iterated_files = 0;
@@ -131,10 +134,10 @@ namespace LOTRO_DAT {
             iterated_files++;
             dat->GetStatusModule().SetPercentage(iterated_files * 100u / dat->GetFileSystem().GetInitialisedFilesNumber());
 
-            if ((file->FileType() & type) == 0)
+            if ((file->FileType() & type) == NO_TYPE)
                 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);
 
@@ -144,6 +147,7 @@ namespace LOTRO_DAT {
                 success_exported++;
         });
 
+        LOG(INFO) << "Extracting files: successfully exported " << success_exported << " files";
         dat->GetStatusModule().ClearAll();
         return DatOperationResult<int>(success_exported, SUCCESS);
     }

+ 1 - 1
src/DatSubsystems/DatFileSystem.cpp

@@ -318,7 +318,7 @@ namespace LOTRO_DAT {
             return DatOperationResult<>(ERROR, "DATFSINITSUBFILE: initialised subfile pointer is empty");
 
         if (!CheckCorrectSubfile(initialised_file).value)
-            return DatOperationResult<>(ERROR, "DATFSINITSUBFILE: initialised file " + std::to_string(file.file_id()) + "is incorrect");
+            return DatOperationResult<>(ERROR, "DATFSINITSUBFILE: initialised file " + std::to_string(file.file_id()) + " is incorrect");
 
         if (dictionary_.count(file_id) > 0) {
             LOG(WARNING) << "Dublicate files id = " << file_id << "dictionary offsets = "