Browse Source

update dependencies and fix languageext deprecation warnings (#460)

pull/461/head
Jason Dove 4 years ago committed by GitHub
parent
commit
0e789fd6d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      ErsatzTV.Application/Configuration/Commands/UpdateLibraryRefreshIntervalHandler.cs
  2. 2
      ErsatzTV.Application/Configuration/Commands/UpdatePlayoutDaysToBuildHandler.cs
  3. 2
      ErsatzTV.Application/Emby/Commands/SynchronizeEmbyLibrariesHandler.cs
  4. 2
      ErsatzTV.Application/Emby/Commands/SynchronizeEmbyLibraryByIdHandler.cs
  5. 2
      ErsatzTV.Application/HDHR/Commands/UpdateHDHRTunerCountHandler.cs
  6. 2
      ErsatzTV.Application/Jellyfin/Commands/SynchronizeJellyfinAdminUserIdHandler.cs
  7. 2
      ErsatzTV.Application/Jellyfin/Commands/SynchronizeJellyfinLibrariesHandler.cs
  8. 2
      ErsatzTV.Application/Jellyfin/Commands/SynchronizeJellyfinLibraryByIdHandler.cs
  9. 2
      ErsatzTV.Application/Libraries/Commands/CreateLocalLibraryPathHandler.cs
  10. 2
      ErsatzTV.Application/Libraries/Commands/LocalLibraryHandlerBase.cs
  11. 2
      ErsatzTV.Application/MediaCollections/Commands/CreateCollectionHandler.cs
  12. 2
      ErsatzTV.Application/MediaCollections/Commands/CreateMultiCollectionHandler.cs
  13. 2
      ErsatzTV.Application/MediaCollections/Commands/CreateSmartCollectionHandler.cs
  14. 2
      ErsatzTV.Application/MediaCollections/Commands/UpdateMultiCollectionHandler.cs
  15. 2
      ErsatzTV.Application/ProgramSchedules/Commands/CreateProgramScheduleHandler.cs
  16. 2
      ErsatzTV.Application/Streaming/Commands/StartFFmpegSessionHandler.cs
  17. 4
      ErsatzTV.Application/Streaming/Queries/GetPlayoutItemProcessByChannelNumberHandler.cs
  18. 6
      ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj
  19. 2
      ErsatzTV.Core/ErsatzTV.Core.csproj
  20. 2
      ErsatzTV.Core/Scheduling/PlayoutBuilder.cs
  21. 10
      ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj
  22. 2
      ErsatzTV.Infrastructure/Health/HealthCheckService.cs
  23. 8
      ErsatzTV/ErsatzTV.csproj

2
ErsatzTV.Application/Configuration/Commands/UpdateLibraryRefreshIntervalHandler.cs

@ -25,7 +25,7 @@ namespace ErsatzTV.Application.Configuration.Commands @@ -25,7 +25,7 @@ namespace ErsatzTV.Application.Configuration.Commands
private static Task<Validation<BaseError, Unit>> Validate(UpdateLibraryRefreshInterval request) =>
Optional(request.LibraryRefreshInterval)
.Filter(lri => lri > 0)
.Where(lri => lri > 0)
.Map(_ => Unit.Default)
.ToValidation<BaseError>("Tuner count must be greater than zero")
.AsTask();

2
ErsatzTV.Application/Configuration/Commands/UpdatePlayoutDaysToBuildHandler.cs

@ -58,7 +58,7 @@ namespace ErsatzTV.Application.Configuration.Commands @@ -58,7 +58,7 @@ namespace ErsatzTV.Application.Configuration.Commands
private static Task<Validation<BaseError, Unit>> Validate(UpdatePlayoutDaysToBuild request) =>
Optional(request.DaysToBuild)
.Filter(days => days > 0)
.Where(days => days > 0)
.Map(_ => Unit.Default)
.ToValidation<BaseError>("Days to build must be greater than zero")
.AsTask();

2
ErsatzTV.Application/Emby/Commands/SynchronizeEmbyLibrariesHandler.cs

@ -67,7 +67,7 @@ namespace ErsatzTV.Application.Emby.Commands @@ -67,7 +67,7 @@ namespace ErsatzTV.Application.Emby.Commands
{
EmbySecrets secrets = await _embySecretStore.ReadSecrets();
return Optional(secrets.Address == connectionParameters.ActiveConnection.Address)
.Filter(match => match)
.Where(match => match)
.Map(_ => connectionParameters with { ApiKey = secrets.ApiKey })
.ToValidation<BaseError>("Emby media source requires an api key");
}

2
ErsatzTV.Application/Emby/Commands/SynchronizeEmbyLibraryByIdHandler.cs

@ -142,7 +142,7 @@ namespace ErsatzTV.Application.Emby.Commands @@ -142,7 +142,7 @@ namespace ErsatzTV.Application.Emby.Commands
{
EmbySecrets secrets = await _embySecretStore.ReadSecrets();
return Optional(secrets.Address == connectionParameters.ActiveConnection.Address)
.Filter(match => match)
.Where(match => match)
.Map(_ => connectionParameters with { ApiKey = secrets.ApiKey })
.ToValidation<BaseError>("Emby media source requires an api key");
}

2
ErsatzTV.Application/HDHR/Commands/UpdateHDHRTunerCountHandler.cs

@ -24,7 +24,7 @@ namespace ErsatzTV.Application.HDHR.Commands @@ -24,7 +24,7 @@ namespace ErsatzTV.Application.HDHR.Commands
private static Task<Validation<BaseError, Unit>> Validate(UpdateHDHRTunerCount request) =>
Optional(request.TunerCount)
.Filter(tc => tc > 0)
.Where(tc => tc > 0)
.Map(_ => Unit.Default)
.ToValidation<BaseError>("Tuner count must be greater than zero")
.AsTask();

2
ErsatzTV.Application/Jellyfin/Commands/SynchronizeJellyfinAdminUserIdHandler.cs

@ -97,7 +97,7 @@ namespace ErsatzTV.Application.Jellyfin.Commands @@ -97,7 +97,7 @@ namespace ErsatzTV.Application.Jellyfin.Commands
{
JellyfinSecrets secrets = await _jellyfinSecretStore.ReadSecrets();
return Optional(secrets.Address == connectionParameters.ActiveConnection.Address)
.Filter(match => match)
.Where(match => match)
.Map(_ => connectionParameters with { ApiKey = secrets.ApiKey })
.ToValidation<BaseError>("Jellyfin media source requires an api key");
}

2
ErsatzTV.Application/Jellyfin/Commands/SynchronizeJellyfinLibrariesHandler.cs

@ -69,7 +69,7 @@ namespace ErsatzTV.Application.Jellyfin.Commands @@ -69,7 +69,7 @@ namespace ErsatzTV.Application.Jellyfin.Commands
{
JellyfinSecrets secrets = await _jellyfinSecretStore.ReadSecrets();
return Optional(secrets.Address == connectionParameters.ActiveConnection.Address)
.Filter(match => match)
.Where(match => match)
.Map(_ => connectionParameters with { ApiKey = secrets.ApiKey })
.ToValidation<BaseError>("Jellyfin media source requires an api key");
}

2
ErsatzTV.Application/Jellyfin/Commands/SynchronizeJellyfinLibraryByIdHandler.cs

@ -142,7 +142,7 @@ namespace ErsatzTV.Application.Jellyfin.Commands @@ -142,7 +142,7 @@ namespace ErsatzTV.Application.Jellyfin.Commands
{
JellyfinSecrets secrets = await _jellyfinSecretStore.ReadSecrets();
return Optional(secrets.Address == connectionParameters.ActiveConnection.Address)
.Filter(match => match)
.Where(match => match)
.Map(_ => connectionParameters with { ApiKey = secrets.ApiKey })
.ToValidation<BaseError>("Jellyfin media source requires an api key");
}

2
ErsatzTV.Application/Libraries/Commands/CreateLocalLibraryPathHandler.cs

@ -46,7 +46,7 @@ namespace ErsatzTV.Application.Libraries.Commands @@ -46,7 +46,7 @@ namespace ErsatzTV.Application.Libraries.Commands
.Map(list => list.Map(c => c.Path).ToList());
return Optional(request.Path)
.Filter(folder => allPaths.ForAll(f => !AreSubPaths(f, folder)))
.Where(folder => allPaths.ForAll(f => !AreSubPaths(f, folder)))
.ToValidation<BaseError>("Path must not belong to another library path");
}

2
ErsatzTV.Application/Libraries/Commands/LocalLibraryHandlerBase.cs

@ -33,7 +33,7 @@ namespace ErsatzTV.Application.Libraries.Commands @@ -33,7 +33,7 @@ namespace ErsatzTV.Application.Libraries.Commands
.Map(list => list.SelectMany(ll => ll.Paths).Map(lp => lp.Path).ToList());
return Optional(localLibrary.Paths.Count(folder => allPaths.Any(f => AreSubPaths(f, folder.Path))))
.Filter(length => length == 0)
.Where(length => length == 0)
.Map(_ => localLibrary)
.ToValidation<BaseError>("Path must not belong to another library path");
}

2
ErsatzTV.Application/MediaCollections/Commands/CreateCollectionHandler.cs

@ -60,7 +60,7 @@ namespace ErsatzTV.Application.MediaCollections.Commands @@ -60,7 +60,7 @@ namespace ErsatzTV.Application.MediaCollections.Commands
.Bind(_ => createCollection.NotLongerThan(50)(c => c.Name));
var result2 = Optional(createCollection.Name)
.Filter(name => !allNames.Contains(name))
.Where(name => !allNames.Contains(name))
.ToValidation<BaseError>("Collection name must be unique");
return (result1, result2).Apply((_, _) => createCollection.Name);

2
ErsatzTV.Application/MediaCollections/Commands/CreateMultiCollectionHandler.cs

@ -104,7 +104,7 @@ namespace ErsatzTV.Application.MediaCollections.Commands @@ -104,7 +104,7 @@ namespace ErsatzTV.Application.MediaCollections.Commands
.Bind(_ => createMultiCollection.NotLongerThan(50)(c => c.Name));
var result2 = Optional(createMultiCollection.Name)
.Filter(name => !allNames.Contains(name))
.Where(name => !allNames.Contains(name))
.ToValidation<BaseError>("MultiCollection name must be unique");
return (result1, result2).Apply((_, _) => createMultiCollection.Name);

2
ErsatzTV.Application/MediaCollections/Commands/CreateSmartCollectionHandler.cs

@ -61,7 +61,7 @@ namespace ErsatzTV.Application.MediaCollections.Commands @@ -61,7 +61,7 @@ namespace ErsatzTV.Application.MediaCollections.Commands
.Bind(_ => createSmartCollection.NotLongerThan(50)(c => c.Name));
var result2 = Optional(createSmartCollection.Name)
.Filter(name => !allNames.Contains(name))
.Where(name => !allNames.Contains(name))
.ToValidation<BaseError>("SmartCollection name must be unique");
return (result1, result2).Apply((_, _) => createSmartCollection.Name);

2
ErsatzTV.Application/MediaCollections/Commands/UpdateMultiCollectionHandler.cs

@ -156,7 +156,7 @@ namespace ErsatzTV.Application.MediaCollections.Commands @@ -156,7 +156,7 @@ namespace ErsatzTV.Application.MediaCollections.Commands
.Bind(_ => updateMultiCollection.NotLongerThan(50)(c => c.Name));
var result2 = Optional(updateMultiCollection.Name)
.Filter(name => !allNames.Contains(name))
.Where(name => !allNames.Contains(name))
.ToValidation<BaseError>("MultiCollection name must be unique");
return (result1, result2).Apply((_, _) => updateMultiCollection.Name);

2
ErsatzTV.Application/ProgramSchedules/Commands/CreateProgramScheduleHandler.cs

@ -65,7 +65,7 @@ namespace ErsatzTV.Application.ProgramSchedules.Commands @@ -65,7 +65,7 @@ namespace ErsatzTV.Application.ProgramSchedules.Commands
.CountAsync(ps => ps.Name == createProgramSchedule.Name);
var result2 = Optional(duplicateNameCount)
.Filter(count => count == 0)
.Where(count => count == 0)
.ToValidation<BaseError>("Schedule name must be unique");
return (result1, result2).Apply((_, _) => createProgramSchedule.Name);

2
ErsatzTV.Application/Streaming/Commands/StartFFmpegSessionHandler.cs

@ -83,7 +83,7 @@ namespace ErsatzTV.Application.Streaming.Commands @@ -83,7 +83,7 @@ namespace ErsatzTV.Application.Streaming.Commands
private Task<Validation<BaseError, Unit>> SessionMustBeInactive(StartFFmpegSession request)
{
var result = Optional(_ffmpegSegmenterService.SessionWorkers.TryAdd(request.ChannelNumber, null))
.Filter(success => success)
.Where(success => success)
.Map(_ => Unit.Default)
.ToValidation<BaseError>(new ChannelSessionAlreadyActive());

4
ErsatzTV.Application/Streaming/Queries/GetPlayoutItemProcessByChannelNumberHandler.cs

@ -152,7 +152,7 @@ namespace ErsatzTV.Application.Streaming.Queries @@ -152,7 +152,7 @@ namespace ErsatzTV.Application.Streaming.Queries
$"offline image is unavailable because transcoding is disabled in ffmpeg profile '{channel.FFmpegProfile.Name}'";
Option<TimeSpan> maybeDuration = await Optional(channel.FFmpegProfile.Transcode)
.Filter(transcode => transcode)
.Where(transcode => transcode)
.Match(
_ => dbContext.PlayoutItems
.Filter(pi => pi.Playout.ChannelId == channel.Id)
@ -260,7 +260,7 @@ namespace ErsatzTV.Application.Streaming.Queries @@ -260,7 +260,7 @@ namespace ErsatzTV.Application.Streaming.Queries
MediaItem item = items[new Random().Next(items.Count)];
Option<TimeSpan> maybeDuration = await Optional(channel.FFmpegProfile.Transcode)
.Filter(transcode => transcode)
.Where(transcode => transcode)
.Match(
_ => dbContext.PlayoutItems
.Filter(pi => pi.Playout.ChannelId == channel.Id)

6
ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj

@ -6,10 +6,10 @@ @@ -6,10 +6,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.1.0" />
<PackageReference Include="LanguageExt.Core" Version="3.4.15" />
<PackageReference Include="FluentAssertions" Version="6.2.0" />
<PackageReference Include="LanguageExt.Core" Version="4.0.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.0.63">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

2
ErsatzTV.Core/ErsatzTV.Core.csproj

@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
<ItemGroup>
<PackageReference Include="Flurl" Version="3.0.2" />
<PackageReference Include="LanguageExt.Core" Version="3.4.15" />
<PackageReference Include="LanguageExt.Core" Version="4.0.3" />
<PackageReference Include="MediatR" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />

2
ErsatzTV.Core/Scheduling/PlayoutBuilder.cs

@ -243,7 +243,7 @@ namespace ErsatzTV.Core.Scheduling @@ -243,7 +243,7 @@ namespace ErsatzTV.Core.Scheduling
_mediaCollectionRepository,
_televisionRepository,
_artistRepository,
collectionKey))).Sequence();
collectionKey))).SequenceParallel();
return Map.createRange(tuples);
}

10
ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj

@ -9,9 +9,9 @@ @@ -9,9 +9,9 @@
<ItemGroup>
<PackageReference Include="Dapper" Version="2.0.90" />
<PackageReference Include="Lucene.Net" Version="4.8.0-beta00014" />
<PackageReference Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00014" />
<PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00014" />
<PackageReference Include="Lucene.Net" Version="4.8.0-beta00015" />
<PackageReference Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00015" />
<PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00015" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.11">
<PrivateAssets>all</PrivateAssets>
@ -22,8 +22,8 @@ @@ -22,8 +22,8 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Refit" Version="6.0.94" />
<PackageReference Include="Refit.Newtonsoft.Json" Version="6.0.94" />
<PackageReference Include="Refit" Version="6.1.15" />
<PackageReference Include="Refit.Newtonsoft.Json" Version="6.1.15" />
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
</ItemGroup>

2
ErsatzTV.Infrastructure/Health/HealthCheckService.cs

@ -34,6 +34,6 @@ namespace ErsatzTV.Infrastructure.Health @@ -34,6 +34,6 @@ namespace ErsatzTV.Infrastructure.Health
}
public Task<List<HealthCheckResult>> PerformHealthChecks() =>
_checks.Map(c => c.Check()).Sequence().Map(results => results.ToList());
_checks.Map(c => c.Check()).SequenceParallel().Map(results => results.ToList());
}
}

8
ErsatzTV/ErsatzTV.csproj

@ -14,10 +14,10 @@ @@ -14,10 +14,10 @@
<ItemGroup>
<PackageReference Include="Blazored.LocalStorage" Version="4.1.5" />
<PackageReference Include="FluentValidation" Version="10.3.3" />
<PackageReference Include="FluentValidation.AspNetCore" Version="10.3.3" />
<PackageReference Include="FluentValidation" Version="10.3.4" />
<PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
<PackageReference Include="HtmlSanitizer" Version="6.0.441" />
<PackageReference Include="LanguageExt.Core" Version="3.4.15" />
<PackageReference Include="LanguageExt.Core" Version="4.0.3" />
<PackageReference Include="Markdig" Version="0.26.0" />
<PackageReference Include="MediatR.Courier.DependencyInjection" Version="3.0.1" />
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
<PackageReference Include="MudBlazor" Version="5.1.5" />
<PackageReference Include="NaturalSort.Extension" Version="3.1.0" />
<PackageReference Include="PPioli.FluentValidation.Blazor" Version="5.0.0" />
<PackageReference Include="Refit.HttpClientFactory" Version="6.0.94" />
<PackageReference Include="Refit.HttpClientFactory" Version="6.1.15" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" />

Loading…
Cancel
Save