From f73fc1feb2f2204ac8c27b1162ec0724529f2d7c Mon Sep 17 00:00:00 2001 From: JPVenson Date: Fri, 15 May 2026 19:03:08 +0000 Subject: [PATCH] Update filenaming scheme to match EFCore one --- ...20250420050000_DisableTranscodingThrottling.cs} | 0 ... 20250420060000_CreateUserLoggingConfigFile.cs} | 0 ...b.cs => 20250420070000_MigrateActivityLogDb.cs} | 0 ....cs => 20250420080000_RemoveDuplicateExtras.cs} | 0 ...> 20250420090000_AddDefaultPluginRepository.cs} | 0 ...teUserDb.cs => 20250420100000_MigrateUserDb.cs} | 0 ...20250420110000_ReaddDefaultPluginRepository.cs} | 0 ... 20250420120000_MigrateDisplayPreferencesDb.cs} | 0 ...0250420130000_RemoveDownloadImagesInAdvance.cs} | 0 ...s => 20250420140000_MigrateAuthenticationDb.cs} | 0 ...Owner.cs => 20250420150000_FixPlaylistOwner.cs} | 0 ...s => 20250420160000_AddDefaultCastReceivers.cs} | 0 ...0250420170000_UpdateDefaultPluginRepository.cs} | 0 ...AudioData.cs => 20250420180000_FixAudioData.cs} | 0 ...50420190000_RemoveDuplicatePlaylistChildren.cs} | 0 ...20193000_MigrateLibraryDbCompatibilityCheck.cs} | 0 ...aryDb.cs => 20250420200000_MigrateLibraryDb.cs} | 0 ...les.cs => 20250420210000_MoveExtractedFiles.cs} | 0 ...les.cs => 20250420230000_MoveTrickplayFiles.cs} | 0 ... 20250420230000_RefreshInternalDateModified.cs} | 0 ...ta.cs => 20250421000000_MigrateKeyframeData.cs} | 0 ...cs => 20250618010000_MigrateLibraryUserData.cs} | 0 .../{FixDates.cs => 20250620180000_FixDates.cs} | 0 ...rFlag.cs => 20250730215000_ReseedFolderFlag.cs} | 0 ...ames.cs => 20251008120000_RefreshCleanNames.cs} | 0 ...rtist.cs => 20251009200000_CleanMusicArtist.cs} | 0 ....cs => 20260113120000_MigrateLinkedChildren.cs} | 0 ....cs => 20260113230000_CleanupOrphanedExtras.cs} | 0 ...0115120000_FixIncorrectOwnerIdRelationships.cs} | 0 ...6200000_FixLibrarySubtitleDownloadLanguages.cs} | 0 ...ls.cs => 20260302090000_MigrateRatingLevels.cs} | 0 ...> 20260508120000_MergeDuplicateMusicArtists.cs} | 0 ...e.cs => 20260508130000_MergeDuplicatePeople.cs} | 14 ++++++++++---- 33 files changed, 10 insertions(+), 4 deletions(-) rename Jellyfin.Server/Migrations/Routines/{DisableTranscodingThrottling.cs => 20250420050000_DisableTranscodingThrottling.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{CreateUserLoggingConfigFile.cs => 20250420060000_CreateUserLoggingConfigFile.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{MigrateActivityLogDb.cs => 20250420070000_MigrateActivityLogDb.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{RemoveDuplicateExtras.cs => 20250420080000_RemoveDuplicateExtras.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{AddDefaultPluginRepository.cs => 20250420090000_AddDefaultPluginRepository.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{MigrateUserDb.cs => 20250420100000_MigrateUserDb.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{ReaddDefaultPluginRepository.cs => 20250420110000_ReaddDefaultPluginRepository.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{MigrateDisplayPreferencesDb.cs => 20250420120000_MigrateDisplayPreferencesDb.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{RemoveDownloadImagesInAdvance.cs => 20250420130000_RemoveDownloadImagesInAdvance.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{MigrateAuthenticationDb.cs => 20250420140000_MigrateAuthenticationDb.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{FixPlaylistOwner.cs => 20250420150000_FixPlaylistOwner.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{AddDefaultCastReceivers.cs => 20250420160000_AddDefaultCastReceivers.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{UpdateDefaultPluginRepository.cs => 20250420170000_UpdateDefaultPluginRepository.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{FixAudioData.cs => 20250420180000_FixAudioData.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{RemoveDuplicatePlaylistChildren.cs => 20250420190000_RemoveDuplicatePlaylistChildren.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{MigrateLibraryDbCompatibilityCheck.cs => 20250420193000_MigrateLibraryDbCompatibilityCheck.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{MigrateLibraryDb.cs => 20250420200000_MigrateLibraryDb.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{MoveExtractedFiles.cs => 20250420210000_MoveExtractedFiles.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{MoveTrickplayFiles.cs => 20250420230000_MoveTrickplayFiles.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{RefreshInternalDateModified.cs => 20250420230000_RefreshInternalDateModified.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{MigrateKeyframeData.cs => 20250421000000_MigrateKeyframeData.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{MigrateLibraryUserData.cs => 20250618010000_MigrateLibraryUserData.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{FixDates.cs => 20250620180000_FixDates.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{ReseedFolderFlag.cs => 20250730215000_ReseedFolderFlag.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{RefreshCleanNames.cs => 20251008120000_RefreshCleanNames.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{CleanMusicArtist.cs => 20251009200000_CleanMusicArtist.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{MigrateLinkedChildren.cs => 20260113120000_MigrateLinkedChildren.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{CleanupOrphanedExtras.cs => 20260113230000_CleanupOrphanedExtras.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{FixIncorrectOwnerIdRelationships.cs => 20260115120000_FixIncorrectOwnerIdRelationships.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{FixLibrarySubtitleDownloadLanguages.cs => 20260206200000_FixLibrarySubtitleDownloadLanguages.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{MigrateRatingLevels.cs => 20260302090000_MigrateRatingLevels.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{MergeDuplicateMusicArtists.cs => 20260508120000_MergeDuplicateMusicArtists.cs} (100%) rename Jellyfin.Server/Migrations/Routines/{MergeDuplicatePeople.cs => 20260508130000_MergeDuplicatePeople.cs} (96%) diff --git a/Jellyfin.Server/Migrations/Routines/DisableTranscodingThrottling.cs b/Jellyfin.Server/Migrations/Routines/20250420050000_DisableTranscodingThrottling.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/DisableTranscodingThrottling.cs rename to Jellyfin.Server/Migrations/Routines/20250420050000_DisableTranscodingThrottling.cs diff --git a/Jellyfin.Server/Migrations/Routines/CreateUserLoggingConfigFile.cs b/Jellyfin.Server/Migrations/Routines/20250420060000_CreateUserLoggingConfigFile.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/CreateUserLoggingConfigFile.cs rename to Jellyfin.Server/Migrations/Routines/20250420060000_CreateUserLoggingConfigFile.cs diff --git a/Jellyfin.Server/Migrations/Routines/MigrateActivityLogDb.cs b/Jellyfin.Server/Migrations/Routines/20250420070000_MigrateActivityLogDb.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/MigrateActivityLogDb.cs rename to Jellyfin.Server/Migrations/Routines/20250420070000_MigrateActivityLogDb.cs diff --git a/Jellyfin.Server/Migrations/Routines/RemoveDuplicateExtras.cs b/Jellyfin.Server/Migrations/Routines/20250420080000_RemoveDuplicateExtras.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/RemoveDuplicateExtras.cs rename to Jellyfin.Server/Migrations/Routines/20250420080000_RemoveDuplicateExtras.cs diff --git a/Jellyfin.Server/Migrations/Routines/AddDefaultPluginRepository.cs b/Jellyfin.Server/Migrations/Routines/20250420090000_AddDefaultPluginRepository.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/AddDefaultPluginRepository.cs rename to Jellyfin.Server/Migrations/Routines/20250420090000_AddDefaultPluginRepository.cs diff --git a/Jellyfin.Server/Migrations/Routines/MigrateUserDb.cs b/Jellyfin.Server/Migrations/Routines/20250420100000_MigrateUserDb.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/MigrateUserDb.cs rename to Jellyfin.Server/Migrations/Routines/20250420100000_MigrateUserDb.cs diff --git a/Jellyfin.Server/Migrations/Routines/ReaddDefaultPluginRepository.cs b/Jellyfin.Server/Migrations/Routines/20250420110000_ReaddDefaultPluginRepository.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/ReaddDefaultPluginRepository.cs rename to Jellyfin.Server/Migrations/Routines/20250420110000_ReaddDefaultPluginRepository.cs diff --git a/Jellyfin.Server/Migrations/Routines/MigrateDisplayPreferencesDb.cs b/Jellyfin.Server/Migrations/Routines/20250420120000_MigrateDisplayPreferencesDb.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/MigrateDisplayPreferencesDb.cs rename to Jellyfin.Server/Migrations/Routines/20250420120000_MigrateDisplayPreferencesDb.cs diff --git a/Jellyfin.Server/Migrations/Routines/RemoveDownloadImagesInAdvance.cs b/Jellyfin.Server/Migrations/Routines/20250420130000_RemoveDownloadImagesInAdvance.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/RemoveDownloadImagesInAdvance.cs rename to Jellyfin.Server/Migrations/Routines/20250420130000_RemoveDownloadImagesInAdvance.cs diff --git a/Jellyfin.Server/Migrations/Routines/MigrateAuthenticationDb.cs b/Jellyfin.Server/Migrations/Routines/20250420140000_MigrateAuthenticationDb.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/MigrateAuthenticationDb.cs rename to Jellyfin.Server/Migrations/Routines/20250420140000_MigrateAuthenticationDb.cs diff --git a/Jellyfin.Server/Migrations/Routines/FixPlaylistOwner.cs b/Jellyfin.Server/Migrations/Routines/20250420150000_FixPlaylistOwner.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/FixPlaylistOwner.cs rename to Jellyfin.Server/Migrations/Routines/20250420150000_FixPlaylistOwner.cs diff --git a/Jellyfin.Server/Migrations/Routines/AddDefaultCastReceivers.cs b/Jellyfin.Server/Migrations/Routines/20250420160000_AddDefaultCastReceivers.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/AddDefaultCastReceivers.cs rename to Jellyfin.Server/Migrations/Routines/20250420160000_AddDefaultCastReceivers.cs diff --git a/Jellyfin.Server/Migrations/Routines/UpdateDefaultPluginRepository.cs b/Jellyfin.Server/Migrations/Routines/20250420170000_UpdateDefaultPluginRepository.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/UpdateDefaultPluginRepository.cs rename to Jellyfin.Server/Migrations/Routines/20250420170000_UpdateDefaultPluginRepository.cs diff --git a/Jellyfin.Server/Migrations/Routines/FixAudioData.cs b/Jellyfin.Server/Migrations/Routines/20250420180000_FixAudioData.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/FixAudioData.cs rename to Jellyfin.Server/Migrations/Routines/20250420180000_FixAudioData.cs diff --git a/Jellyfin.Server/Migrations/Routines/RemoveDuplicatePlaylistChildren.cs b/Jellyfin.Server/Migrations/Routines/20250420190000_RemoveDuplicatePlaylistChildren.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/RemoveDuplicatePlaylistChildren.cs rename to Jellyfin.Server/Migrations/Routines/20250420190000_RemoveDuplicatePlaylistChildren.cs diff --git a/Jellyfin.Server/Migrations/Routines/MigrateLibraryDbCompatibilityCheck.cs b/Jellyfin.Server/Migrations/Routines/20250420193000_MigrateLibraryDbCompatibilityCheck.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/MigrateLibraryDbCompatibilityCheck.cs rename to Jellyfin.Server/Migrations/Routines/20250420193000_MigrateLibraryDbCompatibilityCheck.cs diff --git a/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs b/Jellyfin.Server/Migrations/Routines/20250420200000_MigrateLibraryDb.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs rename to Jellyfin.Server/Migrations/Routines/20250420200000_MigrateLibraryDb.cs diff --git a/Jellyfin.Server/Migrations/Routines/MoveExtractedFiles.cs b/Jellyfin.Server/Migrations/Routines/20250420210000_MoveExtractedFiles.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/MoveExtractedFiles.cs rename to Jellyfin.Server/Migrations/Routines/20250420210000_MoveExtractedFiles.cs diff --git a/Jellyfin.Server/Migrations/Routines/MoveTrickplayFiles.cs b/Jellyfin.Server/Migrations/Routines/20250420230000_MoveTrickplayFiles.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/MoveTrickplayFiles.cs rename to Jellyfin.Server/Migrations/Routines/20250420230000_MoveTrickplayFiles.cs diff --git a/Jellyfin.Server/Migrations/Routines/RefreshInternalDateModified.cs b/Jellyfin.Server/Migrations/Routines/20250420230000_RefreshInternalDateModified.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/RefreshInternalDateModified.cs rename to Jellyfin.Server/Migrations/Routines/20250420230000_RefreshInternalDateModified.cs diff --git a/Jellyfin.Server/Migrations/Routines/MigrateKeyframeData.cs b/Jellyfin.Server/Migrations/Routines/20250421000000_MigrateKeyframeData.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/MigrateKeyframeData.cs rename to Jellyfin.Server/Migrations/Routines/20250421000000_MigrateKeyframeData.cs diff --git a/Jellyfin.Server/Migrations/Routines/MigrateLibraryUserData.cs b/Jellyfin.Server/Migrations/Routines/20250618010000_MigrateLibraryUserData.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/MigrateLibraryUserData.cs rename to Jellyfin.Server/Migrations/Routines/20250618010000_MigrateLibraryUserData.cs diff --git a/Jellyfin.Server/Migrations/Routines/FixDates.cs b/Jellyfin.Server/Migrations/Routines/20250620180000_FixDates.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/FixDates.cs rename to Jellyfin.Server/Migrations/Routines/20250620180000_FixDates.cs diff --git a/Jellyfin.Server/Migrations/Routines/ReseedFolderFlag.cs b/Jellyfin.Server/Migrations/Routines/20250730215000_ReseedFolderFlag.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/ReseedFolderFlag.cs rename to Jellyfin.Server/Migrations/Routines/20250730215000_ReseedFolderFlag.cs diff --git a/Jellyfin.Server/Migrations/Routines/RefreshCleanNames.cs b/Jellyfin.Server/Migrations/Routines/20251008120000_RefreshCleanNames.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/RefreshCleanNames.cs rename to Jellyfin.Server/Migrations/Routines/20251008120000_RefreshCleanNames.cs diff --git a/Jellyfin.Server/Migrations/Routines/CleanMusicArtist.cs b/Jellyfin.Server/Migrations/Routines/20251009200000_CleanMusicArtist.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/CleanMusicArtist.cs rename to Jellyfin.Server/Migrations/Routines/20251009200000_CleanMusicArtist.cs diff --git a/Jellyfin.Server/Migrations/Routines/MigrateLinkedChildren.cs b/Jellyfin.Server/Migrations/Routines/20260113120000_MigrateLinkedChildren.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/MigrateLinkedChildren.cs rename to Jellyfin.Server/Migrations/Routines/20260113120000_MigrateLinkedChildren.cs diff --git a/Jellyfin.Server/Migrations/Routines/CleanupOrphanedExtras.cs b/Jellyfin.Server/Migrations/Routines/20260113230000_CleanupOrphanedExtras.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/CleanupOrphanedExtras.cs rename to Jellyfin.Server/Migrations/Routines/20260113230000_CleanupOrphanedExtras.cs diff --git a/Jellyfin.Server/Migrations/Routines/FixIncorrectOwnerIdRelationships.cs b/Jellyfin.Server/Migrations/Routines/20260115120000_FixIncorrectOwnerIdRelationships.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/FixIncorrectOwnerIdRelationships.cs rename to Jellyfin.Server/Migrations/Routines/20260115120000_FixIncorrectOwnerIdRelationships.cs diff --git a/Jellyfin.Server/Migrations/Routines/FixLibrarySubtitleDownloadLanguages.cs b/Jellyfin.Server/Migrations/Routines/20260206200000_FixLibrarySubtitleDownloadLanguages.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/FixLibrarySubtitleDownloadLanguages.cs rename to Jellyfin.Server/Migrations/Routines/20260206200000_FixLibrarySubtitleDownloadLanguages.cs diff --git a/Jellyfin.Server/Migrations/Routines/MigrateRatingLevels.cs b/Jellyfin.Server/Migrations/Routines/20260302090000_MigrateRatingLevels.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/MigrateRatingLevels.cs rename to Jellyfin.Server/Migrations/Routines/20260302090000_MigrateRatingLevels.cs diff --git a/Jellyfin.Server/Migrations/Routines/MergeDuplicateMusicArtists.cs b/Jellyfin.Server/Migrations/Routines/20260508120000_MergeDuplicateMusicArtists.cs similarity index 100% rename from Jellyfin.Server/Migrations/Routines/MergeDuplicateMusicArtists.cs rename to Jellyfin.Server/Migrations/Routines/20260508120000_MergeDuplicateMusicArtists.cs diff --git a/Jellyfin.Server/Migrations/Routines/MergeDuplicatePeople.cs b/Jellyfin.Server/Migrations/Routines/20260508130000_MergeDuplicatePeople.cs similarity index 96% rename from Jellyfin.Server/Migrations/Routines/MergeDuplicatePeople.cs rename to Jellyfin.Server/Migrations/Routines/20260508130000_MergeDuplicatePeople.cs index d092555139..10433599fa 100644 --- a/Jellyfin.Server/Migrations/Routines/MergeDuplicatePeople.cs +++ b/Jellyfin.Server/Migrations/Routines/20260508130000_MergeDuplicatePeople.cs @@ -284,10 +284,16 @@ public class MergeDuplicatePeople : IAsyncMigrationRoutine return; } - await context.Peoples - .Where(p => idsToDelete.Contains(p.Id)) - .ExecuteDeleteAsync(cancellationToken) - .ConfigureAwait(false); + var idx = 0; + foreach (var item in idsToDelete.Chunk(200)) + { + idx++; // humans count at one + _logger.LogInformation("Remove batch {BatchNo}/{MaxBatches} duplicate Peoples.", idx, idsToDelete.Count / 200); + await context.Peoples + .Where(p => item.Contains(p.Id)) + .ExecuteDeleteAsync(cancellationToken) + .ConfigureAwait(false); + } _logger.LogInformation("Removed {Count} duplicate Peoples rows.", idsToDelete.Count); }