Closes the two F9 Libraries.razor parity gaps and normalizes scan-show error
mapping to ProblemDetails.
TASK 1 — library-wide deep scan:
- QueueLibraryScanByLibraryId gains optional `bool DeepScan = false`; handler
threads it into ForceSynchronize{Plex,Jellyfin,Emby}LibraryById.
- POST /api/libraries/{id}/scan?deep=false binds it via [FromQuery].
TASK 2 — external-collections scan (new endpoints):
- POST /api/media-sources/{plex|jellyfin|emby}/{id}/scan-collections?deep=false
acquires the per-source collections lock (§3b: lock IS the running scan → 409),
enqueues Synchronize{X}Collections(id, ForceScan:true, deep) to the scanner
channel, returns 202; compensating-unlock on enqueue throw.
TASK 3 — scan-show normalization:
- New QueueShowScanResult enum; handler returns it instead of bool.
- POST /api/libraries/{id}/scan-show now maps 202/404/409/422 (all errors
ProblemDetails) instead of 200/404/400-anonymous-object.
- Updated the lone Blazor caller (TelevisionSeasonList.razor).
Tests: LibrariesController (scan deep=true, scan-show enum→status), the three
media-source controllers (scan-collections route/404/409/202/compensating-unlock),
and handler tests for both changed handlers (deep threading + show-scan outcomes).
Docs: api-conventions §3b exemplar + blazor-route-parity §5 F9 gate.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
105 lines
4.3 KiB
C#
105 lines
4.3 KiB
C#
using System.Threading.Channels;
|
|
using ErsatzTV.Application.Emby;
|
|
using ErsatzTV.Application.Jellyfin;
|
|
using ErsatzTV.Application.MediaSources;
|
|
using ErsatzTV.Application.Plex;
|
|
using ErsatzTV.Core.Domain;
|
|
using ErsatzTV.Core.Interfaces.Locking;
|
|
using ErsatzTV.Infrastructure.Data;
|
|
using ErsatzTV.Infrastructure.Extensions;
|
|
using Microsoft.EntityFrameworkCore;
|
|
using Microsoft.Extensions.Logging;
|
|
|
|
namespace ErsatzTV.Application.Libraries;
|
|
|
|
public class QueueLibraryScanByLibraryIdHandler(
|
|
IDbContextFactory<TvContext> dbContextFactory,
|
|
IEntityLocker locker,
|
|
ChannelWriter<IScannerBackgroundServiceRequest> scannerWorker,
|
|
ILogger<QueueLibraryScanByLibraryIdHandler> logger)
|
|
: IRequestHandler<QueueLibraryScanByLibraryId, QueueLibraryScanResult>
|
|
{
|
|
public async Task<QueueLibraryScanResult> Handle(
|
|
QueueLibraryScanByLibraryId request,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
await using TvContext dbContext = await dbContextFactory.CreateDbContextAsync(cancellationToken);
|
|
|
|
Option<Library> maybeLibrary = await dbContext.Libraries
|
|
.AsNoTracking()
|
|
.SelectOneAsync(l => l.Id, l => l.Id == request.LibraryId, cancellationToken);
|
|
|
|
foreach (Library library in maybeLibrary)
|
|
{
|
|
bool shouldSyncItems = library switch
|
|
{
|
|
PlexLibrary plexLibrary => plexLibrary.ShouldSyncItems,
|
|
JellyfinLibrary jellyfinLibrary => jellyfinLibrary.ShouldSyncItems,
|
|
EmbyLibrary embyLibrary => embyLibrary.ShouldSyncItems,
|
|
_ => true
|
|
};
|
|
|
|
if (!shouldSyncItems)
|
|
{
|
|
logger.LogWarning("Library sync is disabled for library id {Id}", library.Id);
|
|
return QueueLibraryScanResult.SyncDisabled;
|
|
}
|
|
|
|
// A true from LockLibrary confers ownership of exactly one release; a false means a scan
|
|
// is already in progress and we own no release.
|
|
if (!locker.LockLibrary(library.Id))
|
|
{
|
|
return QueueLibraryScanResult.AlreadyScanning;
|
|
}
|
|
|
|
try
|
|
{
|
|
logger.LogDebug("Queued library scan for library id {Id}", library.Id);
|
|
|
|
switch (library)
|
|
{
|
|
case LocalLibrary:
|
|
await scannerWorker.WriteAsync(new ForceScanLocalLibrary(library.Id), cancellationToken);
|
|
break;
|
|
case PlexLibrary:
|
|
await scannerWorker.WriteAsync(
|
|
new SynchronizePlexLibraries(library.MediaSourceId),
|
|
cancellationToken);
|
|
await scannerWorker.WriteAsync(
|
|
new ForceSynchronizePlexLibraryById(library.Id, request.DeepScan),
|
|
cancellationToken);
|
|
break;
|
|
case JellyfinLibrary:
|
|
await scannerWorker.WriteAsync(
|
|
new SynchronizeJellyfinLibraries(library.MediaSourceId),
|
|
cancellationToken);
|
|
await scannerWorker.WriteAsync(
|
|
new ForceSynchronizeJellyfinLibraryById(library.Id, request.DeepScan),
|
|
cancellationToken);
|
|
break;
|
|
case EmbyLibrary:
|
|
await scannerWorker.WriteAsync(
|
|
new SynchronizeEmbyLibraries(library.MediaSourceId),
|
|
cancellationToken);
|
|
await scannerWorker.WriteAsync(
|
|
new ForceSynchronizeEmbyLibraryById(library.Id, request.DeepScan),
|
|
cancellationToken);
|
|
break;
|
|
}
|
|
}
|
|
catch
|
|
{
|
|
// the scanner only unlocks when it receives the message; if enqueueing fails
|
|
// (e.g. request aborted / channel completed) after we acquired the lock, release
|
|
// it here or it is held forever (EnqueueWithTraktLock pattern).
|
|
locker.UnlockLibrary(library.Id);
|
|
throw;
|
|
}
|
|
|
|
return QueueLibraryScanResult.Queued;
|
|
}
|
|
|
|
return QueueLibraryScanResult.NotFound;
|
|
}
|
|
}
|