Fix build code encoding/decoding view (#15)

Co-authored-by: Alexandru Macocian <almacoci@microsoft.com>

Daybreak.Tests/Models/VersionTests.cs

@@ -10,6 +10,8 @@ namespace Daybreak.Tests.Models
     [TestClass]
     public class VersionTests
     {
+        [DataRow("v0.1.0.0.1", "v0.1.0.0.1")]
+        [DataRow("v0.1.0.0.1.0.0.0.0", "v0.1.0.0.1")]
         [DataRow("v0.1.0", "v0.1")]
         [DataRow("0.1.0", "0.1")]
         [DataRow("v0.1.0.0.0", "v0.1")]

Daybreak.Tests/Services/JsonLoggerProviderTests.cs

@@ -4,6 +4,7 @@ using LiteDB;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.IO;
+using WpfExtended.Logging;
 
 namespace Daybreak.Tests.Services
 {
@@ -20,7 +21,7 @@ namespace Daybreak.Tests.Services
             File.Delete("Daybreak.db");
             this.liteDatabase = new LiteDatabase("Daybreak.db");
             this.logsManager = new JsonLogsManager(this.liteDatabase);
-            this.loggerProvider = new JsonLoggerProvider(this.logsManager);
+            this.loggerProvider = new CVLoggerProvider(this.logsManager);
         }
 
         [TestCleanup]

Daybreak/Configuration/ProjectConfiguration.cs

@@ -22,7 +22,7 @@ using System.Extensions;
 using System.Net.Http;
 using System.Windows.Extensions.Http;
 using LiteDB;
-using Daybreak.Controls;
+using System.Windows.Extensions;
 
 namespace Daybreak.Configuration
 {
@@ -32,7 +32,6 @@ namespace Daybreak.Configuration
         {
             serviceManager.ThrowIfNull(nameof(serviceManager));
 
-            serviceManager.RegisterScoped<ILoggerFactory, CVLoggerFactory>((sp) => new CVLoggerFactory(sp.GetService<ILogsManager>()));
             serviceManager.RegisterResolver(
                 new HttpClientResolver()
                 .WithHttpMessageHandlerFactory((serviceProvider, categoryType) =>
@@ -64,7 +63,7 @@ namespace Daybreak.Configuration
             serviceProducer.RegisterScoped<IIconRetriever, IconRetriever>();
             serviceProducer.RegisterScoped<IPrivilegeManager, PrivilegeManager>();
             serviceProducer.RegisterScoped<IScreenManager, ScreenManager>();
-            serviceProducer.RegisterScoped<ILogsManager, JsonLogsManager>();
+            serviceProducer.RegisterLogWriter<ILogsManager, JsonLogsManager>();
         }
         public static void RegisterLifetimeServices(IApplicationLifetimeProducer applicationLifetimeProducer)
         {

Daybreak/Controls/Templates/AttributeTemplate.xaml.cs

@@ -15,6 +15,7 @@ namespace Daybreak.Controls
     public partial class AttributeTemplate : UserControl
     {
         public event EventHandler<AttributeEntry> HelpClicked;
+        public event EventHandler<AttributeEntry> AttributeChanged;
         
         [GenerateDependencyProperty(InitialValue = false)]
         private bool canAdd;
@@ -50,6 +51,7 @@ namespace Daybreak.Controls
                 this.DataContext.As<AttributeEntry>().Points--;
                 this.CanSubtract = this.DataContext.As<AttributeEntry>().Points > 0;
                 this.CanAdd = true;
+                this.AttributeChanged?.Invoke(this, this.DataContext.As<AttributeEntry>());
             }
         }
 
@@ -60,6 +62,7 @@ namespace Daybreak.Controls
                 this.DataContext.As<AttributeEntry>().Points++;
                 this.CanAdd = this.DataContext.As<AttributeEntry>().Points < 12;
                 this.CanSubtract = true;
+                this.AttributeChanged?.Invoke(this, this.DataContext.As<AttributeEntry>());
             }
         }
 

Daybreak/Controls/Templates/BuildTemplate.xaml

@@ -75,7 +75,7 @@
                      HorizontalContentAlignment="Stretch" BorderThickness="0">
                 <ListBox.ItemTemplate>
                     <DataTemplate>
-                        <local:AttributeTemplate HelpClicked="AttributeTemplate_HelpClicked"></local:AttributeTemplate>
+                        <local:AttributeTemplate HelpClicked="AttributeTemplate_HelpClicked" AttributeChanged="AttributeTemplate_AttributeChanged"></local:AttributeTemplate>
                     </DataTemplate>
                 </ListBox.ItemTemplate>
             </ListBox>

Daybreak/Controls/Templates/BuildTemplate.xaml.cs

@@ -3,6 +3,7 @@ using Daybreak.Services.BuildTemplates;
 using Daybreak.Services.Configuration;
 using Daybreak.Services.IconRetrieve;
 using Microsoft.Extensions.Logging;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Extensions;
@@ -23,10 +24,13 @@ namespace Daybreak.Controls
         private const string InfoNamePlaceholder = "[NAME]";
         private const string BaseAddress = $"https://wiki.guildwars.com/wiki/{InfoNamePlaceholder}";
 
+        private bool suppressBuildChanged = false;
         private bool loadedProperties = false;
         private BuildEntry loadedBuild;
         private SkillTemplate selectingSkillTemplate;
 
+        public event EventHandler BuildChanged;
+
         [GenerateDependencyProperty]
         private Profession primaryProfession;
         [GenerateDependencyProperty]
@@ -95,6 +99,33 @@ namespace Daybreak.Controls
                 }
                 this.LoadSkills();
                 this.LoadAttributes();
+                if (this.suppressBuildChanged is false)
+                {
+                    this.BuildChanged?.Invoke(this, new EventArgs());
+                }
+            }
+
+            if (e.Property == Skill0Property ||
+                e.Property == Skill1Property ||
+                e.Property == Skill2Property ||
+                e.Property == Skill3Property ||
+                e.Property == Skill4Property ||
+                e.Property == Skill5Property ||
+                e.Property == Skill6Property ||
+                e.Property == Skill7Property)
+            {
+                if (this.suppressBuildChanged is false)
+                {
+                    this.loadedBuild.Build.Skills[0] = this.Skill0;
+                    this.loadedBuild.Build.Skills[1] = this.Skill1;
+                    this.loadedBuild.Build.Skills[2] = this.Skill2;
+                    this.loadedBuild.Build.Skills[3] = this.Skill3;
+                    this.loadedBuild.Build.Skills[4] = this.Skill4;
+                    this.loadedBuild.Build.Skills[5] = this.Skill5;
+                    this.loadedBuild.Build.Skills[6] = this.Skill6;
+                    this.loadedBuild.Build.Skills[7] = this.Skill7;
+                    this.BuildChanged?.Invoke(this, new EventArgs());
+                }
             }
         }
 
@@ -218,6 +249,7 @@ namespace Daybreak.Controls
 
         private void LoadBuild()
         {
+            this.suppressBuildChanged = true;
             var build = this.DataContext.As<BuildEntry>();
             this.loadedBuild = build;
             this.PrimaryProfession = build.Build.Primary;
@@ -230,6 +262,7 @@ namespace Daybreak.Controls
             this.Skill5 = build.Build.Skills[5];
             this.Skill6 = build.Build.Skills[6];
             this.Skill7 = build.Build.Skills[7];
+            this.suppressBuildChanged = false;
         }
 
         private void BrowseToInfo(string infoName)
@@ -294,6 +327,11 @@ namespace Daybreak.Controls
             this.BrowseToInfo(e.Attribute.Name);
         }
 
+        private void AttributeTemplate_AttributeChanged(object sender, AttributeEntry e)
+        {
+            this.BuildChanged?.Invoke(this, new EventArgs());
+        }
+
         private void SkillTemplate_Clicked(object sender, RoutedEventArgs e)
         {
             var skill = sender.As<SkillTemplate>().DataContext.As<Skill>();

Daybreak/Daybreak.csproj

@@ -10,7 +10,7 @@
     <LangVersion>preview</LangVersion>
     <ApplicationIcon>Daybreak.ico</ApplicationIcon>
     <IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
-    <Version>0.9</Version>
+    <Version>0.9.1.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -23,11 +23,11 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NReco.Logging.File" Version="1.1.1" />
     <PackageReference Include="securifybv.ShellLink" Version="0.1.0" />
-    <PackageReference Include="Slim" Version="1.4.2" />
+    <PackageReference Include="Slim" Version="1.4.3" />
     <PackageReference Include="System.Windows.Interactivity.WPF" Version="2.0.20525" />
-    <PackageReference Include="SystemExtensions.NetStandard" Version="1.2.0" />
+    <PackageReference Include="SystemExtensions.NetStandard" Version="1.3.0" />
     <PackageReference Include="WCL" Version="1.0.2" />
-    <PackageReference Include="WpfExtended" Version="0.3.3" />
+    <PackageReference Include="WpfExtended" Version="0.4.1" />
     <PackageReference Include="WpfExtended.SourceGeneration" Version="0.1.1" />
     <PackageReference Include="WpfScreenHelper" Version="1.0.0" />
   </ItemGroup>

Daybreak/Models/Log.cs

@@ -1,20 +0,0 @@
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-using System;
-
-namespace Daybreak.Models
-{
-    public sealed class Log
-    {
-        [JsonProperty("DateTime")]
-        public DateTime LogTime { get; set; }
-        [JsonProperty("Category")]
-        public string Category { get; set; }
-        [JsonProperty("EventId")]
-        public string EventId { get; set; }
-        [JsonProperty("LogLevel")]
-        public LogLevel LogLevel { get; set; }
-        [JsonProperty("Message")]
-        public string Message { get; set; }
-    }
-}

Daybreak/Models/Versioning/Version.cs

@@ -68,6 +68,10 @@ namespace Daybreak.Models.Versioning
                 {
                     parts.RemoveAt(i);
                 }
+                else
+                {
+                    break;
+                }
             }
 
             parsedVersion = new Version

Daybreak/Services/Logging/CVLoggerFactory.cs

@@ -1,30 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System;
-
-namespace Daybreak.Services.Logging
-{
-    public sealed class CVLoggerFactory : ILoggerFactory
-    {
-        private readonly LoggerFactory loggerFactory = new();
-
-        public CVLoggerFactory(ILogsManager logsManager)
-        {
-            this.loggerFactory.AddProvider(new JsonLoggerProvider(logsManager));
-        }
-
-        public void AddProvider(ILoggerProvider provider)
-        {
-            ((ILoggerFactory)this.loggerFactory).AddProvider(provider);
-        }
-
-        public ILogger CreateLogger(string categoryName)
-        {
-            return ((ILoggerFactory)this.loggerFactory).CreateLogger(categoryName);
-        }
-
-        public void Dispose()
-        {
-            ((IDisposable)this.loggerFactory).Dispose();
-        }
-    }
-}

Daybreak/Services/Logging/ILogsManager.cs

@@ -1,11 +1,11 @@
-using Daybreak.Models;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using WpfExtended.Logging;
+using WpfExtended.Models;
 
 namespace Daybreak.Services.Logging
 {
-    public interface ILogsManager
+    public interface ILogsManager : ILogsWriter
     {
-        void WriteLog(Log log);
         IEnumerable<Log> GetLogs();
         int DeleteLogs();
     }

Daybreak/Services/Logging/JsonLogger.cs

@@ -1,45 +0,0 @@
-using Daybreak.Models;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Extensions;
-
-namespace Daybreak.Services.Logging
-{
-    public sealed class JsonLogger : ILogger
-    {
-        private readonly string category;
-        private readonly JsonLoggerProvider jsonLoggerProvider;
-
-        public JsonLogger(string category, JsonLoggerProvider jsonLoggerProvider)
-        {
-            this.category = category;
-            this.jsonLoggerProvider = jsonLoggerProvider.ThrowIfNull(nameof(jsonLoggerProvider));
-        }
-
-        public IDisposable BeginScope<TState>(TState state)
-        {
-            return null;
-        }
-
-        public bool IsEnabled(LogLevel logLevel)
-        {
-            return true;
-        }
-
-        public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
-        {
-            var message = formatter(state, exception);
-
-            var log = new Log
-            {
-                LogLevel = logLevel,
-                EventId = eventId.Name,
-                Message = message,
-                Category = category,
-                LogTime = DateTime.Now
-            };
-
-            this.jsonLoggerProvider.LogEntry(log);
-        }
-    }
-}

Daybreak/Services/Logging/JsonLoggerProvider.cs

@@ -1,44 +0,0 @@
-using Daybreak.Models;
-using Microsoft.CorrelationVector;
-using Microsoft.Extensions.Logging;
-using System.Extensions;
-
-namespace Daybreak.Services.Logging
-{
-    public sealed class JsonLoggerProvider : ILoggerProvider
-    {
-        private readonly ILogsManager logsManager;
-        private CorrelationVector correlationVector;
-
-        public JsonLoggerProvider(ILogsManager logsManager)
-        {
-            this.logsManager = logsManager.ThrowIfNull(nameof(logsManager));
-            this.correlationVector = new CorrelationVector();
-        }
-
-        public void LogEntry(Log log)
-        {
-            if (this.correlationVector is not null)
-            {
-                log.Message = $"[{this.correlationVector.Value}] {log.Message}";
-                this.correlationVector.Increment();
-            }
-
-            this.logsManager.WriteLog(log);
-        }
-
-        public ILogger CreateLogger(string categoryName)
-        {
-            if (this.correlationVector is not null)
-            {
-                this.correlationVector = CorrelationVector.Extend(this.correlationVector.ToString());
-            }
-
-            return new JsonLogger(categoryName, this);
-        }
-
-        public void Dispose()
-        {
-        }
-    }
-}

Daybreak/Services/Logging/JsonLogsManager.cs

@@ -1,7 +1,7 @@
-using Daybreak.Models;
-using LiteDB;
+using LiteDB;
 using System.Collections.Generic;
 using System.Extensions;
+using WpfExtended.Models;
 
 namespace Daybreak.Services.Logging
 {

Daybreak/Views/BuildTemplateView.xaml

@@ -11,6 +11,7 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid Background="#A0202020">
         <Grid.RowDefinitions>
+            <RowDefinition Height="auto"></RowDefinition>
             <RowDefinition Height="auto"></RowDefinition>
             <RowDefinition Height="*"></RowDefinition>
         </Grid.RowDefinitions>
@@ -35,7 +36,17 @@
             <controls:SaveButton Foreground="White" Height="30" Width="30" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5"
                              Clicked="SaveButton_Clicked" Grid.Column="2" IsEnabled="{Binding ElementName=_this, Path=SaveButtonEnabled, Mode=OneWay}"></controls:SaveButton>
         </Grid>
-        <controls:BuildTemplate x:Name="BuildTemplate" Grid.Row="1" DataContext="{Binding ElementName=_this, Path=CurrentBuild, Mode=OneWay}">
+        <Grid Grid.Row="1" Margin="10, 0, 10, 0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="auto"></ColumnDefinition>
+                <ColumnDefinition Width="*"></ColumnDefinition>
+            </Grid.ColumnDefinitions>
+            <TextBlock Text="Code: " Foreground="White" Background="Transparent" FontSize="16"></TextBlock>
+            <TextBox Grid.Column="1" Foreground="White" Background="Transparent" FontSize="16"
+                     Text="{Binding ElementName=_this, Path=CurrentBuildCode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"></TextBox>
+        </Grid>
+        <controls:BuildTemplate x:Name="BuildTemplate" Grid.Row="2" DataContext="{Binding ElementName=_this, Path=CurrentBuild, Mode=OneWay}"
+                                BuildChanged="BuildTemplate_BuildChanged">
         </controls:BuildTemplate>
     </Grid>
 </UserControl>

Daybreak/Views/BuildTemplateView.xaml.cs

@@ -11,6 +11,7 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Extensions;
+using System.Windows.Input;
 
 namespace Daybreak.Views
 {
@@ -21,51 +22,89 @@ namespace Daybreak.Views
     {
         private const string DisallowedChars = "\r\n\\/.";
 
-        public readonly static DependencyProperty CurrentBuildProperty =
-            DependencyPropertyExtensions.Register<BuildTemplateView, BuildEntry>(nameof(CurrentBuild));
-        public readonly static DependencyProperty SaveButtonEnabledProperty =
-            DependencyPropertyExtensions.Register<BuildTemplateView, bool>(nameof(SaveButtonEnabled), new PropertyMetadata(false));
+        private bool supressDecode = false;
 
         private readonly IViewManager viewManager;
         private readonly IBuildTemplateManager buildTemplateManager;
+        private readonly ILogger<BuildTemplateView> logger;
 
-        public bool SaveButtonEnabled
-        {
-            get => this.GetTypedValue<bool>(SaveButtonEnabledProperty);
-            set => this.SetValue(SaveButtonEnabledProperty, value);
-        }
-
-        public BuildEntry CurrentBuild
-        {
-            get => this.GetTypedValue<BuildEntry>(CurrentBuildProperty);
-            set => this.SetValue(CurrentBuildProperty, value);
-        }
+        [GenerateDependencyProperty(InitialValue = false)]
+        private bool saveButtonEnabled;
+        [GenerateDependencyProperty]
+        private BuildEntry currentBuild;
+        [GenerateDependencyProperty]
+        private string currentBuildCode;
 
         public BuildTemplateView(
             IViewManager viewManager,
             IBuildTemplateManager buildTemplateManager,
             IIconRetriever iconRetriever,
             IConfigurationManager configurationManager,
-            ILogger<ChromiumBrowserWrapper> logger)
+            ILogger<ChromiumBrowserWrapper> chromiumLogger,
+            ILogger<BuildTemplateView> logger)
         {
             this.buildTemplateManager = buildTemplateManager.ThrowIfNull(nameof(buildTemplateManager));
+            this.logger = logger.ThrowIfNull(nameof(logger));
             this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
             this.InitializeComponent();
-            this.BuildTemplate.InitializeTemplate(iconRetriever, configurationManager, buildTemplateManager, logger);
+            this.BuildTemplate.InitializeTemplate(iconRetriever, configurationManager, buildTemplateManager, chromiumLogger);
             this.DataContextChanged += (sender, contextArgs) =>
             {
                 if (contextArgs.NewValue is BuildEntry)
                 {
+                    this.logger.LogInformation("Received data context. Setting current build");
                     this.CurrentBuild = contextArgs.NewValue.As<BuildEntry>();
+                    this.CurrentBuildCode = this.buildTemplateManager.EncodeTemplate(this.CurrentBuild.Build);
                 }
             };
         }
 
+        protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
+        {
+            base.OnPropertyChanged(e);
+            if (e.Property == CurrentBuildCodeProperty && this.supressDecode is false)
+            {
+                this.logger.LogInformation($"Attempting to decode provided template {this.CurrentBuildCode}");
+                try
+                {
+                    this.CurrentBuild = new BuildEntry
+                    {
+                        Name = this.CurrentBuild.Name,
+                        PreviousName = this.CurrentBuild.PreviousName,
+                        Build = this.buildTemplateManager.DecodeTemplate(this.CurrentBuildCode)
+                    };
+
+                    this.logger.LogInformation($"Template {CurrentBuildCode} decoded");
+                }
+                catch
+                {
+                    this.logger.LogWarning($"Failed to decode {this.CurrentBuildCode}. Reverting to default build");
+                    this.CurrentBuild = new BuildEntry
+                    {
+                        Name = this.CurrentBuild.Name,
+                        PreviousName = this.CurrentBuild.PreviousName,
+                        Build = new Build()
+                    };
+                }
+            }
+        }
+
+        private void BuildTemplate_BuildChanged(object sender, EventArgs e)
+        {
+            try
+            {
+                this.supressDecode = true;
+                this.CurrentBuildCode = this.buildTemplateManager.EncodeTemplate(this.CurrentBuild.Build);
+            }
+            finally
+            {
+                this.supressDecode = false;
+            }
+        }
         private void BackButton_Clicked(object sender, EventArgs e)
         {
             this.viewManager.ShowView<BuildsListView>();
         }
-
         private void SaveButton_Clicked(object sender, EventArgs e)
         {
             this.buildTemplateManager.SaveBuild(this.CurrentBuild);
@@ -79,7 +118,6 @@ namespace Daybreak.Views
                 e.Handled = true;
             }
         }
-
         private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
         {
             if (string.IsNullOrWhiteSpace(sender.As<TextBox>().Text))

Daybreak/Views/LogsView.xaml

@@ -50,6 +50,7 @@
             </DataGrid.RowStyle>
             <DataGrid.Columns>
                 <DataGridTextColumn IsReadOnly="True" Header="DateTime" Binding="{Binding LogTime}" ElementStyle="{StaticResource WrapText}" Width="auto"/>
+                <DataGridTextColumn IsReadOnly="True" Header="CV" Binding="{Binding CorrelationVector}" ElementStyle="{StaticResource WrapText}" Width="auto"/>
                 <DataGridTextColumn IsReadOnly="True" Header="Category" Binding="{Binding Category}" ElementStyle="{StaticResource WrapText}" Width="auto"/>
                 <DataGridTextColumn IsReadOnly="True" Header="LogLevel" Binding="{Binding LogLevel}" ElementStyle="{StaticResource WrapText}" Width="auto"/>
                 <DataGridTextColumn IsReadOnly="True" Header="EventId" Binding="{Binding EventId}" ElementStyle="{StaticResource WrapText}" Width="auto"/>

Daybreak/Views/LogsView.xaml.cs

@@ -4,7 +4,7 @@ using System;
 using System.Collections.ObjectModel;
 using System.Extensions;
 using System.Windows.Controls;
-using Daybreak.Models;
+using WpfExtended.Models;
 
 namespace Daybreak.Views
 {