GetConditionalTextWriter, try add spectre, 0.4.0

AvalonLog.fsproj

@@ -17,15 +17,19 @@
     <Product>AvalonLog</Product>
     <PackageId>AvalonLog</PackageId>
 
-    <Version>0.3.1</Version>
-    <AssemblyVersion>0.3.1</AssemblyVersion>
-    <FileVersion>0.3.1</FileVersion>
-    <PackageReleaseNotes>Update Xml Docstrings.</PackageReleaseNotes>
+    <Version>0.4.0</Version>
+    <AssemblyVersion>0.4.0</AssemblyVersion>
+    <FileVersion>0.4.0</FileVersion>
+    <PackageReleaseNotes>
+      - Update to AvalonEditB 1.2.0
+      - Rename GetTextWriterIf to GetConditionalTextWriter
+    </PackageReleaseNotes>
 
     <Authors>GoswinR</Authors>
     <Copyright>Goswin Rothenthal 2021</Copyright>
-
+    <PackageDescription>A fast and threadsave WPF text viewer for colored text. Including F# printf formating . Based on AvalonEdit</PackageDescription>
     <Description>A fast and threadsave WPF text viewer for colored text. Including F# printf formating. Based on AvalonEdit</Description>
+
     <!-- <ApplicationIcon>Docs/logo.ico</ApplicationIcon> -->
 
     <Configurations>Debug;Release</Configurations>
@@ -48,7 +52,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AvalonEditB" Version="1.0.0" />
+    <PackageReference Include="AvalonEditB" Version="1.2.0" />
     <!-- <Reference Include="AvalonEditB" HintPath="../AvalonEditB/AvalonEditB/bin/Release/net472/AvalonEditB.dll" /> -->
 
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />

Doc/READMEnuget.md

@@ -48,10 +48,19 @@ public void AppendWithBrush(SolidColorBrush br, string s)
 and similar functions on the `AvalonLog` instance.
 ### Documentation
 
-See extracted API at <a href="https://www.fuget.org/packages/AvalonLog/0.3.1/lib/net472/AvalonLog.dll/AvalonLog" target="_blank">fuget.org</a> 
+See extracted API at <a href="https://www.fuget.org/packages/AvalonLog/0.4.0/lib/net472/AvalonLog.dll/AvalonLog" target="_blank">fuget.org</a> 
 
 ### Licence
 
 MIT
 
-Logo by [LovePik](https://lovepik.com/image-401268798/crystal-parrot-side-cartoon.html)
+Logo by [LovePik](https://lovepik.com/image-401268798/crystal-parrot-side-cartoon.html)
+
+### Changelog
+
+ `0.3.1` 
+- Update Xml Docstrings
+
+`0.4.0`
+- Update to AvalonEditB `1.2.0` 
+- Rename `GetTextWriterIf` to `GetConditionalTextWriter`

README.md

@@ -51,7 +51,7 @@ public void AppendWithBrush(SolidColorBrush br, string s)
 and similar functions on the `AvalonLog` instance.
 ### Documentation
 
-See extracted API at <a href="https://www.fuget.org/packages/AvalonLog/0.3.1/lib/net472/AvalonLog.dll/AvalonLog" target="_blank">fuget.org</a> 
+See extracted API at <a href="https://www.fuget.org/packages/AvalonLog/0.4.0/lib/net472/AvalonLog.dll/AvalonLog" target="_blank">fuget.org</a> 
 
 ### Download
 
@@ -66,3 +66,12 @@ Just run `dotnet build`
 MIT
 
 Logo by [LovePik](https://lovepik.com/image-401268798/crystal-parrot-side-cartoon.html)
+
+### Changelog
+
+ `0.3.1` 
+- Update Xml Docstrings
+
+`0.4.0`
+- Update to AvalonEditB `1.2.0` 
+- Rename `GetTextWriterIf` to `GetConditionalTextWriter`

Src/AvalonLog.fs

@@ -18,11 +18,55 @@ open AvalonEditB.Document
 type LogTextWriter(write,writeLine) = 
     inherit TextWriter()
     override _.Encoding = Text.Encoding.Default // ( UTF-16 )
-    override _.Write     (s:string)  = write (s)
-    override _.WriteLine (s:string)  = writeLine (s)    // actually never used in F# printfn , see  https://github.com/dotnet/fsharp/issues/3712
+
+    override _.Write     (s:string)  = 
+        //if s.Contains "\u001b" then  write ("esc"+s) else write ("?"+s) //debugging for using  spectre ?? https://github.com/spectreconsole/spectre.console/discussions/573            
+        write (s) 
+
+    override _.WriteLine (s:string)  = // actually never used in F# printfn, but maybe buy other toos using the console or error out , see  https://github.com/dotnet/fsharp/issues/3712
+        //if s.Contains "\u001b" then  writeLine ("eSc"+s) else writeLine ("?"+s) 
+        writeLine (s)    
+
     override _.WriteLine ()          = writeLine ("")
 
 
+    (*
+       trying to enable Ansi Control sequences for https://github.com/spectreconsole/spectre.console
+
+       but doeant work yet ESC char seam to be swallowed by Console.SetOut to textWriter. see:
+
+       //https://stackoverflow.com/a/34078058/969070
+       //let stdout = Console.OpenStandardOutput()
+       //let con = new StreamWriter(stdout, Encoding.ASCII)      
+       
+       The .Net Console.WriteLine uses an internal __ConsoleStream that checks if the Console.Out is as file handle or a console handle. 
+       By default it uses a console handle and therefor writes to the console by calling WriteConsoleW. In the remarks you find:
+       
+       Although an application can use WriteConsole in ANSI mode to write ANSI characters, consoles do not support ANSI escape sequences. 
+       However, some functions provide equivalent functionality. For more information, see SetCursorPos, SetConsoleTextAttribute, and GetConsoleCursorInfo.
+       
+       To write the bytes directly to the console without WriteConsoleW interfering a simple filehandle/stream will do which is achieved by calling OpenStandardOutput. 
+       By wrapping that stream in a StreamWriter so we can set it again with Console.SetOut we are done. The byte sequences are send to the OutputStream and picked up by AnsiCon.
+  
+       let strWriter = l.AvalonLog.GetStreamWriter( LogColors.consoleOut) // Encoding.ASCII ??  
+       Console.SetOut(strWriter)
+/// A TextWriter that writes using a function.
+/// To set Console.Out to a text writer get one via AvalonLog.GetTextWriter(red,green,blue)
+type LogStreamWriter(ms:MemoryStream,write,writeLine) = 
+    inherit StreamWriter(ms)
+    override _.Encoding = Text.Encoding.Default // ( UTF-16 )
+    override _.Write (s:string) :  unit = 
+        if s.Contains "\u001b" then  write ("esc"+s) else write ("?"+s) //use specter ?? https://github.com/spectreconsole/spectre.console/discussions/573            
+        //write (s) 
+    override _.WriteLine (s:string)  :  unit = // actually never used in F# printfn, but maybe buy other toos using the console or error out , see  https://github.com/dotnet/fsharp/issues/3712
+        if s.Contains "\u001b" then  writeLine ("eSc"+s) else writeLine ("?"+s) 
+        //writeLine (s)    
+    override _.WriteLine ()          = writeLine ("")
+       *)
+
+
+
+
 /// <summary>A ReadOnly text AvalonEdit Editor that provides colored appending via printfn like functions. </summary>
 /// <remarks>Use the hidden member AvalonEdit if you need to access the underlying TextEditor class from AvalonEdit for styling.
 /// Don't append or change the AvalonEdit.Text property directly. This will mess up the coloring.
@@ -287,44 +331,58 @@ type AvalonLog () =
     /// or System.Console.SetError(textWriter)
     member _.GetTextWriter(red, green, blue) = 
         let br = Brush.ofRGB red green blue
-        new LogTextWriter(
-                (fun s -> printOrBuffer (s, false, br)),
-                (fun s -> printOrBuffer (s, true , br))
-                )
+        new LogTextWriter   (fun s -> printOrBuffer (s, false, br)
+                            ,fun s -> printOrBuffer (s, true , br)
+                            )
 
     /// Returns a threadsafe Textwriter that prints to AvalonLog in Color
     /// for use as use System.Console.SetOut(textWriter)
     /// or System.Console.SetError(textWriter)
     member _.GetTextWriter(br:SolidColorBrush) = 
         let fbr = br|> freeze
-        new LogTextWriter(
-                (fun s -> printOrBuffer (s, false, fbr)),
-                (fun s -> printOrBuffer (s, true , fbr))
-                )
+        new LogTextWriter   (fun s -> printOrBuffer (s, false, fbr)
+                            ,fun s -> printOrBuffer (s, true , fbr)
+                            )
 
     /// Returns a threadsafe Textwriter that only prints to AvalonLog
     /// if the predicate returns true for the string sent to the text writer.
     /// The provide Color will be used.
-    member _.GetTextWriterIf(predicate:string->bool, br:SolidColorBrush) = 
+    member _.GetConditionalTextWriter(predicate:string->bool, br:SolidColorBrush) = 
         let fbr = br|> freeze
-        new LogTextWriter(
-                (fun s -> if predicate s then printOrBuffer (s, false, fbr)),
-                (fun s -> if predicate s then printOrBuffer (s, true , fbr))
-                )
+        new LogTextWriter   (fun s -> printOrBuffer (s, false, fbr)
+                            ,fun s -> printOrBuffer (s, true , fbr)
+                            )
+
 
     /// Returns a threadsafe Textwriter that only prints to AvalonLog
     /// if the predicate returns true for the string sent to the text writer.
     /// The predicate can also be used for other side effects before printing.
     /// The provided red, green and blue Color values will be used will be used.
     /// Intgers will be clamped to be between 0 and 255
-    member _.GetTextWriterIf(predicate:string->bool, red, green, blue) = 
+    member _.GetConditionalTextWriter(predicate:string->bool, red, green, blue) = 
         let br = Brush.ofRGB red green blue
-        new LogTextWriter(
-                (fun s -> if predicate s then printOrBuffer (s, false, br)),
-                (fun s -> if predicate s then printOrBuffer (s, true , br))
-                )
+        new LogTextWriter   (fun s -> printOrBuffer (s, false, br)
+                            ,fun s -> printOrBuffer (s, true , br)
+                            )
 
+    (*
+    part of trying to enable Ansi Control sequences for https://github.com/spectreconsole/spectre.console
+    https://stackoverflow.com/a/34078058/969070
 
+    member _.GetStreamWriter(br:SolidColorBrush) = 
+        let fbr = br|> freeze
+        new LogStreamWriter (new MemoryStream()
+                            ,fun s -> printOrBuffer (s, false, fbr)
+                            ,fun s -> printOrBuffer (s, true , fbr)
+                            )
+    
+    member _.GetStreamWriter(red, green, blue) = 
+        let br = Brush.ofRGB red green blue
+        new LogStreamWriter (new MemoryStream()
+                            ,fun s -> printOrBuffer (s, false, br)
+                            ,fun s -> printOrBuffer (s, true , br)
+                            )
+    *)
 
     //--------------------------------------
     // Append string: