improve NOTIFICATOR_DEBUG_OPEN_FILE

improve NOTIFICATOR_DEBUG_CLOSE_FILE
irov · Nov 3, 2024 · fc29582 · fc29582
1 parent aad8947
commit fc29582
Show file tree

Hide file tree

Showing 43 changed files with 142 additions and 2,429 deletions.
diff --git a/src/Engine/Application.cpp b/src/Engine/Application.cpp
@@ -1478,7 +1478,7 @@ namespace Mengine
         }
     }
     //////////////////////////////////////////////////////////////////////////
-    void Application::notifyDebugOpenFile_( const Char * _folder, const Char * _filePath, bool _streaming )
+    void Application::notifyDebugOpenFile_( const FilePath & _folder, const FilePath & _filePath, bool _read, bool _streaming )
     {
         bool isMainThread = THREAD_SERVICE()
             ->isMainThread();
@@ -1487,16 +1487,18 @@ namespace Mengine
         {
             if( _streaming == false )
             {
-                LOGGER_VERBOSE_LEVEL( "debug", LM_MESSAGE_RELEASE, LFILTER_NONE, LCOLOR_GREEN, nullptr, 0, LFLAG_SHORT )("open %s%s"
-                    , _folder
-                    , _filePath
+                LOGGER_VERBOSE_LEVEL( "debug", LM_MESSAGE_RELEASE, LFILTER_NONE, LCOLOR_GREEN, nullptr, 0, LFLAG_SHORT )("open %s %s%s"
+                    , _read == true ? "read" : "write"
+                    , _folder.c_str()
+                    , _filePath.c_str()
                     );
             }
             else
             {
-                LOGGER_VERBOSE_LEVEL( "debug", LM_MESSAGE_RELEASE, LFILTER_NONE, LCOLOR_GREEN, nullptr, 0, LFLAG_SHORT )("streaming %s%s"
-                    , _folder
-                    , _filePath
+                LOGGER_VERBOSE_LEVEL( "debug", LM_MESSAGE_RELEASE, LFILTER_NONE, LCOLOR_GREEN, nullptr, 0, LFLAG_SHORT )("streaming %s %s%s"
+                    , _read == true ? "read" : "write"
+                    , _folder.c_str()
+                    , _filePath.c_str()
                     );
             }
         }
@@ -1507,18 +1509,20 @@ namespace Mengine
 
             if( _streaming == false )
             {
-                LOGGER_VERBOSE_LEVEL( "debug", LM_MESSAGE_RELEASE, LFILTER_NONE, LCOLOR_GREEN, nullptr, 0, LFLAG_SHORT )("open [multithread:%" MENGINE_PRIu64 "] open %s%s"
+                LOGGER_VERBOSE_LEVEL( "debug", LM_MESSAGE_RELEASE, LFILTER_NONE, LCOLOR_GREEN, nullptr, 0, LFLAG_SHORT )("open [multithread:%" MENGINE_PRIu64 "] open %s %s%s"
                     , tid
-                    , _folder
-                    , _filePath
+                    , _read == true ? "read" : "write"
+                    , _folder.c_str()
+                    , _filePath.c_str()
                     );
             }
             else
             {
-                LOGGER_VERBOSE_LEVEL( "debug", LM_MESSAGE_RELEASE, LFILTER_NONE, LCOLOR_GREEN, nullptr, 0, LFLAG_SHORT )("streaming [multithread:%" MENGINE_PRIu64 "] open %s%s"
+                LOGGER_VERBOSE_LEVEL( "debug", LM_MESSAGE_RELEASE, LFILTER_NONE, LCOLOR_GREEN, nullptr, 0, LFLAG_SHORT )("streaming [multithread:%" MENGINE_PRIu64 "] open %s %s%s"
                     , tid
-                    , _folder
-                    , _filePath
+                    , _read == true ? "read" : "write"
+                    , _folder.c_str()
+                    , _filePath.c_str()
                     );
             }
         }

diff --git a/src/Engine/Application.h b/src/Engine/Application.h
@@ -179,7 +179,7 @@ namespace Mengine
 
     protected:
         void updateDebugOpenFile_();
-        void notifyDebugOpenFile_( const Char * _folder, const Char * _filePath, bool _streaming );
+        void notifyDebugOpenFile_( const FilePath & _folder, const FilePath & _filePath, bool _read, bool _streaming );
 
     protected:
         void updateDebugResourceCompile_();

diff --git a/src/Interface/NotificatorInterface.h b/src/Interface/NotificatorInterface.h
@@ -5,6 +5,7 @@
 #include "Kernel/Tuple.h"
 #include "Kernel/String.h"
 #include "Kernel/ConstString.h"
+#include "Kernel/FilePath.h"
 #include "Kernel/Tags.h"
 #include "Kernel/Factorable.h"
 #include "Kernel/Resolution.h"
@@ -57,8 +58,8 @@ namespace Mengine
     template<> struct Notificator<NAME> { typedef Tuple<__VA_ARGS__> args_type; static const Char * getName() { return #NAME; } }
     //////////////////////////////////////////////////////////////////////////
     MENGINE_NOTIFICATOR_DECLARE_BEGIN();
-    MENGINE_NOTIFICATOR_DECLARE( NOTIFICATOR_DEBUG_OPEN_FILE, const Char *, const Char *, bool );
-    MENGINE_NOTIFICATOR_DECLARE( NOTIFICATOR_DEBUG_CLOSE_FILE, const Char *, const Char *, bool );
+    MENGINE_NOTIFICATOR_DECLARE( NOTIFICATOR_DEBUG_OPEN_FILE, const FilePath &, const FilePath &, bool, bool );
+    MENGINE_NOTIFICATOR_DECLARE( NOTIFICATOR_DEBUG_CLOSE_FILE, const FilePath &, const FilePath &, bool, bool );
     MENGINE_NOTIFICATOR_DECLARE( NOTIFICATOR_ASSERTION, const Char *, EAssertionLevel, const Char *, const Char *, int32_t, const Char * );
     MENGINE_NOTIFICATOR_DECLARE( NOTIFICATOR_ABORT, const Char * );
     MENGINE_NOTIFICATOR_DECLARE( NOTIFICATOR_CRASH, const Char * );

diff --git a/src/Plugins/Win32FileGroupPlugin/CMakeLists.txt b/src/Plugins/Win32FileGroupPlugin/CMakeLists.txt
diff --git a/src/Plugins/Win32FileGroupPlugin/Win32ConcatenateFileHelper.cpp b/src/Plugins/Win32FileGroupPlugin/Win32ConcatenateFileHelper.cpp
diff --git a/src/Plugins/Win32FileGroupPlugin/Win32ConcatenateFileHelper.h b/src/Plugins/Win32FileGroupPlugin/Win32ConcatenateFileHelper.h