Got powershell cmdlet working

Author: tig

src/WinPrint.Console/Program.cs

@@ -23,8 +23,8 @@ class Program {
         private static ParserResult<Options> result;
 
         static void Main(string[] args) {
-            ServiceLocator.Current.TelemetryService.Start();
-            ServiceLocator.Current.LogService.Start();
+            ServiceLocator.Current.TelemetryService.Start(AppDomain.CurrentDomain.FriendlyName);
+            ServiceLocator.Current.LogService.Start(AppDomain.CurrentDomain.FriendlyName);
 
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
             TaskScheduler.UnobservedTaskException += TaskScheduler_UnobservedTaskException;
@@ -305,7 +305,7 @@ private void PropertyChangedEventHandler(object o, PropertyChangedEventArgs e) {
 
                 case "Reflowing":
                     if (print.SheetViewModel.Reflowing)
-                        Log.Information("Formatting as {t}.", print.SheetViewModel.Type);
+                        Log.Information("Formatting as {t}.", print.SheetViewModel.ContentEngine.GetContentType());
                     else if (ModelLocator.Current.Options.Verbose)
                         Log.Information("Formating complete.");
                     break;

src/WinPrint.Console/WinPrint.Console.csproj

@@ -9,13 +9,12 @@
     <AssemblyName>winprint</AssemblyName>
     <StartupObject>WinPrint.Console.Program</StartupObject>
 
-    <Version>2.0.0.3019</Version>
+    <Version>2.0.0.3499</Version>
     <Company>Kindel Systems</Company>
     <Product>winprint</Product>
     <Authors>Charlie Kindel</Authors>
     <Description>winprint Console App</Description>
     <Copyright>Copyright Kindel Systems, LLC</Copyright>
-    <PackageReleaseNotes>No release notes.</PackageReleaseNotes>
     <PackageProjectUrl>https://github.com/tig/winprint</PackageProjectUrl>
   </PropertyGroup>
 

src/WinPrint.Core/ContentTypeEngines/CodeCte.cs

@@ -25,13 +25,21 @@ internal struct HtmlLine {
     /// </summary>
     // TOOD: Color code c# kewoards https://www.c-sharpcorner.com/UploadFile/kirtan007/syntax-highlighting-in-richtextbox-using-C-Sharp/
     public class CodeCte : ContentTypeEngineBase, IDisposable {
+        private static readonly string _contentType = "text/sourcecode";
+        /// <summary>
+        /// ContentType identifier (shorthand for class name). 
+        /// </summary>
+        public override string GetContentType() {
+            return _contentType;
+        }
+
         public static CodeCte Create() {
+
             var engine = new CodeCte();
             engine.CopyPropertiesFrom(ModelLocator.Current.Settings.TextContentTypeEngineSettings);
             return engine;
         }
 
-        public static new string ContentType = "Source code";
         public CodeCte() {
         }
 

src/WinPrint.Core/ContentTypeEngines/ContentTypeEngineBase.cs

@@ -1,11 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Drawing;
 using System.Drawing.Text;
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
+using Serilog;
 using WinPrint.Core.Models;
 using WinPrint.Core.Services;
 
@@ -33,7 +35,10 @@ public abstract class ContentTypeEngineBase : ModelBase, INotifyPropertyChanged
         /// <summary>
         /// ContentType identifier (shorthand for class name). 
         /// </summary>
-        public static string ContentType = "base";
+        public virtual string GetContentType() {
+            return _contentType;
+        }
+        private static readonly string _contentType = "base";
 
         /// <summary>
         /// Calculated page size. Set by Sheet view model.
@@ -54,6 +59,15 @@ public abstract class ContentTypeEngineBase : ModelBase, INotifyPropertyChanged
         //}
 
         internal string filePath = null;
+
+        /// <summary>
+        /// The contents of the file to be printed.
+        /// </summary>
+        public string Document { get => document; set {
+                //LogService.TraceMessage($"Document is {document.Length} chars.");
+                SetField(ref document, value); 
+            }
+        }
         internal string document = null;
 
         internal StringFormat stringFormat = new StringFormat(StringFormat.GenericTypographic) {
@@ -67,23 +81,16 @@ public abstract class ContentTypeEngineBase : ModelBase, INotifyPropertyChanged
 
 
         /// <summary>
-        /// Loads the file specified into memeory. (holds in document property).
+        /// Loads the file specified into Document property.
         /// </summary>
         /// <param name="filePath"></param>
         /// <returns>True if file was read. False if the file was empty or failed to read.</returns>
         public async virtual Task<bool> LoadAsync(string filePath) {
             LogService.TraceMessage();
             this.filePath = filePath;
             using StreamReader streamToPrint = new StreamReader(filePath);
-            //try {
-                document = await streamToPrint.ReadToEndAsync();
-                LogService.TraceMessage($"document is {document.Length} chars.");
-            //}
-            //catch (Exception e) {
-            //    LogService.TraceMessage($"Exception {e.Message}");
-            //    return false;
-            //}
-            return !String.IsNullOrEmpty(document);
+            Document = await streamToPrint.ReadToEndAsync();
+            return !String.IsNullOrEmpty(Document);
         }
 
         /// <summary>
@@ -93,8 +100,8 @@ public async virtual Task<bool> LoadAsync(string filePath) {
         /// <returns>Number of sheets.</returns>
         public virtual async Task<int> RenderAsync(System.Drawing.Printing.PrinterResolution printerResolution, EventHandler<string> reflowProgress) {
             LogService.TraceMessage();
-            if (document == null) 
-                throw new ArgumentNullException("document can't be null for Render");
+            if (Document == null) 
+                throw new ArgumentNullException("Document can't be null for Render");
             return await Task.FromResult(0);
         }
 
@@ -105,5 +112,59 @@ public virtual async Task<int> RenderAsync(System.Drawing.Printing.PrinterResolu
         /// <param name="pageNum">Page number to print</param>
         public abstract void PaintPage(Graphics g, int pageNum);
 
+        public static async Task<ContentTypeEngineBase> CreateContentTypeEngine(string filePath = null, string contentType = null) {
+            ContentTypeEngineBase cte = null;
+
+            // If no contenttype was provied, but path was, determine from path.
+            if (string.IsNullOrEmpty(contentType) && !string.IsNullOrEmpty(filePath)) {
+                var ext = Path.GetExtension(filePath).ToLower();
+                // Use file assocations to figure it out
+                if (!ModelLocator.Current.Associations.FilesAssociations.TryGetValue("*" + ext, out contentType))
+                    contentType = "text/plain"; // default
+            }
+            Debug.Assert(!string.IsNullOrEmpty(contentType));
+
+            switch (contentType) {
+                case "text/html":
+                    cte = HtmlCte.Create();
+                    break;
+
+                case "text/plain":
+                    cte = TextCte.Create();
+                    break;
+
+                // TODO: Figure out if we really want to use the sourcecode CTE.
+                case "sourcecode":
+                    cte = CodeCte.Create();
+                    ((CodeCte)cte).Language = contentType;
+                    break;
+
+                default:
+                    // Not text or html. Is it a language?
+                    if (((List<Langauge>)ModelLocator.Current.Associations.Languages).Exists(lang => lang.Id == contentType)) {
+                        // It's a language. Verify node.js and Prism are installed
+                        if (await ServiceLocator.Current.NodeService.IsInstalled()) {
+                            // contentType == Language
+                            cte = PrismCte.Create();
+                            ((PrismCte)cte).Language = contentType;
+                        }
+                        else {
+                            Log.Information("Node.js must be installed for Prism-based ({lang}) syntax highlighting. Using {def} instead.", contentType, "text/plain");
+                            contentType = "text/plain";
+                            cte = TextCte.Create();
+                        }
+                    }
+                    else {
+                        // No language mapping found, just use contentType as the language
+                        // TODO: Do more error checking here
+                        cte = PrismCte.Create();
+                        ((PrismCte)cte).Language = contentType;
+                    }
+                    break;
+            }
+
+            return cte;
+        }
+
     }
 }

src/WinPrint.Core/ContentTypeEngines/HtmlCte.cs

@@ -16,7 +16,13 @@ namespace WinPrint.Core.ContentTypeEngines {
     /// Implements generic HTML file type support. 
     /// </summary>
     public class HtmlCte : ContentTypeEngineBase, IDisposable {
-        public static new string ContentType = "text/html";
+        private static readonly string _contentType = "text/html";
+        /// <summary>
+        /// ContentType identifier (shorthand for class name). 
+        /// </summary>
+        public override string GetContentType() {
+            return _contentType;
+        }
 
         public static HtmlCte Create() {
             var content = new HtmlCte();

src/WinPrint.Core/ContentTypeEngines/PrismCte.cs

@@ -13,8 +13,13 @@
 
 namespace WinPrint.Core.ContentTypeEngines {
     public class PrismCte : HtmlCte {
-        public static new string ContentType = "text/code";
-
+        private static readonly string _contentType = "text/code";
+        /// <summary>
+        /// ContentType identifier (shorthand for class name). 
+        /// </summary>
+        public override string GetContentType() {
+            return _contentType;
+        }
         public static new PrismCte Create() {
             var content = new PrismCte();
             content.CopyPropertiesFrom(ModelLocator.Current.Settings.PrismContentTypeEngineSettings);

src/WinPrint.Core/ContentTypeEngines/TextCTE.cs

@@ -26,13 +26,20 @@ internal struct Line {
     /// </summary>
     // TOOD: Color code c# kewoards https://www.c-sharpcorner.com/UploadFile/kirtan007/syntax-highlighting-in-richtextbox-using-C-Sharp/
     public class TextCte : ContentTypeEngineBase, IDisposable {
+        private static readonly string _contentType = "text/plain";
+        /// <summary>
+        /// ContentType identifier (shorthand for class name). 
+        /// </summary>
+        public override string GetContentType() {
+            return _contentType;
+        }
+
         public static TextCte Create() {
             var engine = new TextCte();
             engine.CopyPropertiesFrom(ModelLocator.Current.Settings.TextContentTypeEngineSettings);
             return engine;
         }
 
-        public static new string ContentType = "text/plain";
         public TextCte() {
             // StringFormat to use throughout
 

src/WinPrint.Core/Helpers/Macros.cs

@@ -15,8 +15,8 @@ sealed internal class Macros {
         public string FilePath { get { return string.IsNullOrEmpty(svm.File) ? "" :  Path.GetDirectoryName(FullyQualifiedPath); } }
         public string FullyQualifiedPath { get { return string.IsNullOrEmpty(svm.File) ? "" : Path.GetFullPath(svm.File); } }
         public static DateTime DatePrinted { get { return DateTime.Now; } }
-        public DateTime DateRevised { get { return string.IsNullOrEmpty(svm.File) ? DateTime.Now :  File.GetLastWriteTime(svm.File); } }
-        public string FileType { get { return string.IsNullOrEmpty(svm.File) ? "" : svm.Type; } }
+        public DateTime DateRevised { get { return string.IsNullOrEmpty(svm.File) ? DateTime.Now : File.GetLastWriteTime(svm.File); } }
+        public string FileType { get { return svm.ContentEngine == null ? "" : svm.ContentEngine.GetContentType(); } }
 
         public int Page { get; set; }
 

src/WinPrint.Core/Print.cs

@@ -92,12 +92,12 @@ public async Task<int> CountSheets(int fromSheet = 1, int toSheet = 0) {
 
             ServiceLocator.Current.TelemetryService.TrackEvent("Count Sheets",
                 properties: new Dictionary<string, string> {
-                    ["type"]= SheetViewModel.Type, 
+                    ["type"]= SheetViewModel.ContentEngine.GetContentType(), 
                     ["printer"] = PrintDocument.PrinterSettings.PrinterName,
                     ["fromSheet"] = fromSheet.ToString(),
                     ["toSheet"] = toSheet.ToString(),
                 },
-                metrics: new Dictionary<string, double> {["sheetsPrinted"] = SheetViewModel.NumSheets});
+                metrics: new Dictionary<string, double> {["sheetsPrinted"] = SheetViewModel.NumSheets});;
             return SheetViewModel.NumSheets;
         }
 
@@ -114,7 +114,7 @@ public async Task<int> DoPrint() {
 
             ServiceLocator.Current.TelemetryService.TrackEvent("Print Complete",
                 properties: new Dictionary<string, string> {
-                    ["type"] = SheetViewModel.Type,
+                    ["type"] = SheetViewModel.ContentEngine.GetContentType(),
                     ["printer"] = PrintDocument.PrinterSettings.PrinterName,
                     ["fromSheet"] = PrintDocument.PrinterSettings.FromPage.ToString(),
                     ["toSheet"] = PrintDocument.PrinterSettings.ToPage.ToString(),

src/WinPrint.Core/Services/LogService.cs

@@ -20,7 +20,7 @@ public class LogService {
         public LoggingLevelSwitch ConsoleLevelSwitch { get; set; } = new LoggingLevelSwitch();
         public LoggingLevelSwitch DebugLevelSwitch { get; set; } = new LoggingLevelSwitch();
 
-        public void Start() {
+        public void Start(string appName) {
             MasterLevelSwitch.MinimumLevel = LogEventLevel.Verbose;
             DebugLevelSwitch.MinimumLevel = LogEventLevel.Debug;
 
@@ -43,7 +43,7 @@ public void Start() {
                 ////.WriteTo.ApplicationInsights(config, new CustomConverter(), restrictedToMinimumLevel: LogEventLevel.Information)
                 .CreateLogger();
 
-            Log.Debug("--------- {app} {v} ---------", AppDomain.CurrentDomain.FriendlyName, productVersion);
+            Log.Debug("--------- {app} {v} ---------", appName, productVersion);
             if (ServiceLocator.Current.TelemetryService.TelemetryEnabled) {
                 string msg = string.IsNullOrEmpty(TelemetryService.Key) ? "However, telemetry key is missing so no telemetry will be tracked." : "";
                 Log.Debug($"Telemetry is enabled. {msg}");