(x) Fix requested changes

Author: alexfdezsauco

CONTRIBUTORS

@@ -10,5 +10,6 @@
 
 # Please keep the list sorted.
 
-Maksim Khomutov <mkhomutov@gmail.com>
 Igr Alexánder Fernández Saúco <alexander.fernandez.sauco@gmail.com>
+Maksim Khomutov <mkhomutov@gmail.com>
+

src/LogViewer/Commands/FilterCopyResultToClipboardCommandContainer.cs

@@ -7,19 +7,26 @@
 
 namespace LogViewer
 {
-    using System.IO;
+    using System.Linq;
+    using System.Text;
+
     using Catel;
     using Catel.MVVM;
+
+    using LogViewer.Services;
+
     using Orchestra.Services;
-    using Services;
 
     public class FilterCopyResultToClipboardCommandContainer : CommandContainerBase
     {
+        #region Fields
         private readonly IClipboardService _clipboardService;
+
         private readonly ILogTableService _logTableService;
+        #endregion
 
-        public FilterCopyResultToClipboardCommandContainer(ICommandManager commandManager, IClipboardService clipboardService,
-            ILogTableService logTableService)
+        #region Constructors
+        public FilterCopyResultToClipboardCommandContainer(ICommandManager commandManager, IClipboardService clipboardService, ILogTableService logTableService)
             : base(Commands.Filter.CopyResultToClipboard, commandManager)
         {
             Argument.IsNotNull(() => clipboardService);
@@ -28,16 +35,19 @@ public FilterCopyResultToClipboardCommandContainer(ICommandManager commandManage
             _clipboardService = clipboardService;
             _logTableService = logTableService;
         }
+        #endregion
 
+        #region Methods
         protected override void Execute(object parameter)
         {
-            StringWriter writer = new StringWriter();
+            var stringBuilder = new StringBuilder();
             foreach (var record in _logTableService.LogTable.Records)
             {
-                writer.WriteLine(record.ToString());
+                stringBuilder.AppendLine(record.ToString());
             }
 
-            _clipboardService.CopyToClipboard(writer.GetStringBuilder().ToString());
+            _clipboardService.CopyToClipboard(stringBuilder.ToString());
         }
+        #endregion
     }
 }

src/LogViewer/Commands/FilterExportResultCommandContainer.cs

@@ -8,6 +8,9 @@
 namespace LogViewer
 {
     using System.IO;
+    using System.Linq;
+    using System.Threading.Tasks;
+
     using Catel;
     using Catel.MVVM;
     using Catel.Services;
@@ -35,21 +38,12 @@ public FilterExportResultCommandContainer(ICommandManager commandManager,
             _logTableService = logTableService;
         }
 
-        protected override void Execute(object parameter)
+        protected override async Task ExecuteAsync(object parameter)
         {
             _saveFileService.FileName = "LogViewerFilterExport_" + FastDateTime.Now.ToString("yy-MM-dd_HHmmss_ms") + ".log";
-            var determineFileAsync = _saveFileService.DetermineFileAsync();
-            determineFileAsync.Wait();
-
-            if (determineFileAsync.Result)
+            if (await _saveFileService.DetermineFileAsync())
             {
-                using (var writer = new StreamWriter(_fileService.Open(_saveFileService.FileName, FileMode.Create, FileAccess.Write)))
-                {
-                    foreach (var record in _logTableService.LogTable.Records)
-                    {
-                        writer.WriteLine(record.ToString());
-                    }
-                }
+                _fileService.WriteAllLines(_saveFileService.FileName, _logTableService.LogTable.Records.Select(record => record.ToString()));
             }
         }
     }

src/LogViewer/Models/LogRecord.cs

@@ -8,12 +8,27 @@
 namespace LogViewer.Models
 {
     using System;
+    using System.Collections.Generic;
 
     using Catel.Data;
     using Catel.Logging;
 
     public class LogRecord : ModelBase
     {
+        #region Fields
+        private static readonly Dictionary<LogEvent, string> LogEventCache = new Dictionary<LogEvent, string>();
+        #endregion
+
+        #region Constructors
+        static LogRecord()
+        {
+            foreach (LogEvent value in Enum.GetValues(typeof(LogEvent)))
+            {
+                LogEventCache.Add(value, value.ToString().ToUpper());
+            }
+        }
+        #endregion
+
         #region Properties
         public FileNode FileNode { get; set; }
 
@@ -35,9 +50,11 @@ public class LogRecord : ModelBase
         public bool IsSelected { get; set; }
         #endregion
 
+        #region Methods
         public override string ToString()
         {
-            return $"{DateTime:HH:mm:ss:ms} => [{LogEvent.ToString().ToUpper()}] [{TargetTypeName}] [{ThreadId}] {Message}";
+            return $"{DateTime:HH:mm:ss:ms} => [{LogEventCache[LogEvent]}] [{TargetTypeName}] [{ThreadId}] {Message}";
         }
+        #endregion
     }
 }