Browse Source

first pass at refresh-all-metadata by source

pull/24/head
Jason Dove 6 years ago
parent
commit
eae8617178
  1. 2
      ErsatzTV.Application/MediaSources/Commands/ScanLocalMediaSource.cs
  2. 2
      ErsatzTV.Application/MediaSources/Commands/ScanLocalMediaSourceHandler.cs
  3. 2
      ErsatzTV.Core/Interfaces/Metadata/ILocalMediaScanner.cs
  4. 23
      ErsatzTV.Core/Metadata/LocalMediaScanner.cs
  5. 2
      ErsatzTV/Pages/LocalMediaSourceEditor.razor
  6. 2
      ErsatzTV/Services/SchedulerService.cs
  7. 19
      ErsatzTV/Shared/LocalMediaSources.razor

2
ErsatzTV.Application/MediaSources/Commands/ScanLocalMediaSource.cs

@ -4,6 +4,6 @@ using MediatR; @@ -4,6 +4,6 @@ using MediatR;
namespace ErsatzTV.Application.MediaSources.Commands
{
public record ScanLocalMediaSource(int MediaSourceId) : IRequest<Either<BaseError, string>>,
public record ScanLocalMediaSource(int MediaSourceId, bool RefreshAllMetadata) : IRequest<Either<BaseError, string>>,
IBackgroundServiceRequest;
}

2
ErsatzTV.Application/MediaSources/Commands/ScanLocalMediaSourceHandler.cs

@ -30,7 +30,7 @@ namespace ErsatzTV.Application.MediaSources.Commands @@ -30,7 +30,7 @@ namespace ErsatzTV.Application.MediaSources.Commands
Handle(ScanLocalMediaSource request, CancellationToken cancellationToken) =>
Validate(request)
.MapT(
p => _localMediaScanner.ScanLocalMediaSource(p.LocalMediaSource, p.FFprobePath)
p => _localMediaScanner.ScanLocalMediaSource(p.LocalMediaSource, p.FFprobePath, request.RefreshAllMetadata)
.Map(_ => p.LocalMediaSource.Folder))
.Bind(v => v.ToEitherAsync());

2
ErsatzTV.Core/Interfaces/Metadata/ILocalMediaScanner.cs

@ -6,6 +6,6 @@ namespace ErsatzTV.Core.Interfaces.Metadata @@ -6,6 +6,6 @@ namespace ErsatzTV.Core.Interfaces.Metadata
{
public interface ILocalMediaScanner
{
Task<Unit> ScanLocalMediaSource(LocalMediaSource localMediaSource, string ffprobePath);
Task<Unit> ScanLocalMediaSource(LocalMediaSource localMediaSource, string ffprobePath, bool refreshAllMetadata);
}
}

23
ErsatzTV.Core/Metadata/LocalMediaScanner.cs

@ -44,7 +44,10 @@ namespace ErsatzTV.Core.Metadata @@ -44,7 +44,10 @@ namespace ErsatzTV.Core.Metadata
_logger = logger;
}
public async Task<Unit> ScanLocalMediaSource(LocalMediaSource localMediaSource, string ffprobePath)
public async Task<Unit> ScanLocalMediaSource(
LocalMediaSource localMediaSource,
string ffprobePath,
bool refreshAllMetadata)
{
if (!Directory.Exists(localMediaSource.Folder))
{
@ -97,14 +100,16 @@ namespace ErsatzTV.Core.Metadata @@ -97,14 +100,16 @@ namespace ErsatzTV.Core.Metadata
// if exists, check if the file was modified
// also, try to re-categorize incorrect media types by refreshing metadata
Seq<MediaItem> modifiedMediaItems = existingMediaItems.Filter(
mediaItem =>
{
DateTime lastWrite = File.GetLastWriteTimeUtc(mediaItem.Path);
bool modified = lastWrite > mediaItem.LastWriteTime.IfNone(DateTime.MinValue);
return modified || mediaItem.Metadata == null ||
mediaItem.Metadata.MediaType != localMediaSource.MediaType;
});
Seq<MediaItem> modifiedMediaItems = refreshAllMetadata
? existingMediaItems
: existingMediaItems.Filter(
mediaItem =>
{
DateTime lastWrite = File.GetLastWriteTimeUtc(mediaItem.Path);
bool modified = lastWrite > mediaItem.LastWriteTime.IfNone(DateTime.MinValue);
return modified || mediaItem.Metadata == null ||
mediaItem.Metadata.MediaType != localMediaSource.MediaType;
});
modifiedPlayoutIds.AddRange(await _playoutRepository.GetPlayoutIdsForMediaItems(modifiedMediaItems));
foreach (MediaItem mediaItem in modifiedMediaItems)
{

2
ErsatzTV/Pages/LocalMediaSourceEditor.razor

@ -84,7 +84,7 @@ @@ -84,7 +84,7 @@
},
Right: async vm =>
{
await Channel.WriteAsync(new ScanLocalMediaSource(vm.Id));
await Channel.WriteAsync(new ScanLocalMediaSource(vm.Id, false));
NavigationManager.NavigateTo("/media/sources");
});
}

2
ErsatzTV/Services/SchedulerService.cs

@ -75,7 +75,7 @@ namespace ErsatzTV.Services @@ -75,7 +75,7 @@ namespace ErsatzTV.Services
foreach (int mediaSourceId in localMediaSourceIds)
{
await _channel.WriteAsync(new ScanLocalMediaSource(mediaSourceId), cancellationToken);
await _channel.WriteAsync(new ScanLocalMediaSource(mediaSourceId, false), cancellationToken);
}
}
}

19
ErsatzTV/Shared/LocalMediaSources.razor

@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
@using ErsatzTV.Application.MediaSources.Queries
@inject IDialogService Dialog
@inject IMediator Mediator
@inject ChannelWriter<IBackgroundServiceRequest> Channel
<MudTable Hover="true" Items="_mediaSources">
<ToolBarContent>
@ -10,7 +11,7 @@ @@ -10,7 +11,7 @@
</ToolBarContent>
<ColGroup>
<col/>
<col style="width: 60px;"/>
<col style="width: 120px;"/>
</ColGroup>
<HeaderContent>
<MudTh>Folder</MudTh>
@ -19,7 +20,14 @@ @@ -19,7 +20,14 @@
<RowTemplate>
<MudTd DataLabel="Folder">@context.Folder</MudTd>
<MudTd>
<MudIconButton Icon="@Icons.Material.Filled.Delete" OnClick="@(_ => DeleteMediaSource(context))"></MudIconButton>
<div style="display: flex">
<MudTooltip Text="Refresh All Metadata">
<MudIconButton Icon="@Icons.Material.Filled.Refresh" Disabled="@_refreshing" OnClick="@(_ => RefreshAllMetadata(context))"></MudIconButton>
</MudTooltip>
<MudTooltip Text="Delete Media Source">
<MudIconButton Icon="@Icons.Material.Filled.Delete" OnClick="@(_ => DeleteMediaSource(context))"></MudIconButton>
</MudTooltip>
</div>
</MudTd>
</RowTemplate>
</MudTable>
@ -29,6 +37,7 @@ @@ -29,6 +37,7 @@
@code {
private IList<LocalMediaSourceViewModel> _mediaSources;
private bool _refreshing = false;
protected override async Task OnParametersSetAsync() => await LoadMediaSources();
@ -57,4 +66,10 @@ @@ -57,4 +66,10 @@
}
}
private async Task RefreshAllMetadata(LocalMediaSourceViewModel mediaSource)
{
_refreshing = true;
await Channel.WriteAsync(new ScanLocalMediaSource(mediaSource.Id, true));
}
}
Loading…
Cancel
Save