pimhwang
/
ErsatzTV
mirror of https://github.com/ErsatzTV/ErsatzTV.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

more grouping fixes (#234) 

* more grouping fixes

* update changelog
pull/235/head
Jason Dove 4 years ago committed by GitHub
parent
442d73150e
commit
f8c986472a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 134 additions and 81 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      CHANGELOG.md
  2. 161
      ErsatzTV.Core.Tests/Scheduling/MultiPartEpisodeGrouperTests.cs
  3. 50
      ErsatzTV.Core/Scheduling/MultiPartEpisodeGrouper.cs

4
CHANGELOG.md
Unescape View File

@ -11,9 +11,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). @@ -11,9 +11,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Add unique id/provider id metadata, which will support future features
- Allow grouping multi-part episodes with titles ending in `Part X`, `Part Y`, etc.
### Changed
- Change home page link from release notes to full changelog
### Fixed
- Fix missing channel logos after restart
- Fix multi-part episode grouping with missing episodes/parts
- Fix grouping multi-part episodes in collections containing multiple shows
## [0.0.40-prealpha] - 2021-05-28
### Added

161
ErsatzTV.Core.Tests/Scheduling/MultiPartEpisodeGrouperTests.cs
Unescape View File

@ -1,8 +1,10 @@ @@ -1,8 +1,10 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using ErsatzTV.Core.Domain;
using ErsatzTV.Core.Scheduling;
using FluentAssertions;
using NUnit.Framework;
using static LanguageExt.Prelude;
namespace ErsatzTV.Core.Tests.Scheduling
{
@ -16,19 +18,18 @@ namespace ErsatzTV.Core.Tests.Scheduling @@ -16,19 +18,18 @@ namespace ErsatzTV.Core.Tests.Scheduling
{
var mediaItems = new List<MediaItem>
{
NamedEpisode(one),
NamedEpisode(two),
NamedEpisode(three),
NamedEpisode(four)
NamedEpisode(one, 1, 1, 1),
NamedEpisode(two, 1, 1, 2),
NamedEpisode(three, 1, 1, 3),
NamedEpisode(four, 1, 1, 4)
};
List<GroupedMediaItem> result = MultiPartEpisodeGrouper.GroupMediaItems(mediaItems);
result.Count.Should().Be(3);
result[0].First.Should().Be(mediaItems[0]);
result[1].First.Should().Be(mediaItems[1]);
result[1].Additional[0].Should().Be(mediaItems[2]);
result[2].First.Should().Be(mediaItems[3]);
ShouldHaveOneItem(result, mediaItems[0]);
ShouldHaveTwoItems(result, mediaItems[1], mediaItems[2]);
ShouldHaveOneItem(result, mediaItems[3]);
}
[Test]
@ -39,17 +40,16 @@ namespace ErsatzTV.Core.Tests.Scheduling @@ -39,17 +40,16 @@ namespace ErsatzTV.Core.Tests.Scheduling
{
var mediaItems = new List<MediaItem>
{
NamedEpisode(one),
NamedEpisode(two),
NamedEpisode(three)
NamedEpisode(one, 1, 1, 1),
NamedEpisode(two, 1, 1, 2),
NamedEpisode(three, 1, 1, 3)
};
List<GroupedMediaItem> result = MultiPartEpisodeGrouper.GroupMediaItems(mediaItems);
result.Count.Should().Be(2);
result[0].First.Should().Be(mediaItems[0]);
result[0].Additional[0].Should().Be(mediaItems[1]);
result[1].First.Should().Be(mediaItems[2]);
ShouldHaveTwoItems(result, mediaItems[0], mediaItems[1]);
ShouldHaveOneItem(result, mediaItems[2]);
}
[Test]
@ -65,21 +65,19 @@ namespace ErsatzTV.Core.Tests.Scheduling @@ -65,21 +65,19 @@ namespace ErsatzTV.Core.Tests.Scheduling
{
var mediaItems = new List<MediaItem>
{
NamedEpisode(one),
NamedEpisode(two),
NamedEpisode(three),
NamedEpisode(four),
NamedEpisode(five)
NamedEpisode(one, 1, 1, 1),
NamedEpisode(two, 1, 1, 2),
NamedEpisode(three, 1, 1, 3),
NamedEpisode(four, 1, 1, 4),
NamedEpisode(five, 1, 1, 5)
};
List<GroupedMediaItem> result = MultiPartEpisodeGrouper.GroupMediaItems(mediaItems);
result.Count.Should().Be(3);
result[0].First.Should().Be(mediaItems[0]);
result[0].Additional[0].Should().Be(mediaItems[1]);
result[1].First.Should().Be(mediaItems[2]);
result[2].First.Should().Be(mediaItems[3]);
result[2].Additional[0].Should().Be(mediaItems[4]);
ShouldHaveTwoItems(result, mediaItems[0], mediaItems[1]);
ShouldHaveOneItem(result, mediaItems[2]);
ShouldHaveTwoItems(result, mediaItems[3], mediaItems[4]);
}
[Test]
@ -90,19 +88,17 @@ namespace ErsatzTV.Core.Tests.Scheduling @@ -90,19 +88,17 @@ namespace ErsatzTV.Core.Tests.Scheduling
{
var mediaItems = new List<MediaItem>
{
NamedEpisode(one),
NamedEpisode(two),
NamedEpisode(three),
NamedEpisode(four)
NamedEpisode(one, 1, 1, 1),
NamedEpisode(two, 1, 1, 2),
NamedEpisode(three, 1, 1, 3),
NamedEpisode(four, 1, 1, 4)
};
List<GroupedMediaItem> result = MultiPartEpisodeGrouper.GroupMediaItems(mediaItems);
result.Count.Should().Be(2);
result[0].First.Should().Be(mediaItems[0]);
result[0].Additional[0].Should().Be(mediaItems[1]);
result[1].First.Should().Be(mediaItems[2]);
result[1].Additional[0].Should().Be(mediaItems[3]);
ShouldHaveTwoItems(result, mediaItems[0], mediaItems[1]);
ShouldHaveTwoItems(result, mediaItems[2], mediaItems[3]);
}
[Test]
@ -113,19 +109,18 @@ namespace ErsatzTV.Core.Tests.Scheduling @@ -113,19 +109,18 @@ namespace ErsatzTV.Core.Tests.Scheduling
{
var mediaItems = new List<MediaItem>
{
NamedEpisode(one),
NamedEpisode(two),
NamedEpisode(three),
NamedEpisode(four)
NamedEpisode(one, 1, 1, 1),
NamedEpisode(two, 1, 1, 2),
NamedEpisode(three, 1, 1, 3),
NamedEpisode(four, 1, 1, 4)
};
List<GroupedMediaItem> result = MultiPartEpisodeGrouper.GroupMediaItems(mediaItems);
result.Count.Should().Be(3);
result[0].First.Should().Be(mediaItems[0]);
result[1].First.Should().Be(mediaItems[1]);
result[2].First.Should().Be(mediaItems[2]);
result[2].Additional[0].Should().Be(mediaItems[3]);
ShouldHaveOneItem(result, mediaItems[0]);
ShouldHaveOneItem(result, mediaItems[1]);
ShouldHaveTwoItems(result, mediaItems[2], mediaItems[3]);
}
[Test]
@ -136,19 +131,19 @@ namespace ErsatzTV.Core.Tests.Scheduling @@ -136,19 +131,19 @@ namespace ErsatzTV.Core.Tests.Scheduling
{
var mediaItems = new List<MediaItem>
{
NamedEpisode(one),
NamedEpisode(two),
NamedEpisode(three),
NamedEpisode(four)
NamedEpisode(one, 1, 1, 1),
NamedEpisode(two, 1, 1, 3),
NamedEpisode(three, 1, 1, 4),
NamedEpisode(four, 1, 1, 5)
};
List<GroupedMediaItem> result = MultiPartEpisodeGrouper.GroupMediaItems(mediaItems);
result.Count.Should().Be(4);
result[0].First.Should().Be(mediaItems[0]);
result[1].First.Should().Be(mediaItems[1]);
result[2].First.Should().Be(mediaItems[2]);
result[3].First.Should().Be(mediaItems[3]);
ShouldHaveOneItem(result, mediaItems[0]);
ShouldHaveOneItem(result, mediaItems[1]);
ShouldHaveOneItem(result, mediaItems[2]);
ShouldHaveOneItem(result, mediaItems[3]);
}
[Test]
@ -159,28 +154,76 @@ namespace ErsatzTV.Core.Tests.Scheduling @@ -159,28 +154,76 @@ namespace ErsatzTV.Core.Tests.Scheduling
{
var mediaItems = new List<MediaItem>
{
NamedEpisode(one),
NamedEpisode(two),
NamedEpisode(three),
NamedEpisode(four)
NamedEpisode(one, 1, 1, 1),
NamedEpisode(two, 1, 1, 3),
NamedEpisode(three, 1, 1, 4),
NamedEpisode(four, 1, 1, 5)
};
List<GroupedMediaItem> result = MultiPartEpisodeGrouper.GroupMediaItems(mediaItems);
result.Count.Should().Be(3);
result[0].First.Should().Be(mediaItems[0]);
result[1].First.Should().Be(mediaItems[1]);
result[1].Additional[0].Should().Be(mediaItems[2]);
result[2].First.Should().Be(mediaItems[3]);
ShouldHaveOneItem(result, mediaItems[0]);
ShouldHaveTwoItems(result, mediaItems[1], mediaItems[2]);
ShouldHaveOneItem(result, mediaItems[3]);
}
private static Episode NamedEpisode(string title) =>
[Test]
[TestCase("S1 Episode 1 (1)", "S2 Episode 3 (1)", "S1 Episode 2 (2)", "S1 Episode 5")]
[TestCase(
"S1 Episode 1 (1) - More",
"S2 Episode 3 (1) - Title",
"S1 Episode 2 (2) - After",
"S1 Episode 5 - Dash")]
[TestCase("S1 Episode 1 Part 1", "S2 Episode 3 Part 1", "S1 Episode 2 Part 2", "S1 Episode 5")]
public void Mixed_Shows_Chronologically(string one, string two, string three, string four)
{
var mediaItems = new List<MediaItem>
{
NamedEpisode(one, 1, 1, 1, new DateTime(2020, 1, 1)),
NamedEpisode(two, 2, 1, 3, new DateTime(2020, 1, 2)),
NamedEpisode(three, 1, 1, 2, new DateTime(2020, 1, 3)),
NamedEpisode(four, 1, 1, 5, new DateTime(2020, 1, 4))
};
List<GroupedMediaItem> result = MultiPartEpisodeGrouper.GroupMediaItems(mediaItems);
result.Count.Should().Be(3);
ShouldHaveTwoItems(result, mediaItems[0], mediaItems[2]);
ShouldHaveOneItem(result, mediaItems[1]);
ShouldHaveOneItem(result, mediaItems[3]);
}
private static Episode NamedEpisode(
string title,
int showId,
int season,
int episode,
DateTime? releaseDate = null) =>
new()
{
EpisodeNumber = episode,
EpisodeMetadata = new List<EpisodeMetadata>
{
new() { Title = title }
new() { Title = title, ReleaseDate = releaseDate }
},
Season = new Season
{
SeasonNumber = season,
Show = new Show { Id = showId },
ShowId = showId
}
};
private static void ShouldHaveOneItem(IEnumerable<GroupedMediaItem> result, MediaItem item) =>
result.Filter(g => g.First == item && Optional(g.Additional).Flatten().HeadOrNone() == None)
.Should().HaveCount(1);
private static void ShouldHaveTwoItems(
IEnumerable<GroupedMediaItem> result,
MediaItem first,
MediaItem additional) =>
result.Filter(g => g.First == first && Optional(g.Additional).Flatten().HeadOrNone() == Some(additional))
.Should().HaveCount(1);
}
}

50
ErsatzTV.Core/Scheduling/MultiPartEpisodeGrouper.cs
Unescape View File

@ -11,28 +11,32 @@ namespace ErsatzTV.Core.Scheduling @@ -11,28 +11,32 @@ namespace ErsatzTV.Core.Scheduling
{
public static List<GroupedMediaItem> GroupMediaItems(IList<MediaItem> mediaItems)
{
var sortedMediaItems = mediaItems.OrderBy(identity, new ChronologicalMediaComparer()).ToList();
var episodes = mediaItems.OfType<Episode>().ToList();
var showIds = episodes.Map(e => e.Season.ShowId).Distinct().ToList();
var groups = new List<GroupedMediaItem>();
GroupedMediaItem group = null;
var lastNumber = 0;
void AddUngrouped(MediaItem item)
foreach (int showId in showIds)
{
if (group != null && lastNumber != 0)
var lastNumber = 0;
void AddUngrouped(MediaItem item)
{
groups.Add(group);
group = null;
lastNumber = 0;
}
if (group != null && lastNumber != 0)
{
groups.Add(group);
group = null;
lastNumber = 0;
}
groups.Add(new GroupedMediaItem(item, null));
}
groups.Add(new GroupedMediaItem(item, null));
}
foreach (MediaItem item in sortedMediaItems)
{
if (item is Episode e)
foreach (Episode episode in episodes.Filter(e => e.Season.ShowId == showId)
.OrderBy(identity, new ChronologicalMediaComparer()))
{
string numberString = FindPartNumber(e);
string numberString = FindPartNumber(episode);
if (numberString != null)
{
var number = int.Parse(numberString);
@ -48,13 +52,13 @@ namespace ErsatzTV.Core.Scheduling @@ -48,13 +52,13 @@ namespace ErsatzTV.Core.Scheduling
if (lastNumber == 0)
{
// start a new group
group = new GroupedMediaItem(item, null);
group = new GroupedMediaItem(episode, null);
}
else if (group != null)
{
// add to current group
List<MediaItem> additional = group.Additional ?? new List<MediaItem>();
additional.Add(item);
additional.Add(episode);
group = group with { Additional = additional };
}
else
@ -68,23 +72,25 @@ namespace ErsatzTV.Core.Scheduling @@ -68,23 +72,25 @@ namespace ErsatzTV.Core.Scheduling
}
else
{
AddUngrouped(item);
AddUngrouped(episode);
}
}
else
{
AddUngrouped(item);
AddUngrouped(episode);
}
}
else
if (group != null && lastNumber != 0)
{
groups.Add(new GroupedMediaItem(item, null));
groups.Add(group);
group = null;
}
}
if (group != null && lastNumber != 0)
foreach (MediaItem notEpisode in mediaItems.Filter(i => i is not Episode))
{
groups.Add(group);
groups.Add(new GroupedMediaItem(notEpisode, null));
}
return groups;

Write Preview
Loading…
Cancel
Save