From 363687b2cdd9684dc5e978912973d2692f2d7f24 Mon Sep 17 00:00:00 2001 From: Alex Bezdieniezhnykh Date: Sat, 23 Nov 2024 11:59:35 +0200 Subject: [PATCH] add default api url in case of no config file --- Azaion.Annotator/Azaion.Annotator.csproj | 5 ----- Azaion.Suite/App.xaml.cs | 24 +++++++++++++++++++----- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/Azaion.Annotator/Azaion.Annotator.csproj b/Azaion.Annotator/Azaion.Annotator.csproj index 58e9046..bf6bf30 100644 --- a/Azaion.Annotator/Azaion.Annotator.csproj +++ b/Azaion.Annotator/Azaion.Annotator.csproj @@ -5,7 +5,6 @@ enable true net8.0-windows - ..\logo.ico @@ -31,10 +30,6 @@ - - - - diff --git a/Azaion.Suite/App.xaml.cs b/Azaion.Suite/App.xaml.cs index 3265eb1..869711f 100644 --- a/Azaion.Suite/App.xaml.cs +++ b/Azaion.Suite/App.xaml.cs @@ -12,7 +12,6 @@ using Azaion.Common.DTO; using Azaion.Common.DTO.Config; using Azaion.Common.Extensions; using Azaion.Common.Services; -using Azaion.Suite.Services; using Azaion.Dataset; using Azaion.Suite.Services.DTO; using CommandLine; @@ -40,16 +39,31 @@ public partial class App "Azaion.Dataset.dll" ]; - private static readonly IResourceLoader? ResourceLoader; + private static readonly IResourceLoader? ResourceLoader = new ResourceLoader("", "", null!, null!); static App() { var result = Parser.Default.ParseArguments(Environment.GetCommandLineArgs()); if (result.Errors.Any()) return; - - var configStr = File.ReadAllText(Constants.CONFIG_PATH); - var apiConfig = JsonConvert.DeserializeObject(configStr)!.ApiConfig; + ApiConfig apiConfig; + try + { + if (File.Exists(Constants.CONFIG_PATH)) + throw new FileNotFoundException(Constants.CONFIG_PATH); + var configStr = File.ReadAllText(Constants.CONFIG_PATH); + apiConfig = JsonConvert.DeserializeObject(configStr)!.ApiConfig; + } + catch (Exception e) + { + Console.WriteLine(e); + apiConfig = new ApiConfig + { + Url = "https://api.azaion.com", + RetryCount = 3, + TimeoutSeconds = 40 + }; + } var api = new AzaionApiClient(new HttpClient { BaseAddress = new Uri(apiConfig.Url),