From 88bbc9644c3a9e3a2416c76dab3ac91ccdc7dd46 Mon Sep 17 00:00:00 2001 From: Elias Fierke Date: Mon, 17 Nov 2025 13:28:40 +0100 Subject: [PATCH] [chore:] applied improved set naming --- DataImport.cs | 4 ++-- Tasks/CombineAddresses.cs | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/DataImport.cs b/DataImport.cs index 6d34019..2806758 100644 --- a/DataImport.cs +++ b/DataImport.cs @@ -32,7 +32,7 @@ public class DataImport return (false, null); } - var imported = new KasAddressList(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)); + var imported = new KasAddressList(KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath))); while (!reader.EndOfStream) { @@ -108,7 +108,7 @@ public class DataImport var headers = headerLine.Split(separator).Select(h => h.Trim()).ToArray(); - var imported = new KasAddressList(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)); + var imported = new KasAddressList(KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath))); var patchType = typeof(AddressPatch); var binding = BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase; diff --git a/Tasks/CombineAddresses.cs b/Tasks/CombineAddresses.cs index bddfd9b..2dfe600 100644 --- a/Tasks/CombineAddresses.cs +++ b/Tasks/CombineAddresses.cs @@ -95,7 +95,7 @@ public class CombineAddresses Progress? progress = null) { if (address_lists == null || address_lists.Count == 0) - return (new KasAddressList("difference"),null); + return (new KasAddressList(KasAddressList.GenerateName("difference")),null); progress ??= new Progress { @@ -107,8 +107,8 @@ public class CombineAddresses var restUnion = new List(); for (var i = 1; i < address_lists.Count; i++) restUnion.AddRange(address_lists[i].KasPersons); - var result = new KasAddressList("difference"); - var second_result = new KasAddressList("difference_rest"); + var result = new KasAddressList(KasAddressList.GenerateName("difference")); + var second_result = new KasAddressList(KasAddressList.GenerateName("difference_rest")); foreach (var person in address_lists[0].KasPersons) { @@ -132,8 +132,8 @@ public class CombineAddresses public async Task<(KasAddressList,KasAddressList)> Union(List address_lists, bool? return_unused, Progress progress = null) { - var result = new KasAddressList("union"); - var second_result = new KasAddressList("union_rest"); + var result = new KasAddressList(KasAddressList.GenerateName("union")); + var second_result = new KasAddressList(KasAddressList.GenerateName("union_rest")); if (address_lists == null || address_lists.Count == 0) return (result,null); @@ -173,8 +173,8 @@ public class CombineAddresses public async Task<(KasAddressList,KasAddressList)> Intersection(List address_lists, bool? return_unused, Progress progress = null) { - var result = new KasAddressList("intersection"); - var second_result = new KasAddressList("intersection_rest"); + var result = new KasAddressList(KasAddressList.GenerateName("intersection")); + var second_result = new KasAddressList(KasAddressList.GenerateName("intersection_rest")); if (address_lists == null || address_lists.Count == 0) return (result,null); @@ -219,8 +219,8 @@ public class CombineAddresses public async Task<(KasAddressList,KasAddressList)> SymmetricDifference(List address_lists, bool? return_unused, Progress progress = null) { - var result = new KasAddressList("symmetric_difference"); - var second_result = new KasAddressList("symmetric_rest"); + var result = new KasAddressList(KasAddressList.GenerateName("symmetric_difference")); + var second_result = new KasAddressList(KasAddressList.GenerateName("symmetric_rest")); if (address_lists == null || address_lists.Count == 0) return (result, null);