WIP

WinMerge · Feb 23, 2025 · be97622 · be97622
1 parent 0897948
commit be97622
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 5 deletions.
diff --git a/Externals/poco/Foundation/Foundation.vcxproj b/Externals/poco/Foundation/Foundation.vcxproj
@@ -460,6 +460,16 @@
     <ClCompile Include="src\Exception.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="src\FileChannel.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="src\Format.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -534,6 +544,16 @@
     <ClCompile Include="src\RefCountedObject.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="src\SimpleFileChannel.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="src\StringTokenizer.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -826,6 +846,7 @@
     <ClInclude Include="include\Poco\Buffer.h" />
     <ClInclude Include="include\Poco\Bugcheck.h" />
     <ClInclude Include="include\Poco\ByteOrder.h" />
+    <ClInclude Include="include\Poco\Channel.h" />
     <ClInclude Include="include\Poco\Clock.h" />
     <ClInclude Include="include\Poco\Config.h" />
     <ClInclude Include="include\Poco\Debugger.h" />

diff --git a/Externals/poco/Foundation/Foundation.vcxproj.filters b/Externals/poco/Foundation/Foundation.vcxproj.filters
@@ -562,6 +562,12 @@
     <ClCompile Include="src\WindowsConsoleChannel.cpp">
       <Filter>Logging\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SimpleFileChannel.cpp">
+      <Filter>Logging\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\FileChannel.cpp">
+      <Filter>Logging\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\Poco\Any.h">
@@ -1062,5 +1068,8 @@
     <ClInclude Include="include\Poco\Logger.h">
       <Filter>Logging\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Channel.h">
+      <Filter>Logging\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/Externals/poco/Foundation/src/Foundation.cpp b/Externals/poco/Foundation/src/Foundation.cpp
@@ -32,7 +32,14 @@
 #include "LoggingRegistry.cpp"
 #include "Message.cpp"
 #include "Configurable.cpp"
-#include "WindowsConsoleChannel.cpp"
+#include "SimpleFileChannel.cpp"
+#include "FormattingChannel.cpp"
+#include "Formatter.cpp"
+#include "PatternFormatter.cpp"
+#include "DateTimeFormat.cpp"
+#include "DateTimeFormatter.cpp"
+#include "Timezone.cpp"
+#include "LogFile.cpp"
 // Notifications
 #include "AbstractObserver.cpp"
 #include "Notification.cpp"

diff --git a/Src/ILogger.h b/Src/ILogger.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "UnicodeString.h"
+
+class ILogger {
+public:
+	virtual ~ILogger() = default;
+
+	virtual void info(const String& message) = 0;
+	virtual void warn(const String& message) = 0;
+	virtual void error(const String& message) = 0;
+	virtual void debug(const String& message) = 0;
+};
diff --git a/Src/Merge.cpp b/Src/Merge.cpp
@@ -70,7 +70,9 @@
 #include "SysColorHook.h"
 #include <../src/mfc/afximpl.h>
 #include "Poco/Logger.h"
-#include "Poco/WindowsConsoleChannel.h"
+#include "Poco/SimpleFileChannel.h"
+#include "Poco/PatternFormatter.h"
+#include "Poco/FormattingChannel.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -319,9 +321,13 @@ BOOL CMergeApp::InitInstance()
 		}
 	}
 
-	Poco::Channel::Ptr pchannel = new Poco::WindowsConsoleChannel();
-	Poco::Logger& log = Poco::Logger::create("test", pchannel);
-	log.error("test");
+	Poco::AutoPtr<Poco::SimpleFileChannel> fileChannel(new Poco::SimpleFileChannel("log.txt"));
+	Poco::AutoPtr<Poco::PatternFormatter> formatter(new Poco::PatternFormatter);
+	formatter->setProperty("pattern", "%Y-%m-%d %H:%M:%S [%p] %t");
+	Poco::AutoPtr<Poco::FormattingChannel> formattingChannel(new Poco::FormattingChannel(formatter, fileChannel));
+	Poco::Logger& log = Poco::Logger::create("test", formattingChannel);
+	log.error("test1");
+	log.error("test2");
 
 	// Initialize temp folder
 	SetupTempPath();

diff --git a/Src/Merge.vcxproj b/Src/Merge.vcxproj
@@ -1462,6 +1462,7 @@
     <ClInclude Include="ColorSchemes.h" />
     <ClInclude Include="Common\AccentColor.h" />
     <ClInclude Include="Common\SysColorHook.h" />
+    <ClInclude Include="ILogger.h" />
     <ClInclude Include="MouseHook.h" />
     <ClInclude Include="MenuBar.h" />
     <ClInclude Include="Common\cio.h" />
@@ -1487,6 +1488,7 @@
     <ClInclude Include="OutputBar.h" />
     <ClInclude Include="OutputDoc.h" />
     <ClInclude Include="OutputView.h" />
+    <ClInclude Include="PocoLogger.h" />
     <ClInclude Include="PropCompareWebPage.h" />
     <ClInclude Include="PropEditorCompareMerge.h" />
     <ClInclude Include="PropertySystem.h" />

diff --git a/Src/Merge.vcxproj.filters b/Src/Merge.vcxproj.filters
@@ -1460,6 +1460,12 @@
     <ClInclude Include="OutputDoc.h">
       <Filter>MFCGui\Main\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="ILogger.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PocoLogger.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="res\binarydiff.ico">

diff --git a/Src/PocoLogger.h b/Src/PocoLogger.h