New PlexMediaSourcesController (/api/media-sources/plex) P1-P8 wrapping
existing MediatR commands: state GET, pin-flow, sign-out, per-server
libraries/path-replacements GET+PUT, and refresh — VMs projected to the
S0 shared DTOs, ApiResults mapping, 404 controller pre-checks, #215-style
409 lock guards, [EndpointGroupName("general")].
Lock-lifecycle hardening (the tricky part):
- TryCompletePlexPinFlowHandler now releases the Plex lock ONLY on its
non-handoff exits (timeout-throw, poll exception, enqueue exception, the
dead return-false) via try/catch — NOT an unconditional finally. On
success the lock is handed off to SynchronizePlexMediaSources (the sole
releaser after discovery); a finally would double-release and release
before discovery, re-opening the finding-5 poll race. Fixes the latent
leak where an abandoned pin flow wedged Plex locked until restart.
- StartPlexPinFlow controller compensates UnlockPlex on the Left branch AND
any thrown dispatch/enqueue; only the Right/200 path holds the lock.
- SignOutOfPlexHandler wraps its work in try/finally { UnlockPlex() } — a
terminal handler with no handoff, so unconditional release is correct.
- Post-save library sync enqueues SynchronizePlexLibraryByIdIfNeeded
(Unlock:false) then SynchronizePlexNetworks (Unlock:true) — one lock, one
release on the last message, compensating-unlock if the 2nd enqueue throws
(corrects the Blazor Unlock-ordering bug, finding 6).
Data-integrity hardening:
- UpdatePlexPathReplacementsHandler rejects (422, no mutation) any positive
Id not owned by the route source, blank RemotePath/LocalPath, and null
list/items (findings 2c/8).
- MediaSourceRepository Plex path-replacement UPDATE gains
AND PlexMediaSourceId = @id (Jellyfin/Emby untouched — slice S3).
- ReplaceLibraryPreferences controller validates the id set against the
source's libraries (rejects unowned + Id=0), returns the reloaded list
(ids change on disable).
Tests (NUnit/Shouldly/NSubstitute), 34 new, all green: pin-flow lock
released on thrown-cancellation/poll-throw/enqueue-throw AND held on
success (no double-release); sign-out finally-release under a throwing
dependency; cross-source/nonblank/null path-replacement 422s; library-prefs
id-not-owned 422; post-save enqueue exact messages + Unlock flags; full
controller route/404/409/422 coverage.
Refs #202
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
91 lines
3.8 KiB
C#
91 lines
3.8 KiB
C#
using ErsatzTV.Core;
|
|
using ErsatzTV.Core.Domain;
|
|
using ErsatzTV.Core.Interfaces.Repositories;
|
|
|
|
namespace ErsatzTV.Application.Plex;
|
|
|
|
public class
|
|
UpdatePlexPathReplacementsHandler : IRequestHandler<UpdatePlexPathReplacements, Either<BaseError, Unit>>
|
|
{
|
|
private readonly IMediaSourceRepository _mediaSourceRepository;
|
|
|
|
public UpdatePlexPathReplacementsHandler(IMediaSourceRepository mediaSourceRepository) =>
|
|
_mediaSourceRepository = mediaSourceRepository;
|
|
|
|
public Task<Either<BaseError, Unit>> Handle(
|
|
UpdatePlexPathReplacements request,
|
|
CancellationToken cancellationToken) =>
|
|
Validate(request, cancellationToken)
|
|
.MapT(pms => MergePathReplacements(request, pms))
|
|
.Bind(v => v.ToEitherAsync());
|
|
|
|
private Task<Unit> MergePathReplacements(UpdatePlexPathReplacements request, PlexMediaSource plexMediaSource)
|
|
{
|
|
plexMediaSource.PathReplacements ??= [];
|
|
|
|
var incoming = request.PathReplacements.Map(Project).ToList();
|
|
|
|
var toAdd = incoming.Filter(r => r.Id < 1).ToList();
|
|
var toRemove = plexMediaSource.PathReplacements.Filter(r => incoming.All(pr => pr.Id != r.Id)).ToList();
|
|
var toUpdate = incoming.Except(toAdd).ToList();
|
|
|
|
return _mediaSourceRepository.UpdatePathReplacements(plexMediaSource.Id, toAdd, toUpdate, toRemove);
|
|
}
|
|
|
|
private static PlexPathReplacement Project(PlexPathReplacementItem vm) =>
|
|
new() { Id = vm.Id, PlexPath = vm.PlexPath, LocalPath = vm.LocalPath };
|
|
|
|
private async Task<Validation<BaseError, PlexMediaSource>> Validate(
|
|
UpdatePlexPathReplacements request,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
Option<PlexMediaSource> maybeSource =
|
|
await _mediaSourceRepository.GetPlex(request.PlexMediaSourceId, cancellationToken);
|
|
|
|
foreach (PlexMediaSource plexMediaSource in maybeSource)
|
|
{
|
|
return ValidatePathReplacements(request, plexMediaSource);
|
|
}
|
|
|
|
return Fail<BaseError, PlexMediaSource>(
|
|
BaseError.New($"Plex media source {request.PlexMediaSourceId} does not exist."));
|
|
}
|
|
|
|
// Programmatic clients now reach this handler directly (#202), so validate what the Blazor form
|
|
// enforced plus the cross-source ownership hole (finding 2c/8): reject a null list, null items,
|
|
// blank RemotePath/LocalPath, and any positive Id NOT owned by this source — all before any write,
|
|
// so there is no partial mutation.
|
|
private static Validation<BaseError, PlexMediaSource> ValidatePathReplacements(
|
|
UpdatePlexPathReplacements request,
|
|
PlexMediaSource plexMediaSource)
|
|
{
|
|
List<PlexPathReplacementItem> items = request.PathReplacements;
|
|
if (items is null)
|
|
{
|
|
return Fail<BaseError, PlexMediaSource>(BaseError.New("[PathReplacements] is required"));
|
|
}
|
|
|
|
if (items.Any(i => i is null))
|
|
{
|
|
return Fail<BaseError, PlexMediaSource>(BaseError.New("[PathReplacements] must not contain null items"));
|
|
}
|
|
|
|
if (items.Any(i => string.IsNullOrWhiteSpace(i.PlexPath) || string.IsNullOrWhiteSpace(i.LocalPath)))
|
|
{
|
|
return Fail<BaseError, PlexMediaSource>(
|
|
BaseError.New("Each path replacement requires a non-empty RemotePath and LocalPath"));
|
|
}
|
|
|
|
var ownedIds = Optional(plexMediaSource.PathReplacements).Flatten().Map(pr => pr.Id).ToHashSet();
|
|
List<int> foreignIds = items.Filter(i => i.Id > 0 && !ownedIds.Contains(i.Id)).Map(i => i.Id).ToList();
|
|
if (foreignIds.Count > 0)
|
|
{
|
|
return Fail<BaseError, PlexMediaSource>(
|
|
BaseError.New(
|
|
$"Path replacement {foreignIds[0]} does not belong to Plex media source {request.PlexMediaSourceId}"));
|
|
}
|
|
|
|
return Success<BaseError, PlexMediaSource>(plexMediaSource);
|
|
}
|
|
}
|