Small cleanup

.github/workflows/ci.yml

@@ -30,6 +30,8 @@ jobs:
           rm -rf *.nupkg
           dotnet pack --nologo --version-suffix preview$GITHUB_RUN_ID.$(git rev-parse --short HEAD) -o . ArcaneLibs
           dotnet pack --nologo --version-suffix preview$GITHUB_RUN_ID.$(git rev-parse --short HEAD) -o . ArcaneLibs.Logging
+          dotnet pack --nologo --version-suffix preview$GITHUB_RUN_ID.$(git rev-parse --short HEAD) -o . ArcaneLibs.Timings
+          dotnet pack --nologo --version-suffix preview$GITHUB_RUN_ID.$(git rev-parse --short HEAD) -o . ArcaneLibs.Legacy
           dotnet pack --nologo --version-suffix preview$GITHUB_RUN_ID.$(git rev-parse --short HEAD) -o . ArcaneLibs.StringNormalisation
           dotnet pack --nologo --version-suffix preview$GITHUB_RUN_ID.$(git rev-parse --short HEAD) -o . ArcaneLibs.Blazor.Components
           dotnet nuget push $(ls *.nupkg) -k ${{ secrets.NUGET_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate

ArcaneLibs.Blazor.Components/ExampleJsInterop.cs

@@ -28,4 +28,4 @@ public async ValueTask DisposeAsync() {
             await module.DisposeAsync();
         }
     }
-}
+}

ArcaneLibs.Legacy/ArcaneLibs.Legacy.csproj

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+</Project>

ArcaneLibs/CsvTools.cs → ArcaneLibs.Legacy/CsvTools.cs

@@ -24,18 +24,18 @@ public static string ToCsv<T>(string separator, IEnumerable<T> objectlist) {
     }
 
     public static string ToCsvFields(string separator, PropertyInfo[] fields, object o) {
-        var linie = new StringBuilder();
+        var line = new StringBuilder();
 
         foreach (var f in fields) {
-            if (linie.Length > 0)
-                linie.Append(separator);
+            if (line.Length > 0)
+                line.Append(separator);
 
             var x = f.GetValue(o);
 
             if (x != null)
-                linie.Append(x.ToString());
+                line.Append(x.ToString());
         }
 
-        return linie.ToString();
+        return line.ToString();
     }
-}
+}

ArcaneLibs/DownloadQueue.cs → ArcaneLibs.Legacy/DownloadQueue.cs

@@ -65,4 +65,4 @@ internal void StartDownload() {
         if (File.Exists(TargetFile)) File.Delete(TargetFile);
         client.DownloadFileAsync(new Uri(Url), TargetFile);
     }
-}
+}

ArcaneLibs.Logging/LogEndpoints/BaseEndpoint.cs

@@ -3,4 +3,4 @@ namespace ArcaneLibs.Logging.LogEndpoints;
 public class BaseEndpoint {
     public virtual void Write(string text) =>
         Console.WriteLine("ArcaneLibs.Logging: invalid endpoint type: Write not implemented");
-}
+}

ArcaneLibs.Logging/LogEndpoints/ConsoleEndpoint.cs

@@ -2,4 +2,4 @@ namespace ArcaneLibs.Logging.LogEndpoints;
 
 public class ConsoleEndpoint : BaseEndpoint {
     public override void Write(string text) => Console.WriteLine(text);
-}
+}

ArcaneLibs.Logging/LogEndpoints/DebugEndpoint.cs

@@ -4,4 +4,4 @@ namespace ArcaneLibs.Logging.LogEndpoints;
 
 public class DebugEndpoint : BaseEndpoint {
     public override void Write(string text) => Debug.WriteLine(text);
-}
+}

ArcaneLibs.Logging/LogEndpoints/FileEndpoint.cs

@@ -9,4 +9,4 @@ public FileEndpoint(string path, bool append) {
     }
 
     public override void Write(string text) => _stream.WriteLine(text);
-}
+}

ArcaneLibs.Logging/LogManager.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using ArcaneLibs.Logging.LogEndpoints;
 
@@ -18,12 +18,9 @@ public class LogManager {
     /// <param name="message">Text to send</param>
     /// <param name="file">Filename (auto)</param>
     /// <param name="line">Line number (auto)</param>
-    public void Log(string message,
-        [CallerFilePath] string file = null,
-        [CallerLineNumber] int line = 0) {
+    public void Log(string message, [CallerFilePath] string file = null, [CallerLineNumber] int line = 0) {
         foreach (var endpoint in _endpoints)
-            endpoint.Write((LogTime ? $"[{DateTime.Now:hh:mm:ss}]" : "") +
-                           $"{Prefix}{Path.GetFileName(file)}:{line} {MessagePrefix}{message}");
+            endpoint.Write((LogTime ? $"[{DateTime.Now:hh:mm:ss}]" : "") + $"{Prefix}{Path.GetFileName(file)}:{line} {MessagePrefix}{message}");
     }
 
     /// <summary>
@@ -33,12 +30,8 @@ public void Log(string message,
     /// <param name="file">Filename (auto)</param>
     /// <param name="line">Line number (auto)</param>
     [Conditional("DEBUG")]
-    public void LogDebug(string message,
-        [CallerFilePath] string file = null,
-        [CallerLineNumber] int line = 0) =>
-        Log(message, file, line);
+    public void LogDebug(string message, [CallerFilePath] string file = null, [CallerLineNumber] int line = 0) => Log(message, file, line);
 
-    public void LogSplit(string separator, [CallerFilePath] string file = null,
-        [CallerLineNumber] int line = 0, params object[] parts) =>
+    public void LogSplit(string separator, [CallerFilePath] string file = null, [CallerLineNumber] int line = 0, params object[] parts) =>
         Log(string.Join(separator, parts), file, line);
-}
+}

ArcaneLibs.StringNormalisation/StringExtensions.cs

@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using System.Text;
 using System.Text.RegularExpressions;
 using Unidecode.NET;
@@ -24,4 +24,4 @@ public static string RemoveAnsi(this string str) {
         var ansiRegex = new Regex(@"\x1B\[[0-?]*[ -/]*[@-~]");
         return ansiRegex.Replace(str, "");
     }
-}
+}

ArcaneLibs.Timings/ArcaneLibs.Timings.csproj

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+</Project>

ArcaneLibs/Timing.cs → ArcaneLibs.Timings/Timing.cs

@@ -1,4 +1,4 @@
-using System.Collections.Concurrent;
+using System.Collections.Concurrent;
 using System.Diagnostics;
 
 namespace ArcaneLibs;
@@ -19,8 +19,8 @@ public Stopwatch StartTiming(string name, int timeoutMs = 60000) {
         new Thread(() => {
             if (Timings.TryGetValue(name, out var timing))
                 while (timing.IsRunning) {
-                    if (timing.ElapsedMilliseconds >= timeoutMs) Fail(name);
-
+                    if (timing.ElapsedMilliseconds >= timeoutMs)
+                        Fail(name);
                     Thread.Sleep(250);
                 }
             else
@@ -79,4 +79,4 @@ public Stopwatch Fail(string name) {
     }
 
     public ConcurrentDictionary<string, Stopwatch> Timings = new();
-}
+}

ArcaneLibs.UsageTest/Program.cs

@@ -1,12 +1,12 @@
-// See https://aka.ms/new-console-template for more information
+// See https://aka.ms/new-console-template for more information
 
 using System.Drawing;
 using ArcaneLibs;
 using ArcaneLibs.Collections;
+using ArcaneLibs.Extensions;
 using ArcaneLibs.Logging;
 using ArcaneLibs.Logging.LogEndpoints;
 using ArcaneLibs.UsageTest;
-using ArcaneLibs.Extensions;
 
 Console.WriteLine("Hello, World!");
 //create logs
@@ -25,15 +25,6 @@
 log3.Log("file log");
 log3.LogDebug("file dbg log");
 
-for (var i = 0; i < 5; i++) {
-    var myConfig = Config.Read();
-    Console.WriteLine(myConfig.SomeNumber);
-    myConfig.SomeNumber = i;
-    myConfig.Save();
-    myConfig = Config.Read();
-    Console.WriteLine(myConfig.SomeNumber);
-}
-
 /*
 Console.Write("Expected: ");
 for (int i = 0; i < 5; i++)
@@ -47,31 +38,29 @@
 }
 */
 var autodict = new AutoPopulatingDictionary<int, string>();
-var autodict2 = new AutoPopulatingDictionary<int, Config>();
 var autodict3 = new AutoPopulatingDictionary<int, Point>();
 
 var a = autodict[3];
-var b = autodict2[5];
 var c = autodict3[6];
 
 //return;
 
 Console.WriteLine(Util.GetCommandOutputSync("bash", "-c asdf"));
 Console.WriteLine(Util.GetCommandOutputSync("bash", "-c ls"));
 
-RandomClass arc = new RandomClass(){
+RandomClass arc = new RandomClass() {
     Id = 1,
     Name = "asdf",
     DateCreated = DateTime.Now,
-    SubClassInst = new(){
+    SubClassInst = new() {
         Description = "asdf"
     }
 };
-RandomClass brc = new RandomClass(){
+RandomClass brc = new RandomClass() {
     Id = 2,
     Name = "asdf",
     DateCreated = DateTime.Now,
-    SubClassInst = new(){
+    SubClassInst = new() {
         Description = "asdf"
     }
 };

ArcaneLibs.UsageTest/RandomClass.cs

@@ -1,15 +1,13 @@
 using System;
 namespace ArcaneLibs.UsageTest;
 
-public class RandomClass
-{
+public class RandomClass {
     public int Id { get; set; }
     public string Name { get; set; }
     public DateTime DateCreated { get; set; }
     public SubClass SubClassInst { get; set; }
 
-    public class SubClass
-    {
+    public class SubClass {
         public string Description { get; set; }
     }
 }

ArcaneLibs.sln

@@ -12,6 +12,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArcaneLibs.StringNormalisat
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArcaneLibs.Blazor.Components", "ArcaneLibs.Blazor.Components\ArcaneLibs.Blazor.Components.csproj", "{3CB4C1FB-B63C-4ED4-B3D2-716E4140CF32}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArcaneLibs.Timings", "ArcaneLibs.Timings\ArcaneLibs.Timings.csproj", "{01E2960C-1482-445B-A37D-C182A6DB3C34}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArcaneLibs.Legacy", "ArcaneLibs.Legacy\ArcaneLibs.Legacy.csproj", "{9A77704F-5099-401E-99ED-5B756214461B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -42,5 +46,13 @@ Global
 		{3CB4C1FB-B63C-4ED4-B3D2-716E4140CF32}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3CB4C1FB-B63C-4ED4-B3D2-716E4140CF32}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3CB4C1FB-B63C-4ED4-B3D2-716E4140CF32}.Release|Any CPU.Build.0 = Release|Any CPU
+		{01E2960C-1482-445B-A37D-C182A6DB3C34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{01E2960C-1482-445B-A37D-C182A6DB3C34}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{01E2960C-1482-445B-A37D-C182A6DB3C34}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{01E2960C-1482-445B-A37D-C182A6DB3C34}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A77704F-5099-401E-99ED-5B756214461B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A77704F-5099-401E-99ED-5B756214461B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A77704F-5099-401E-99ED-5B756214461B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A77704F-5099-401E-99ED-5B756214461B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

ArcaneLibs/ClassCollector.cs

@@ -5,21 +5,16 @@ namespace ArcaneLibs;
 public class ClassCollector<T> where T : class {
     static ClassCollector() {
         if (!typeof(T).IsInterface && !typeof(T).IsAbstract)
-            throw new ArgumentException(
-                $"ClassCollector<T> must be used with an interface or abstract type. Passed type: {typeof(T).Name}");
+            throw new ArgumentException($"ClassCollector<T> must be used with an interface or abstract type. Passed type: {typeof(T).Name}");
     }
 
-    public List<Type> ResolveFromAllAccessibleAssemblies() =>
-        AppDomain.CurrentDomain.GetAssemblies().SelectMany(ResolveFromAssembly).ToList();
+    public List<Type> ResolveFromAllAccessibleAssemblies() => AppDomain.CurrentDomain.GetAssemblies().SelectMany(ResolveFromAssembly).ToList();
 
     public List<Type> ResolveFromObjectReference(object obj) => ResolveFromTypeReference(obj.GetType());
 
-    public List<Type> ResolveFromTypeReference(Type t) =>
-        Assembly.GetAssembly(t)?.GetReferencedAssemblies().SelectMany(ResolveFromAssemblyName).ToList() ??
-        new List<Type>();
+    public List<Type> ResolveFromTypeReference(Type t) => Assembly.GetAssembly(t)?.GetReferencedAssemblies().SelectMany(ResolveFromAssemblyName).ToList() ?? new List<Type>();
 
-    public List<Type> ResolveFromAssemblyName(AssemblyName assemblyName) =>
-        ResolveFromAssembly(Assembly.Load(assemblyName));
+    public List<Type> ResolveFromAssemblyName(AssemblyName assemblyName) => ResolveFromAssembly(Assembly.Load(assemblyName));
 
     public List<Type> ResolveFromAssembly(Assembly assembly) => assembly.GetTypes()
         .Where(x => x is { IsClass: true, IsAbstract: false } && x.IsAssignableTo(typeof(T))).ToList();

ArcaneLibs/Collections/AutoPopulatingDictionary.cs

@@ -9,17 +9,13 @@ public class AutoPopulatingDictionary<T1, T2> : Dictionary<T1, T2> {
     public T2 this[T1 key] {
         get {
             var a = typeof(T2).GetConstructors();
-            if (!_backingStore.ContainsKey(key)) _backingStore.Add(key, GetNewInstance.Invoke());
             return _backingStore[key];
         }
-        set {
-            if (!_backingStore.ContainsKey(key)) _backingStore.Add(key, value);
-            else _backingStore[key] = value;
-        }
+        set => _backingStore[key] = value;
     }
-
-    private Func<T2> GetNewInstance = () => {
+    
+    public Func<T1, T2> GetNewInstance = (T1 key) => {
         if (typeof(T2) == typeof(string)) return (T2)(object)"";
         return Activator.CreateInstance<T2>();
     };
-}
+}

ArcaneLibs/Extensions/BooleanExtensions.cs

@@ -6,4 +6,4 @@ public static class BooleanExtensions {
     public static (bool, string) ToggleAlt(this bool @bool) => (@bool ^= true, @bool ? "enabled" : "disabled");
 
     public static string ToEnglish(this bool @bool) => @bool ? "enabled" : "disabled";
-}
+}

ArcaneLibs/Extensions/DictionaryExtensions.cs

@@ -35,13 +35,13 @@ public static async Task<Y> GetOrCreateAsync<X, Y>(this IDictionary<X, Y> dict,
         if (semaphore is not null) await semaphore.WaitAsync();
         Y value;
         // lock (dict) {
-            if (dict.TryGetValue(key, out value)) {
-                if (semaphore is not null) semaphore.Release();
-                return value;
-            }
+        if (dict.TryGetValue(key, out value)) {
+            if (semaphore is not null) semaphore.Release();
+            return value;
+        }
 
-            value = await valueFactory(key);
-            dict.TryAdd(key, value);
+        value = await valueFactory(key);
+        dict.TryAdd(key, value);
         // }
 
         if (semaphore is not null) semaphore.Release();