Browse Source

fix epg sorting (#863)

* fix epg sorting

* update dependencies
pull/865/head
Jason Dove 3 years ago committed by GitHub
parent
commit
100eb14408
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      CHANGELOG.md
  2. 2
      ErsatzTV.Application/ErsatzTV.Application.csproj
  3. 4
      ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj
  4. 6
      ErsatzTV.Core/ErsatzTV.Core.csproj
  5. 3
      ErsatzTV.Core/Iptv/ChannelGuide.cs
  6. 2
      ErsatzTV.FFmpeg/ErsatzTV.FFmpeg.csproj
  7. 4
      ErsatzTV/ErsatzTV.csproj

1
CHANGELOG.md

@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). @@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Fix content repeating for up to a minute near the top of every hour
- Check whether hardware-accelerated hevc codecs are supported by the NVIDIA card
- Software codecs will be used if they are unsupported by the NVIDIA card
- Fix sorting of channel contents in EPG
### Changed
- Regularly delete old segments from transcode folder while content is actively transcoding

2
ErsatzTV.Application/ErsatzTV.Application.csproj

@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Bugsnag" Version="3.0.1" />
<PackageReference Include="Bugsnag" Version="3.1.0" />
<PackageReference Include="CliWrap" Version="3.4.4" />
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
<PackageReference Include="MediatR" Version="10.0.1" />

4
ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj

@ -7,10 +7,10 @@ @@ -7,10 +7,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Bugsnag" Version="3.0.1" />
<PackageReference Include="Bugsnag" Version="3.1.0" />
<PackageReference Include="CliWrap" Version="3.4.4" />
<PackageReference Include="FluentAssertions" Version="6.7.0" />
<PackageReference Include="LanguageExt.Core" Version="4.2.2" />
<PackageReference Include="LanguageExt.Core" Version="4.2.7" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />

6
ErsatzTV.Core/ErsatzTV.Core.csproj

@ -7,11 +7,11 @@ @@ -7,11 +7,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Bugsnag" Version="3.0.1" />
<PackageReference Include="Bugsnag" Version="3.1.0" />
<PackageReference Include="Destructurama.Attributed" Version="3.0.0" />
<PackageReference Include="Flurl" Version="3.0.6" />
<PackageReference Include="LanguageExt.Core" Version="4.2.2" />
<PackageReference Include="LanguageExt.Transformers" Version="4.2.2" />
<PackageReference Include="LanguageExt.Core" Version="4.2.7" />
<PackageReference Include="LanguageExt.Transformers" Version="4.2.7" />
<PackageReference Include="MediatR" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />

3
ErsatzTV.Core/Iptv/ChannelGuide.cs

@ -76,7 +76,8 @@ public class ChannelGuide @@ -76,7 +76,8 @@ public class ChannelGuide
}
}
foreach ((Channel channel, List<PlayoutItem> sorted) in sortedChannelItems.OrderBy(kvp => kvp.Key.Number))
foreach ((Channel channel, List<PlayoutItem> sorted) in sortedChannelItems.OrderBy(
kvp => decimal.Parse(kvp.Key.Number)))
{
var i = 0;
while (i < sorted.Count && sorted[i].FillerKind != FillerKind.None &&

2
ErsatzTV.FFmpeg/ErsatzTV.FFmpeg.csproj

@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
<ItemGroup>
<PackageReference Include="CliWrap" Version="3.4.4" />
<PackageReference Include="LanguageExt.Core" Version="4.2.2" />
<PackageReference Include="LanguageExt.Core" Version="4.2.7" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
</ItemGroup>

4
ErsatzTV/ErsatzTV.csproj

@ -54,11 +54,11 @@ @@ -54,11 +54,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Bugsnag.AspNet.Core" Version="3.0.1" />
<PackageReference Include="Bugsnag.AspNet.Core" Version="3.1.0" />
<PackageReference Include="FluentValidation" Version="11.0.3" />
<PackageReference Include="FluentValidation.AspNetCore" Version="11.0.3" />
<PackageReference Include="HtmlSanitizer" Version="7.1.512" />
<PackageReference Include="LanguageExt.Core" Version="4.2.2" />
<PackageReference Include="LanguageExt.Core" Version="4.2.7" />
<PackageReference Include="Markdig" Version="0.30.2" />
<PackageReference Include="MediatR.Courier.DependencyInjection" Version="5.0.0" />
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="10.0.1" />

Loading…
Cancel
Save