self-hosted/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-12-14 11:23:42 +02:00
Code Issues Releases Activity

Limit replacement of colons

Browse Source
This commit is contained in:
Mark McDowall 2019-03-05 18:08:34 -08:00
parent 7b5e8646eb
commit de7e805718
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs
View File

@ -291,7 +291,7 @@ public void deleted_history_item_should_be_ignored()
Subject.GetItems().Should().BeEmpty(); Subject.GetItems().Should().BeEmpty();
} }
[TestCase("[ TOWN ]-[ http://www.town.ag ]-[ ANIME ]-[Usenet Provider >> http://www.ssl- <<] - [Commie] Aldnoah Zero 18 [234C8FC7]", "[ TOWN ]-[ http -++www.town.ag ]-[ ANIME ]-[Usenet Provider http -++www.ssl- ] - [Commie] Aldnoah Zero 18 [234C8FC7].nzb")] [TestCase("[ TOWN ]-[ http://www.town.ag ]-[ ANIME ]-[Usenet Provider >> http://www.ssl- <<] - [Commie] Aldnoah Zero 18 [234C8FC7]", "[ TOWN ]-[ http-++www.town.ag ]-[ ANIME ]-[Usenet Provider http-++www.ssl- ] - [Commie] Aldnoah Zero 18 [234C8FC7].nzb")]
public void Download_should_use_clean_title(string title, string filename) public void Download_should_use_clean_title(string title, string filename)
{ {
GivenSuccessfulDownload(); GivenSuccessfulDownload();

1
src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/ReplaceCharacterFixure.cs
View File

@ -52,6 +52,7 @@ public void Setup()
[TestCase("CSI: Crime Scene Investigation", "CSI - Crime Scene Investigation")] [TestCase("CSI: Crime Scene Investigation", "CSI - Crime Scene Investigation")]
[TestCase("Code:Breaker", "Code-Breaker")]
[TestCase("Back Slash\\", "Back Slash+")] [TestCase("Back Slash\\", "Back Slash+")]
[TestCase("Forward Slash\\", "Forward Slash+")] [TestCase("Forward Slash\\", "Forward Slash+")]
[TestCase("Greater Than>", "Greater Than")] [TestCase("Greater Than>", "Greater Than")]

8
src/NzbDrone.Core/Organizer/FileNameBuilder.cs
View File

@ -299,7 +299,13 @@ public static string CleanFileName(string name, bool replace = true)
{ {
string result = name; string result = name;
string[] badCharacters = { "\\", "/", "<", ">", "?", "*", ":", "|", "\"" }; string[] badCharacters = { "\\", "/", "<", ">", "?", "*", ":", "|", "\"" };
string[] goodCharacters = { "+", "+", "", "", "!", "-", " -", "", "" }; string[] goodCharacters = { "+", "+", "", "", "!", "-", "-", "", "" };
// Replace a colon followed by a space with space dash space for a better appearance
if (replace)
{
result = result.Replace(": ", " - ");
}
for (int i = 0; i < badCharacters.Length; i++) for (int i = 0; i < badCharacters.Length; i++)
{ {

4
src/NzbDrone.Core/Profiles/Releases/TermMatchers/CaseInsensitiveTermMatcher.cs
View File

@ -2,10 +2,12 @@
{ {
public sealed class CaseInsensitiveTermMatcher : ITermMatcher public sealed class CaseInsensitiveTermMatcher : ITermMatcher
{ {
private readonly string _originalTerm;
private readonly string _term; private readonly string _term;
public CaseInsensitiveTermMatcher(string term) public CaseInsensitiveTermMatcher(string term)
{ {
_originalTerm = term;
_term = term.ToLowerInvariant(); _term = term.ToLowerInvariant();
} }
@ -18,7 +20,7 @@ public string MatchingTerm(string value)
{ {
if (value.ToLowerInvariant().Contains(_term)) if (value.ToLowerInvariant().Contains(_term))
{ {
return _term; return _originalTerm;
} }
return null; return null;