[fix:] naming window showed nothing
This commit is contained in:
+10
-9
@@ -4,20 +4,21 @@ using System.IO;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Logof_Client;
|
||||
|
||||
public class DataImport
|
||||
{
|
||||
public static (bool, KasAddressList) ImportKasAddressList(Uri pathToCsv, AddressPatch patch = null,
|
||||
public static async Task<(bool, KasAddressList)> ImportKasAddressList(Uri pathToCsv, AddressPatch patch = null,
|
||||
char separator = ',')
|
||||
{
|
||||
if (patch == null)
|
||||
return ImportKasAddressListWithoutPatch(pathToCsv, separator);
|
||||
return ImportKasAddressListWithPatch(pathToCsv, patch, separator);
|
||||
return await ImportKasAddressListWithoutPatch(pathToCsv, separator);
|
||||
return await ImportKasAddressListWithPatch(pathToCsv, patch, separator);
|
||||
}
|
||||
|
||||
private static (bool, KasAddressList) ImportKasAddressListWithoutPatch(Uri pathToCsv, char separator)
|
||||
private static async Task<(bool, KasAddressList)> ImportKasAddressListWithoutPatch(Uri pathToCsv, char separator)
|
||||
{
|
||||
if (!File.Exists(pathToCsv.LocalPath))
|
||||
{
|
||||
@@ -33,8 +34,8 @@ public class DataImport
|
||||
return (false, null);
|
||||
}
|
||||
|
||||
var imported =
|
||||
new KasAddressList(KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
|
||||
var imported = new KasAddressList(
|
||||
await KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
|
||||
|
||||
while (!reader.EndOfStream)
|
||||
{
|
||||
@@ -91,7 +92,7 @@ public class DataImport
|
||||
return (true, imported);
|
||||
}
|
||||
|
||||
private static (bool, KasAddressList) ImportKasAddressListWithPatch(Uri pathToCsv, AddressPatch patch,
|
||||
private static async Task<(bool, KasAddressList)> ImportKasAddressListWithPatch(Uri pathToCsv, AddressPatch patch,
|
||||
char separator)
|
||||
{
|
||||
if (!File.Exists(pathToCsv.LocalPath))
|
||||
@@ -110,8 +111,8 @@ public class DataImport
|
||||
|
||||
var headers = ParseCsvLine(headerLine, separator);
|
||||
|
||||
var imported =
|
||||
new KasAddressList(KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
|
||||
var imported = new KasAddressList(
|
||||
await KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
|
||||
var patchType = typeof(AddressPatch);
|
||||
var binding = BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user