handle cases where cannot connect to online service

Author: LeftofZen

AvaGui/Models/ObjectEditorModel.cs

@@ -32,9 +32,9 @@ public class ObjectEditorModel
 
 		public ObjectIndex ObjectIndex { get; private set; }
 
-		public ObjectIndex ObjectIndexOnline { get; set; }
+		public ObjectIndex? ObjectIndexOnline { get; set; }
 
-		public Dictionary<int, DtoLocoObject> OnlineCache { get; set; } = [];
+		public Dictionary<int, DtoLocoObject> OnlineCache { get; } = [];
 
 		public PaletteMap PaletteMap { get; set; }
 
@@ -58,7 +58,7 @@ public class ObjectEditorModel
 
 		public ObservableCollection<LogLine> LoggerObservableLogs = [];
 
-		public HttpClient WebClient { get; }
+		public HttpClient? WebClient { get; }
 
 		public ObjectEditorModel()
 		{
@@ -203,7 +203,7 @@ public bool TryLoadObject(FileSystemItem filesystemItem, out UiLocoFile? uiLocoF
 							Logger.Info($"Unable to object {filesystemItem.Name} with unique id {uniqueObjectId} from online - requested object is a vanilla object and it is illegal to distribute copyright material");
 							return false;
 						}
-						else if (locoObj.OriginalBytes == null || locoObj.OriginalBytes.Length == 0)
+						else if (string.IsNullOrEmpty(locoObj.OriginalBytes))
 						{
 							Logger.Warning($"Unable to load object {filesystemItem.Name} with unique id {uniqueObjectId} from online - received no DAT object data");
 						}
@@ -387,7 +387,7 @@ async Task LoadObjDirectoryAsyncCore(string directory, IProgress<float> progress
 					exception = true;
 				}
 
-				if (exception || ObjectIndex?.Objects == null || ObjectIndex.Objects.Any(x => string.IsNullOrEmpty(x.Filename) || (x is ObjectIndexEntry xx && string.IsNullOrEmpty(xx.ObjectName))) != false)
+				if (exception || ObjectIndex?.Objects == null || ObjectIndex.Objects.Any(x => string.IsNullOrEmpty(x.Filename) || (x is ObjectIndexEntry xx && string.IsNullOrEmpty(xx.ObjectName))))
 				{
 					Logger.Warning("Index file format has changed or otherwise appears to be malformed - recreating now.");
 					await RecreateIndex(directory, allFiles, progress);

AvaGui/ViewModels/FolderTreeViewModel.cs

@@ -54,7 +54,7 @@ public class FolderTreeViewModel : ReactiveObject
 		public ReactiveCommand<Unit, Task> RefreshDirectoryItems { get; }
 
 		[Reactive]
-		public ObservableCollection<ObjectDisplayMode> DisplayModeItems { get; set; } = [.. Enum.GetValues<ObjectDisplayMode>()];
+		public ObservableCollection<ObjectDisplayMode> DisplayModeItems { get; } = [.. Enum.GetValues<ObjectDisplayMode>()];
 
 		[Reactive]
 		public int SelectedTabIndex { get; set; }
@@ -144,7 +144,6 @@ async Task ReloadDirectoryAsync(bool useExistingIndex)
 			}
 
 			await Model.CheckForDatFilesNotOnServer();
-
 		}
 
 		async Task LoadObjDirectoryAsync(string directory, bool useExistingIndex)
@@ -171,7 +170,7 @@ async Task LoadOnlineDirectoryAsync(bool useExistingIndex)
 				return;
 			}
 
-			if (!useExistingIndex || Model.ObjectIndexOnline == null)
+			if ((!useExistingIndex || Model.ObjectIndexOnline == null) && Model.WebClient != null)
 			{
 				Model.ObjectIndexOnline = new ObjectIndex()
 				{
@@ -182,11 +181,14 @@ async Task LoadOnlineDirectoryAsync(bool useExistingIndex)
 				};
 			}
 
-			OnlineDirectoryItems = ConstructTreeView(
-				Model.ObjectIndexOnline.Objects.Where(x => (int)x.ObjectType < Limits.kMaxObjectTypes),
-				FilenameFilter,
-				DisplayMode,
-				FileLocation.Online);
+			if (Model.ObjectIndexOnline != null)
+			{
+				OnlineDirectoryItems = ConstructTreeView(
+					Model.ObjectIndexOnline.Objects.Where(x => (int)x.ObjectType < Limits.kMaxObjectTypes),
+					FilenameFilter,
+					DisplayMode,
+					FileLocation.Online);
+			}
 		}
 
 		static List<FileSystemItemBase> ConstructTreeView(IEnumerable<ObjectIndexEntryBase> index, string filenameFilter, ObjectDisplayMode displayMode, FileLocation fileLocation)

Definitions/Web/Client.cs

@@ -44,6 +44,7 @@ public static async Task<IEnumerable<DtoObjectIndexEntry>> GetObjectListAsync(Ht
 					logger?.Error($"Received data but couldn't parse it: {response}");
 					return default;
 				}
+
 				return data;
 			}
 			catch (Exception ex)