Update UI more frequently with reports

Author: Coding-Enthusiast

Src/FinderOuter/Services/Base16Sevice.cs

@@ -186,7 +186,7 @@ public async Task<bool> Find(string key, char missingChar, string AdditionalInpu
             AddQueue($"Elapsed time: {watch.Elapsed}");
             AddQueue(GetKeyPerSec(total, watch.Elapsed.TotalSeconds));
 
-            return CopyQueueToMessage(success);
+            return FinishReport(success);
         }
     }
 }

Src/FinderOuter/Services/Base58Sevice.cs

@@ -446,7 +446,7 @@ private async Task<bool> FindPrivateKey(string key, char missingChar)
             if (key.Contains(missingChar)) // Length must be correct then
             {
                 missCount = key.Count(c => c == missingChar);
-                if (inputService.CanBePrivateKey(key))
+                if (inputService.CanBePrivateKey(key, out string error))
                 {
                     missingIndexes = new int[missCount];
                     bool isComp = key.Length == Constants.PrivKeyCompWifLen;
@@ -477,6 +477,10 @@ private async Task<bool> FindPrivateKey(string key, char missingChar)
                     AddQueue($"Elapsed time: {watch.Elapsed}");
                     AddQueue(GetKeyPerSec(GetTotalCount(missCount), watch.Elapsed.TotalSeconds));
                 }
+                else
+                {
+                    AddQueue(error);
+                }
 
                 if (success)
                 {
@@ -566,7 +570,7 @@ public async Task<bool> Find(string key, char missingChar, InputType t)
                     return Fail("Given input type is not defined.");
             }
 
-            return CopyQueueToMessage(success);
+            return FinishReport(success);
         }
     }
 }

Src/FinderOuter/Services/InputService.cs

@@ -17,14 +17,40 @@ public class InputService
         private readonly Bech32 b32Enc = new Bech32();
 
 
-        public bool CanBePrivateKey(string key)
+        public bool CanBePrivateKey(string key, out string error)
         {
-            return
-                (key.Length == Constants.PrivKeyCompWifLen &&
-                        (key[0] == Constants.PrivKeyCompChar1 || key[0] == Constants.PrivKeyCompChar2))
-                ||
-                (key.Length == Constants.PrivKeyUncompWifLen &&
-                        (key[0] == Constants.PrivKeyUncompChar));
+            if (key.Length == Constants.PrivKeyCompWifLen)
+            {
+                if (key[0] == Constants.PrivKeyCompChar1 || key[0] == Constants.PrivKeyCompChar2)
+                {
+                    error = null;
+                    return true;
+                }
+                else
+                {
+                    error = $"A key with {key.Length} length is expected to start with {Constants.PrivKeyCompChar1} " +
+                            $"or {Constants.PrivKeyCompChar2}.";
+                    return false;
+                }
+            }
+            else if (key.Length == Constants.PrivKeyUncompWifLen)
+            {
+                if (key[0] == Constants.PrivKeyUncompChar)
+                {
+                    error = null;
+                    return true;
+                }
+                else
+                {
+                    error = $"A key with {key.Length} length is expected to start with {Constants.PrivKeyUncompChar}.";
+                    return false;
+                }
+            }
+            else
+            {
+                error = "Given key has an invalid length";
+                return false;
+            }
         }
 
         public string CheckPrivateKey(string key)

Src/FinderOuter/Services/MessageSignatureService.cs

@@ -30,7 +30,7 @@ public MessageSignatureService(Report rep) : base(rep)
         private readonly Sha256 hash = new Sha256(true);
         private readonly EllipticCurveCalculator calc;
         private readonly Address addressBuilder;
-        private InputService inputService;
+        private readonly InputService inputService;
 
 
         private bool CheckAddress(string addr, out Address.AddressType addrType)
@@ -154,8 +154,7 @@ public bool Validate(string message, string address, string signature)
 
             Signature sig = new Signature(sigBa, Signature.SigEncoding.WithRecId);
             bool success = CheckPubkeys(sig, toSign, address, addrType);
-            CopyQueueToMessage(success);
-            return success;
+            return FinishReport(success);
         }
 
 
@@ -340,7 +339,7 @@ public async Task<bool> TryFindProblem(string message, string address, string si
             }
             );
 
-            return CopyQueueToMessage(success);
+            return FinishReport(success);
         }
     }
 }

Src/FinderOuter/Services/MnemonicSevice.cs

@@ -511,7 +511,7 @@ public async Task<bool> FindMissing(string mnemonic, char missingChar, MnemonicT
                 AddQueue($"Found {Final.Count:n0} correct mnemonics.");
                 Final.Clear();
             }
-            return CopyQueueToMessage(success);
+            return FinishReport(success);
         }
 
 

Src/FinderOuter/Services/ServiceBase.cs

@@ -3,10 +3,10 @@
 // Distributed under the MIT software license, see the accompanying
 // file LICENCE or http://www.opensource.org/licenses/mit-license.php.
 
+using Avalonia.Threading;
 using FinderOuter.Models;
 using System;
 using System.Numerics;
-using System.Text;
 
 namespace FinderOuter.Services
 {
@@ -21,16 +21,19 @@ public ServiceBase(Report rep)
         }
 
 
-
         private readonly Report report;
-        private readonly StringBuilder queue = new StringBuilder();
 
 
         protected void InitReport()
         {
             report.CurrentState = State.Working;
             report.Message = string.Empty;
-            queue.Clear();
+        }
+
+        protected bool FinishReport(bool success)
+        {
+            report.CurrentState = success ? State.FinishedSuccess : State.FinishedFail;
+            return success;
         }
 
         protected void AddMessage(string msg)
@@ -54,15 +57,8 @@ protected bool Pass(string msg)
 
         protected void AddQueue(string msg)
         {
-            queue.AppendLine(msg);
-        }
-
-        protected bool CopyQueueToMessage(bool hasPassed)
-        {
-            report.CurrentState = hasPassed ? State.FinishedSuccess : State.FinishedFail;
-            AddMessage(queue.ToString());
-
-            return hasPassed;
+            Dispatcher.UIThread.InvokeAsync(() => 
+                report.Message += string.IsNullOrEmpty(report.Message) ? msg : $"{Environment.NewLine}{msg}");
         }
 
         protected string GetKeyPerSec(BigInteger total, double totalSecond)
@@ -76,6 +72,5 @@ protected string GetKeyPerSec(BigInteger total, double totalSecond)
                 return $"k/s= {total / new BigInteger(totalSecond):n0}";
             }
         }
-
     }
 }

Src/Tests/Services/InputServiceTests.cs

@@ -24,8 +24,9 @@ public class InputServiceTests
         public void CanBePrivateKeyTest(string key)
         {
             InputService serv = new InputService();
-            bool actual = serv.CanBePrivateKey(key);
-            Assert.True(actual);
+            bool actual = serv.CanBePrivateKey(key, out string error);
+            Assert.True(actual, error);
+            Assert.Null(error);
         }
 
         [Theory]
@@ -41,7 +42,7 @@ public void CanBePrivateKeyTest(string key)
         public void CanBePrivateKey_FalseTest(string key)
         {
             InputService serv = new InputService();
-            bool actual = serv.CanBePrivateKey(key);
+            bool actual = serv.CanBePrivateKey(key, out _);
             Assert.False(actual);
         }