From 46bf3d739171addf4d867893b52852d9d71bd7f8 Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Sat, 29 Apr 2023 18:34:21 +0200 Subject: [PATCH] Notification on invalid collection names. --- Penumbra/Collections/Manager/CollectionStorage.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Penumbra/Collections/Manager/CollectionStorage.cs b/Penumbra/Collections/Manager/CollectionStorage.cs index 0f21cd6e..d065bbcf 100644 --- a/Penumbra/Collections/Manager/CollectionStorage.cs +++ b/Penumbra/Collections/Manager/CollectionStorage.cs @@ -222,10 +222,17 @@ public class CollectionStorage : IReadOnlyList, IDisposable foreach (var file in _saveService.FileNames.CollectionFiles) { - if (!ModCollectionSave.LoadFromFile(file, out var name, out var version, out var settings, out var inheritance) - || !IsValidName(name)) + if (!ModCollectionSave.LoadFromFile(file, out var name, out var version, out var settings, out var inheritance)) continue; + if (!IsValidName(name)) + { + // TODO: handle better. + Penumbra.ChatService.NotificationMessage($"Collection of unsupported name found: {name} is not a valid collection name.", + "Warning", NotificationType.Warning); + continue; + } + if (ByName(name, out _)) { Penumbra.ChatService.NotificationMessage($"Duplicate collection found: {name} already exists. Import skipped.",