Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some tests, fix some minor issues

This commit is contained in:
Jendrik Weise 2023-08-27 07:09:03 +02:00
parent 44ae0d5410
commit e67c64536d
3 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/NzbDrone.Core.Test/ParserTests/LanguageParserFixture.cs
View File

@ -1,8 +1,12 @@
using System;
using FluentAssertions; using FluentAssertions;
using NUnit.Framework; using NUnit.Framework;
using NzbDrone.Core.Datastore;
using NzbDrone.Core.Languages; using NzbDrone.Core.Languages;
using NzbDrone.Core.MediaFiles;
using NzbDrone.Core.Parser; using NzbDrone.Core.Parser;
using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Tv;
namespace NzbDrone.Core.Test.ParserTests namespace NzbDrone.Core.Test.ParserTests
{ {
@ -428,5 +432,37 @@ namespace NzbDrone.Core.Test.ParserTests
result.Languages.Should().Contain(Language.Original); result.Languages.Should().Contain(Language.Original);
result.Languages.Should().Contain(Language.English); result.Languages.Should().Contain(Language.English);
} }
[TestCase("Name (2020) - S01E20 - [AAC 2.0].testtitle.default.forced.ass", "Name (2020)/Season 1/Name (2020) - S01E20 - [AAC 2.0].mkv")]
[TestCase("Name (2020) - S01E20 - [AAC 2.0].default.testtitle.forced.ass", "Name (2020)/Season 1/Name (2020) - S01E20 - [AAC 2.0].mkv")]
[TestCase("Name (2020) - S01E20 - [AAC 2.0].default.testtitle.forced.ass", "Name (2020)/Season 1/Name (2020).mkv")]
public void should_parse_title_and_tags(string postTitle, string episodeFilePath)
{
var episode = new Episode
{
EpisodeFile = new LazyLoaded<EpisodeFile>(new EpisodeFile
{
RelativePath = episodeFilePath
})
};
var (languageTags, title) = LanguageParser.ParseLanguageTagsAndTitle(postTitle, episode);
languageTags.Should().BeEquivalentTo(new[] { "default", "forced" });
title.Should().BeEquivalentTo("testtitle");
}
[TestCase("Name (2020) - S01E20 - [AAC 2.0].default.forced.ass", "Name (2020)/Season 1/Name (2020) - S01E20 - [AAC 2.0].mkv")]
[TestCase("Name (2020) - S01E20 - [AAC 2.0].default.ass", "Name (2020)/Season 1/Name (2020) - S01E20 - [AAC 2.0].mkv")]
[TestCase("Name (2020) - S01E20 - [AAC 2.0].ass", "Name (2020)/Season 1/Name (2020) - S01E20 - [AAC 2.0].mkv")]
public void should_not_parse_false_title(string postTitle, string episodeFilePath)
{
var episode = new Episode
{
EpisodeFile = new LazyLoaded<EpisodeFile>(new EpisodeFile
{
RelativePath = episodeFilePath
})
};
Assert.Throws<ArgumentException>(() => LanguageParser.ParseLanguageTagsAndTitle(postTitle, episode));
}
} }
} }

1
src/NzbDrone.Core/Extras/Subtitles/SubtitleService.cs
View File

@ -243,7 +243,6 @@ namespace NzbDrone.Core.Extras.Subtitles
suffixBuilder.Append(" - "); suffixBuilder.Append(" - ");
suffixBuilder.Append(copy); suffixBuilder.Append(copy);
} }
} }
else if (multipleCopies) else if (multipleCopies)
{ {

2
src/NzbDrone.Core/Parser/LanguageParser.cs
View File

@ -31,7 +31,7 @@ namespace NzbDrone.Core.Parser
private static readonly Regex SubtitleLanguageRegex = new Regex(".+?([-_. ]((?<iso_code>[a-z]{2,3})|(?<tags>full|forced|foreign|default|cc|psdh|sdh)))*$", RegexOptions.Compiled | RegexOptions.IgnoreCase); private static readonly Regex SubtitleLanguageRegex = new Regex(".+?([-_. ]((?<iso_code>[a-z]{2,3})|(?<tags>full|forced|foreign|default|cc|psdh|sdh)))*$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
private static readonly Regex SubtitleLanguageTitleRegex = new Regex(".+?(\\.((?<iso_code>[a-z]{2,3})|(?<tags1>full|forced|foreign|default|cc|psdh|sdh)))*(\\.(?<title>[^.]*))??(\\.((?<iso_code>[a-z]{2,3})|(?<tags2>full|forced|foreign|default|cc|psdh|sdh)))*$", RegexOptions.Compiled | RegexOptions.IgnoreCase); private static readonly Regex SubtitleLanguageTitleRegex = new Regex(".+?(\\.((?<iso_code>[a-z]{2,3})|(?<tags1>full|forced|foreign|default|cc|psdh|sdh)))*\\.(?<title>[^.]*)(\\.((?<iso_code>[a-z]{2,3})|(?<tags2>full|forced|foreign|default|cc|psdh|sdh)))*$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
public static List<Language> ParseLanguages(string title) public static List<Language> ParseLanguages(string title)
{ {