mirror/Lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/Lidarr synced 2025-01-31 11:22:06 +00:00
Code Issues Releases Wiki Activity

ParseSeriesName will now return normalized version of the title if it doesn't match any predefined

Browse source 
PostDownload provider will skip subfolders that are known series folders.
This commit is contained in:
kay.one 2011-12-10 10:54:16 -08:00
parent f5a8c3de87
commit e269494ff8
6 changed files with 54 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
View file

@ -115,7 +115,7 @@
<Compile Include="ProviderTests\DiskProviderTests\ExtractArchiveFixture.cs" />
<Compile Include="ProviderTests\PostDownloadProviderTests\PostDownloadProviderFixture.cs" />
<Compile Include="JobTests\SearchJobTest.cs" />
<Compile Include="ProviderTests\PostDownloadProviderTests\ProcessDownloadFixture.cs" />
<Compile Include="ProviderTests\PostDownloadProviderTests\ProcessDownloadProviderFixture.cs" />
<Compile Include="ProviderTests\JobProviderTests\TestJobs.cs" />
<Compile Include="JobTests\AppUpdateJobFixture.cs" />
<Compile Include="ProviderTests\UpdateProviderTests\GetUpdateLogFixture.cs" />

3
NzbDrone.Core.Test/ParserTest.cs
View file

@ -288,9 +288,10 @@ public void Normalize_not_removed_common_words_in_the_middle(string word)
[TestCase("Chuck - 4x05 - Title", "Chuck")]
[TestCase("Law & Order - 4x05 - Title", "laworder")]
[TestCase("This Isn't a Valid Post", "")]
[TestCase("Bad Format", "badformat")]
[TestCase("Mad Men - Season 1 [Bluray720p]", "madmen")]
[TestCase("Mad Men - Season 1 [Bluray1080p]", "madmen")]
[TestCase("The Daily Show With Jon Stewart -", "dailyshowwithjonstewart")]
public void parse_series_name(string postTitle, string title)
{
var result = Parser.ParseSeriesName(postTitle);

42
NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessDownloadFixture.cs → NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessDownloadProviderFixture.cs
View file

@ -10,7 +10,6 @@
using NzbDrone.Common;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;
@ -19,7 +18,7 @@
namespace NzbDrone.Core.Test.ProviderTests.PostDownloadProviderTests
{
[TestFixture]
public class ProcessDownloadFixture : CoreTest
public class ProcessDownloadProviderFixture : CoreTest
{
[Test]
public void should_skip_if_folder_is_tagged_and_too_fresh()
@ -245,5 +244,44 @@ public void all_imported_files_should_be_moved()
Times.Exactly(fakeEpisodeFiles.Count));
mocker.VerifyAllMocks();
}
[Test]
public void ProcessDropFolder_should_only_process_folders_that_arent_known_series_folders()
{
var subFolders = new List<string>
{
@"c:\drop\episode1",
@"c:\drop\episode2",
@"c:\drop\episode3",
@"c:\drop\episode4"
};
Mocker.GetMock<DiskProvider>()
.Setup(c => c.GetDirectories(It.IsAny<String>()))
.Returns(subFolders);
Mocker.GetMock<SeriesProvider>()
.Setup(c => c.SeriesPathExists(subFolders[1]))
.Returns(true);
Mocker.GetMock<SeriesProvider>()
.Setup(c => c.FindSeries(It.IsAny<String>()))
.Returns(new Series());
Mocker.GetMock<DiskScanProvider>()
.Setup(c => c.Scan(It.IsAny<Series>(), It.IsAny<String>()))
.Returns(new List<EpisodeFile>());
//Act
Mocker.Resolve<PostDownloadProvider>().ProcessDropFolder(@"C:\drop\");
//Assert
Mocker.GetMock<DiskScanProvider>().Verify(c => c.Scan(It.IsAny<Series>(), subFolders[0]), Times.Once());
Mocker.GetMock<DiskScanProvider>().Verify(c => c.Scan(It.IsAny<Series>(), subFolders[1]), Times.Never());
Mocker.GetMock<DiskScanProvider>().Verify(c => c.Scan(It.IsAny<Series>(), subFolders[2]), Times.Once());
Mocker.GetMock<DiskScanProvider>().Verify(c => c.Scan(It.IsAny<Series>(), subFolders[3]), Times.Once());
}
}
}

11
NzbDrone.Core/Parser.cs
View file

@ -96,7 +96,7 @@ internal static EpisodeParseResult ParseTitle(string title)
{
//Check if episode is in the future (most likley a parse error)
if (result.AirDate > DateTime.Now.AddDays(1).Date)
break;
break;
result.Language = ParseLanguage(title);
result.Quality = ParseQuality(title);
@ -185,12 +185,7 @@ private static EpisodeParseResult ParseMatchCollection(MatchCollection matchColl
return parsedEpisode;
}
/// <summary>
/// Parses a post title to find the series that relates to it
/// </summary>
/// <param name = "title">Title of the report</param>
/// <returns>Normalized Series Name</returns>
internal static string ParseSeriesName(string title)
public static string ParseSeriesName(string title)
{
Logger.Trace("Parsing string '{0}'", title);
@ -207,7 +202,7 @@ internal static string ParseSeriesName(string title)
}
}
return String.Empty;
return NormalizeTitle(title);
}
internal static Quality ParseQuality(string name)

5
NzbDrone.Core/Providers/PostDownloadProvider.cs
View file

@ -36,7 +36,10 @@ public virtual void ProcessDropFolder(string dropFolder)
{
try
{
ProcessDownload(new DirectoryInfo(subfolder));
if (!_seriesProvider.SeriesPathExists(subfolder))
{
ProcessDownload(new DirectoryInfo(subfolder));
}
}
catch (Exception e)
{

8
NzbDrone.Core/Providers/SeriesProvider.cs
View file

@ -3,6 +3,7 @@
using System.Linq;
using System.Text.RegularExpressions;
using NLog;
using NzbDrone.Common;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Repository.Quality;
@ -176,12 +177,11 @@ public virtual void DeleteSeries(int seriesId)
}
}
public virtual bool SeriesPathExists(string cleanPath)
public virtual bool SeriesPathExists(string path)
{
if (GetAllSeries().Any(s => s.Path.ToLower() == cleanPath.ToLower()))
return true;
var normilizedPath = path.NormalizePath();
return false;
return GetAllSeries().Any(s => s.Path.NormalizePath() == normilizedPath);
}
public virtual List<Series> SearchForSeries(string title)