ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2026-01-02 13:53:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve collection migration maybe.

Browse source
This commit is contained in:
Ottermandias 2024-04-26 10:56:36 +02:00
parent a72be22d3b
commit e40c4999b6
2 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Penumbra/Collections/Manager/CollectionStorage.cs
View file

@ -184,21 +184,39 @@ public class CollectionStorage : IReadOnlyList<ModCollection>, IDisposable
{ {
if (version >= 2) if (version >= 2)
{ {
File.Move(file.FullName, correctName, false); try
Penumbra.Messager.NotificationMessage($"Collection {file.Name} does not correspond to {collection.Identifier}, renamed.", {
NotificationType.Warning); File.Move(file.FullName, correctName, false);
Penumbra.Messager.NotificationMessage(
$"Collection {file.Name} does not correspond to {collection.Identifier}, renamed.",
NotificationType.Warning);
}
catch (Exception ex)
{
Penumbra.Messager.NotificationMessage(
$"Collection {file.Name} does not correspond to {collection.Identifier}, rename failed:\n{ex}",
NotificationType.Warning);
}
} }
else else
{ {
_saveService.ImmediateSaveSync(new ModCollectionSave(_modStorage, collection)); _saveService.ImmediateSaveSync(new ModCollectionSave(_modStorage, collection));
File.Delete(file.FullName); try
Penumbra.Log.Information($"Migrated collection {name} to Guid {id}."); {
File.Move(file.FullName, file.FullName + ".bak", true);
Penumbra.Log.Information($"Migrated collection {name} to Guid {id} with backup of old file.");
}
catch (Exception ex)
{
Penumbra.Log.Information($"Migrated collection {name} to Guid {id}, rename of old file failed:\n{ex}");
}
} }
} }
catch (Exception e) catch (Exception e)
{ {
Penumbra.Messager.NotificationMessage(e, Penumbra.Messager.NotificationMessage(e,
$"Collection {file.Name} does not correspond to {collection.Identifier}, but could not rename.", NotificationType.Error); $"Collection {file.Name} does not correspond to {collection.Identifier}, but could not rename.",
NotificationType.Error);
} }
_collections.Add(collection); _collections.Add(collection);

2
Penumbra/Collections/Manager/ModCollectionMigration.cs
View file

@ -1,8 +1,6 @@
using Penumbra.Mods;
using Penumbra.Mods.Manager; using Penumbra.Mods.Manager;
using Penumbra.Mods.Settings; using Penumbra.Mods.Settings;
using Penumbra.Services; using Penumbra.Services;
using Penumbra.Util;
namespace Penumbra.Collections.Manager; namespace Penumbra.Collections.Manager;