Skip to content

Commit 777fc6f

Browse files
committed
validate object service uri
1 parent 08aebc9 commit 777fc6f

File tree

1 file changed

+18
-3
lines changed

1 file changed

+18
-3
lines changed

AvaGui/Models/ObjectEditorModel.cs

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,24 @@ public ObjectEditorModel()
6868

6969
LoadSettings();
7070

71-
var server = Settings.UseHttps ? Settings.ServerAddressHttps : Settings.ServerAddressHttp;
72-
WebClient = new HttpClient() { BaseAddress = new Uri(server), };
71+
var serverAddress = Settings!.UseHttps ? Settings.ServerAddressHttps : Settings.ServerAddressHttp;
72+
73+
if (Uri.TryCreate(serverAddress, new(), out var serverUri))
74+
{
75+
WebClient = new HttpClient() { BaseAddress = serverUri, };
76+
Logger.Info($"Successfully registered object service with address \"{serverUri}\"");
77+
}
78+
else
79+
{
80+
Logger.Error($"Unable to parse object service address \"{serverAddress}\". Online functionality will work until the address is corrected and the editor is restarted.");
81+
}
7382
}
7483

7584
public void LoadSettings()
7685
{
7786
if (!File.Exists(SettingsFile))
7887
{
88+
Logger.Info($"Settings file doesn't exist; creating now at \"{SettingsFile}\"");
7989
Settings = new();
8090
SaveSettings();
8191
return;
@@ -88,7 +98,11 @@ public void LoadSettings()
8898
Settings = settings!;
8999
InitialiseDownloadDirectory();
90100

91-
if (!ValidateSettings(Settings, Logger) && File.Exists(IndexFilename))
101+
if (ValidateSettings(Settings, Logger) && File.Exists(IndexFilename))
102+
{
103+
Logger.Info("Settings loaded and validated successfully.");
104+
}
105+
else
92106
{
93107
Logger.Error("Unable to validate settings file - please delete it and it will be recreated on next editor start-up.");
94108
}
@@ -103,6 +117,7 @@ void InitialiseDownloadDirectory()
103117

104118
if (!Directory.Exists(Settings.DownloadFolder))
105119
{
120+
Logger.Info($"Download folder doesn't exist; creating now at \"{Settings.DownloadFolder}\"");
106121
_ = Directory.CreateDirectory(Settings.DownloadFolder);
107122
}
108123
}

0 commit comments

Comments
 (0)