github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-24 06:55:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed format to MM/yyyy

Browse source
This commit is contained in:
Adam Worley 2020-10-08 13:28:48 +01:00
commit 0d17cbf4fe
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Ombi.Helpers/StringHelper.cs
View file

@ -97,12 +97,12 @@ namespace Ombi.Helpers
(int EpisodeNumber, DateTime? Aired) first = previousEpisodes.First();
(int EpisodeNumber, DateTime? Aired) last = previousEpisodes.Last();
epSb.Append($"{first.EpisodeNumber}-{last.EpisodeNumber}{(last.Aired.HasValue ? $" {last.Aired.Value:MM-yyyy}" : string.Empty)}, ");
epSb.Append($"{first.EpisodeNumber}-{last.EpisodeNumber}{(last.Aired.HasValue ? $" {last.Aired.Value:MM/yyyy}" : string.Empty)}, ");
}
else if (previousEpisodes.Count == 1)
{
(int EpisodeNumber, DateTime? Aired) = previousEpisodes.FirstOrDefault();
epSb.Append($"{EpisodeNumber}{(Aired.HasValue ? $" {Aired.Value:MM-yyyy}" : string.Empty)}, ");
epSb.Append($"{EpisodeNumber}{(Aired.HasValue ? $" {Aired.Value:MM/yyyy}" : string.Empty)}, ");
}
// New one
previousEpisodes.Clear();
@ -116,7 +116,7 @@ namespace Ombi.Helpers
// Got some left over
(int EpisodeNumber, DateTime? Aired) first = previousEpisodes.First();
(int EpisodeNumber, DateTime? Aired) last = previousEpisodes.Last();
epSb.Append($"{first.EpisodeNumber}-{last.EpisodeNumber}{(last.Aired.HasValue ? $" {last.Aired.Value:MM-yyyy}" : string.Empty)}");
epSb.Append($"{first.EpisodeNumber}-{last.EpisodeNumber}{(last.Aired.HasValue ? $" {last.Aired.Value:MM/yyyy}" : string.Empty)}");
}
else if (previousEpisodes.Count == 1)
{

10
src/Ombi.Schedule.Tests/NewsletterTests.cs
View file

@ -52,7 +52,7 @@ namespace Ombi.Schedule.Tests
(1, (DateTime?)null), }).Returns("1").SetName("Single episode date is null ");
yield return new TestCaseData(new List<(int, DateTime?)> {
(1, new DateTime(2020, 01, 01)), }).Returns("1 2020-01-01").SetName("Simple With Date Single episode");
(1, new DateTime(2020, 01, 01)), }).Returns("1 01/01/2020").SetName("Simple With Date Single episode");
yield return new TestCaseData(new List<(int, DateTime?)> {
(1, new DateTime(2020, 01, 01)),
@ -60,7 +60,7 @@ namespace Ombi.Schedule.Tests
(3, new DateTime(2020, 01, 03)),
(4, new DateTime(2020, 01, 04)),
(5, new DateTime(2020, 01, 05)),
(6, new DateTime(2020, 01, 06)) }).Returns("1-6 2020-01").SetName("Simple With Date 1-6");
(6, new DateTime(2020, 01, 06)) }).Returns("1-6 01/2020").SetName("Simple With Date 1-6");
yield return new TestCaseData(new List<(int, DateTime?)> {
(1, new DateTime(2020, 01, 01)),
@ -70,7 +70,7 @@ namespace Ombi.Schedule.Tests
(5, new DateTime(2020, 01, 05)),
(6, new DateTime(2020, 01, 06)),
(8, new DateTime(2020, 02, 08)),
(9, new DateTime(2020, 02, 09)),}).Returns("1-6 2020-01, 8-9 2020-02").SetName("Simple With Date 1-6, 8-9");
(9, new DateTime(2020, 02, 09)),}).Returns("1-6 01/2020, 8-9 02/2020").SetName("Simple With Date 1-6, 8-9");
yield return new TestCaseData(new List<(int, DateTime?)> {
(1, new DateTime(2020, 01, 01)),
@ -80,7 +80,7 @@ namespace Ombi.Schedule.Tests
(5, new DateTime(2020, 01, 05)),
(6, new DateTime(2020, 01, 06)),
(8, new DateTime(2020, 01, 08)),
(9, new DateTime(2020, 02, 09)),}).Returns("1-6 2020-01, 8-9 2020-02").SetName("Simple With Date 1-6, 8-9 overlapping month");
(9, new DateTime(2020, 02, 09)),}).Returns("1-6 01/2020, 8-9 02/2020").SetName("Simple With Date 1-6, 8-9 overlapping month");
yield return new TestCaseData(new List<(int, DateTime?)> {
@ -89,7 +89,7 @@ namespace Ombi.Schedule.Tests
(101, new DateTime(2020, 03, 15)),
(555, new DateTime(2020, 05, 04)),
(468, new DateTime(2020, 06, 05)),
(469, new DateTime(2020, 06, 12)) }).Returns("1 2020-01, 99 2020-02, 101 2020-03, 555 2020-05, 468-469 2020-06").SetName("More Complex with dates");
(469, new DateTime(2020, 06, 12)) }).Returns("1 01/2020, 99 02/2020, 101 03/2020, 555 05/2020, 468-469 06/2020").SetName("More Complex with dates");
}
}
}