Fixed stackoverflow issue in libvt100

Author: tig

src/WinPrint.Console/WinPrint.Console.csproj

@@ -9,7 +9,7 @@
     <AssemblyName>winprint</AssemblyName>
     <StartupObject></StartupObject>
 
-    <Version>2.0.3.76</Version>
+    <Version>2.0.3.82</Version>
     <Company>Kindel Systems</Company>
     <Product>winprint</Product>
     <Authors>Charlie Kindel</Authors>

src/WinPrint.Core/ContentTypeEngines/AnsiCte.cs

@@ -1,9 +1,14 @@
 // Copyright Kindel Systems, LLC - http://www.kindel.com
 // Published under the MIT License at https://github.com/tig/winprint
 
+/// <summary>
+/// Define this to use the DyanmicScreen class. Otherwise, use Screen
+/// </summary>
+
 using System;
 using System.Drawing;
 using System.IO;
+using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
@@ -28,13 +33,12 @@ public class AnsiCte : ContentTypeEngineBase, IDisposable {
         public static AnsiCte Create() {
             var engine = new AnsiCte();
             // Populate it with the common settings
-            engine.CopyPropertiesFrom(ModelLocator.Current.Settings.TextContentTypeEngineSettings);
+            engine.CopyPropertiesFrom(ModelLocator.Current.Settings.AnsiContentTypeEngineSettings);
             return engine;
         }
 
         // All of the lines of the text file, after reflow/line-wrap
         private DynamicScreen _screen;
-
         public IAnsiDecoderClient DecoderClient { get => (IAnsiDecoderClient)_screen; }
 
         private float _lineHeight;
@@ -144,46 +148,7 @@ public override async Task<int> RenderAsync(System.Drawing.Printing.PrinterResol
                 vt100.Input(bytes);
             }
 
-#if TESTVT100
-            _screen[_screen.Lines.Count][0] = new Character('0') { Attributes = new GraphicAttributes() { ForegroundColor = Color.Red } };
-
-            for (var x = 0; x < _screen.Width; x++) {
-                var c = _screen[x, x];
-                if (c == null) c = new Character('*');
-                _screen[x,x] = new Character(c.Char) { Attributes = new GraphicAttributes() { ForegroundColor = Color.Red } };
-            }
-
-            for (var x = 0; x < 20; x++) {
-                _screen[11][x] = new Character((char)((int)'0' + x)) { Attributes = new GraphicAttributes() { 
-                    Bold = true, 
-                    ForegroundColor = Color.Red } };
-            }
-
-            for (var x = 0; x < _screen.Width; x++) {
-                var c = _screen[x,20];
-                if (c == null) c = new Character(' ');
-                _screen[20][x] = new Character(c.Char) {
-                    Attributes = new GraphicAttributes() {
-                        Bold = true,
-                        ForegroundColor = Color.Green
-                    }
-                };
-            }
-
-            _screen[8][0] = new Character('_') { Attributes = new GraphicAttributes() { ForegroundColor = Color.Red } };
-            _screen[23][31] = new Character('>') { Attributes = new GraphicAttributes() { ForegroundColor = Color.Red } };
-            _screen[57][0] = new Character('{') { Attributes = new GraphicAttributes() { ForegroundColor = Color.Red } };
-
-            _screen.CursorPosition = new Point(0, 0);
-
-            var w = new StreamWriter("PygmentsCte.txt");
-            w.Write(_screen);
-            w.Close();
-#endif
-
-
             var n = (int)Math.Ceiling(_screen.Lines.Count / (double)_linesPerPage);
-
             Log.Debug("Rendered {pages} pages of {linesperpage} lines per page, for a total of {lines} lines.", n, _linesPerPage, _screen.Lines.Count);
             return await Task.FromResult(n);
         }
@@ -289,6 +254,7 @@ public override void PaintPage(Graphics g, int pageNum) {
                     g.DrawRectangle(Pens.Red, lineNumberWidth, yPos, PageSize.Width - lineNumberWidth, _lineHeight);
                 }
             }
+
 #if CURSOR
             if (_screen.CursorPosition.Y >= firstLineOnPage && _screen.CursorPosition.Y < firstLineOnPage + _linesPerPage) {
                 var text = $"{(char)219}";
@@ -299,7 +265,7 @@ public override void PaintPage(Graphics g, int pageNum) {
                 //g.DrawString(text, _cachedFont, new SolidBrush(Color.Blue), rect, StringFormat);
                 g.DrawRectangle(Pens.Black, x + _screen.CursorPosition.X * width, _screen.CursorPosition.Y * _lineHeight, width, _lineHeight);
             }
-#endif 
+#endif
             Log.Debug("Painted {lineOnPage} lines.", i - 1);
         }
     }

src/WinPrint.Core/ContentTypeEngines/ContentTypeEngineBase.cs

@@ -24,7 +24,7 @@ namespace WinPrint.Core.ContentTypeEngines {
     public abstract class ContentTypeEngineBase : ModelBase, INotifyPropertyChanged {
         public static string DefaultContentType = "text/plain";
         public static string DefaultCteClassName = "AnsiCte";
-        public static string DefaultSyntaxHighlighterCteNameClassName = "PrismCte";
+        public static string DefaultSyntaxHighlighterCteNameClassName = "AnsiCte";
 
         public new event PropertyChangedEventHandler PropertyChanged;
         protected new void OnPropertyChanged([CallerMemberName] string propertyName = null) {

src/WinPrint.Core/Models/ContentSettings.cs

@@ -34,6 +34,13 @@ public class ContentSettings : ModelBase {
         public int Darkness { get => _darkness; set => SetField(ref _darkness, value); }
         private int _darkness = 0;
 
+        /// <summary>
+        /// Style to use for formatting. Dependent on Content Engine. For AnsiCte, represents a Pygments.org style name.
+        /// </summary>
+        [SafeForTelemetry]
+        public string Style { get => _style; set => SetField(ref _style, value); }
+        private string _style = string.Empty;
+
         /// <summary>
         /// If true, content will be drawn with line numbers (if supported) 
         /// </summary>

src/WinPrint.Core/Models/Macros.cs

@@ -60,6 +60,12 @@ sealed public class Macros {
         /// </summary>
         public string CteName => svm.ContentEngine == null ? "" : svm.ContentEngine.GetType().Name;
 
+        /// <summary>
+        /// The style used for formatting (e.g. "default" or "colorful"; from Pygments.org).
+        /// </summary>
+        public string Style => svm.ContentEngine == null || svm.ContentEngine.ContentSettings == null ? "" : svm.ContentEngine.ContentSettings.Style;
+
+
         /// <summary>
         /// The current sheet number.
         /// </summary>

src/WinPrint.Core/Models/Settings.cs

@@ -97,6 +97,7 @@ public int NumSheets {
         /// Content type handlers
         /// </summary>
 //        public Dictionary<string, ContentBase> ContentTypes { get; set; }
+        public AnsiCte AnsiContentTypeEngineSettings { get; set; }
         public TextCte TextContentTypeEngineSettings { get; set; }
         public HtmlCte HtmlContentTypeEngineSettings { get; set; }
         public PrismCte PrismContentTypeEngineSettings { get; set; }
@@ -232,6 +233,12 @@ public static Settings CreateDefaultSettings() {
                 //settings.size = new WindowSize(1024, 800);
                 //settings.location = new WindowLocation(100, 100);
 
+                AnsiContentTypeEngineSettings = new AnsiCte() {
+                    ContentSettings = new ContentSettings() {
+                        Style = "pastie",
+                    }
+                },
+
                 TextContentTypeEngineSettings = new TextCte() {
                     // This font will be overriddent by Sheet defined fonts (if any)
                     //ContentSettings = new ContentSettings() {
@@ -283,6 +290,7 @@ public static Settings CreateDefaultSettings() {
                 PageSeparator = false,
                 ContentSettings = new ContentSettings() {
                     Font = new Font() { Family = defaultContentFontFamily, Size = defaultContentFontSize, Style = defaultContentFontStyle },
+                    Style = "pastie",
                     Darkness = 100,
                     Grayscale = false,
                     PrintBackground = true
@@ -313,6 +321,7 @@ public static Settings CreateDefaultSettings() {
                 PageSeparator = false,
                 ContentSettings = new ContentSettings() {
                     Font = new Font() { Family = defaultContentFontFamily, Size = defaultContentFontSize, Style = defaultContentFontStyle },
+                    Style = "pastie",
                     Darkness = 100,
                     Grayscale = false,
                     PrintBackground = true,

src/WinPrint.Core/Services/PygmentsConverterService.cs

@@ -1,9 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Text;
+using System.Threading.Tasks;
 using IronPython.Hosting;
+using LiteHtmlSharp;
+using Microsoft.VisualBasic;
+using Serilog;
 
 namespace WinPrint.Core.Services {
     /// <summary>
@@ -19,28 +24,80 @@ public PygmentsConverterService() {
 
         }
 
-        public static string Convert(string document) {
+        private Process _proc;
+        private TaskCompletionSource<bool> _eventHandled;
 
-            var engine = Python.CreateEngine();
+        public async Task<string> ConvertAsync(string document, string style, string language) {
+            if (_proc != null) {
+                throw new InvalidOperationException("ConvertAsync already in progress.");
+            }
+            if (_eventHandled != null) {
+                throw new InvalidOperationException("ConvertAsync already in progress.");
+            }
 
-            dynamic builtin = engine.GetBuiltinModule();
-            // you can store variables if you want
-            dynamic list = builtin.list;
-            dynamic itertools = engine.ImportModule("itertools");
-            var numbers = new[] { 1, 1, 2, 3, 6, 2, 2 };
-            //Debug.WriteLine(builtin.str(list(itertools.chain(numbers, "foobar"))));
-            // prints `[1, 1, 2, 3, 6, 2, 2, 'f', 'o', 'o', 'b', 'a', 'r']`
+            string file = Path.GetTempFileName();
+            _proc = new Process();
+            _proc.StartInfo.FileName = @"pygmentize.exe";
+            _proc.StartInfo.Arguments = $"-P outencoding=utf-8 -f 16m -O style={(string.IsNullOrEmpty(style) ? "default" : style)} -l {language} -o {file}.an {file}";
+            _proc.StartInfo.RedirectStandardInput = true;
+            _proc.StartInfo.RedirectStandardOutput = true;
+            _proc.StartInfo.RedirectStandardError = true;
+            _proc.StartInfo.UseShellExecute = false;
+            _proc.StartInfo.CreateNoWindow = true;
+            _proc.EnableRaisingEvents = true;
+            _proc.Exited += Proc_Exited;
 
-            // to add to the search paths
-            //var searchPaths = engine.GetSearchPaths();
-            //searchPaths.Add(@"modules");
-            //engine.SetSearchPaths(searchPaths);
+            _eventHandled = new TaskCompletionSource<bool>();
 
-            //// import the module
-            //dynamic myModule = engine.ImportModule("mymodule");
+            try {
+                Log.Debug("Writing temp file {file}", _proc.StartInfo.FileName);
+                await File.WriteAllTextAsync(file, document, Encoding.UTF8).ConfigureAwait(true);
+                Log.Debug("Starting {pyg} {args}", _proc.StartInfo.FileName, _proc.StartInfo.Arguments);
+                _proc.Start();
+            }
+            catch (Exception e) {
+                // TODO: Better error message (output of stderr?)
+                Log.Information("Failed to pygmentize: {Message}", e.Message);
+                document = $"{ _proc.StartInfo.FileName} { _proc.StartInfo.Arguments} failed:\n{e.Message}:\n";
+            }
+            finally {
+                Log.Debug("Waiting for pygments to exit");
+                await Task.WhenAny(_eventHandled.Task, Task.Delay(10000)).ConfigureAwait(true);
 
-            return string.Join(",", engine.GetModuleFilenames());  
+                if (_proc.ExitCode != 0) {
+                    var stdErr = _proc.StandardError.ReadToEnd();
+                    Log.Information("Failed to pygmentize: {Message}", stdErr);
+                    // TODO: This should really throw an exception
+                    document = $"Failed to pygmentize: {stdErr}";
+                }
+                else {
+
+                    if (!string.IsNullOrEmpty($"{file}.an") && File.Exists($"{file}.an")) {
+                        Log.Debug("Reading {file}", $"{file}.an");
+                        document = await File.ReadAllTextAsync($"{file}.an", Encoding.UTF8).ConfigureAwait(true);
+                    }
+                }
+
+                // Clean up
+                if (!string.IsNullOrEmpty(file) && File.Exists(file)) {
+                    File.Delete(file);
+                }
+                if (!string.IsNullOrEmpty($"{file}.an") && File.Exists($"{file}.an")) {
+                    File.Delete($"{file}.an");
+                }
+                _proc.Exited -= Proc_Exited;
+                _proc?.Dispose();
+                _proc = null;
+                _eventHandled = null;
+            }
+
+            return document;
         }
 
+        private void Proc_Exited(object sender, EventArgs e) {
+            Log.Debug("pygmatize exited: Time: {exitTime}, ExitCode: {exitCode}, ElapsedTime: {elapsedTime}ms", _proc.ExitTime, _proc.ExitCode, Math.Round((_proc.ExitTime - _proc.StartTime).TotalMilliseconds));
+
+            _eventHandled.TrySetResult(true);
+        }
     }
 }

src/WinPrint.Core/ViewModels/SheetViewModel.cs

@@ -379,6 +379,12 @@ public async Task<bool> LoadStringAsync(string document, string contentType) {
                     ContentEngine.ContentSettings.CopyPropertiesFrom(ContentSettings);
                 }
 
+                if (!string.IsNullOrEmpty(Language) && ContentEngine.SupportedContentTypes.Contains("text/ansi")) {
+                    // Syntax highlight
+                    // TODO: Spin up a thread
+                    document = await ServiceLocator.Current.PygmentsConverterService.ConvertAsync(document, ContentEngine.ContentSettings.Style, Language).ConfigureAwait(true);
+                }
+
                 ContentEngine.Encoding = Encoding;
                 retval = await ContentEngine.SetDocumentAsync(document).ConfigureAwait(false);
             }
@@ -691,6 +697,11 @@ private System.ComponentModel.PropertyChangedEventHandler OnContentSettingsPrope
                         reflow = true;
                         break;
 
+                    case "Style":
+                        ContentSettings.Style = _sheet.ContentSettings.Style;
+                        reflow = true;
+                        break;
+
                     default:
                         throw new InvalidOperationException($"Property change not handled: {e.PropertyName}");
                 }

src/WinPrint.Core/WinPrint.Core.csproj

@@ -4,7 +4,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <Platforms>AnyCPU;x64;x86</Platforms>
-    <Version>2.0.3.465</Version>
+    <Version>2.0.3.550</Version>
     <Company>Kindel Systems</Company>
     <Product>winprint</Product>
     <Authors>Charlie Kindel</Authors>