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

Renamed Quality to QualityModel

This commit is contained in:
Mark McDowall 2012-10-13 14:15:21 -07:00
parent 410b4574bc
commit 49f086cf19
24 changed files with 110 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
NzbDrone.Core.Test/EpisodeParseResultTest.cs
View File

@ -21,7 +21,7 @@ namespace NzbDrone.Core.Test
parseResult.EpisodeNumbers = new List<int> { 3 }; parseResult.EpisodeNumbers = new List<int> { 3 };
parseResult.FullSeason = false; parseResult.FullSeason = false;
parseResult.AirDate = null; parseResult.AirDate = null;
parseResult.Quality = new Quality(QualityTypes.HDTV, false); parseResult.Quality = new QualityModel(QualityTypes.HDTV, false);
parseResult.ToString().Should().Be("My Series - S12E03 HDTV"); parseResult.ToString().Should().Be("My Series - S12E03 HDTV");
@ -36,7 +36,7 @@ namespace NzbDrone.Core.Test
parseResult.EpisodeNumbers = new List<int> { 3 }; parseResult.EpisodeNumbers = new List<int> { 3 };
parseResult.FullSeason = false; parseResult.FullSeason = false;
parseResult.AirDate = null; parseResult.AirDate = null;
parseResult.Quality = new Quality(QualityTypes.HDTV, true); parseResult.Quality = new QualityModel(QualityTypes.HDTV, true);
parseResult.ToString().Should().Be("My Series - S12E03 HDTV [proper]"); parseResult.ToString().Should().Be("My Series - S12E03 HDTV [proper]");
@ -51,7 +51,7 @@ namespace NzbDrone.Core.Test
parseResult.EpisodeNumbers = new List<int> { 3, 4, 5 }; parseResult.EpisodeNumbers = new List<int> { 3, 4, 5 };
parseResult.FullSeason = false; parseResult.FullSeason = false;
parseResult.AirDate = null; parseResult.AirDate = null;
parseResult.Quality = new Quality(QualityTypes.HDTV, false); parseResult.Quality = new QualityModel(QualityTypes.HDTV, false);
parseResult.ToString().Should().Be("My Series - S12E03-04-05 HDTV"); parseResult.ToString().Should().Be("My Series - S12E03-04-05 HDTV");
@ -66,7 +66,7 @@ namespace NzbDrone.Core.Test
parseResult.EpisodeNumbers = new List<int> { 3, 4, 5 }; parseResult.EpisodeNumbers = new List<int> { 3, 4, 5 };
parseResult.FullSeason = false; parseResult.FullSeason = false;
parseResult.AirDate = null; parseResult.AirDate = null;
parseResult.Quality = new Quality(QualityTypes.HDTV, true); parseResult.Quality = new QualityModel(QualityTypes.HDTV, true);
parseResult.ToString().Should().Be("My Series - S12E03-04-05 HDTV [proper]"); parseResult.ToString().Should().Be("My Series - S12E03-04-05 HDTV [proper]");
@ -81,7 +81,7 @@ namespace NzbDrone.Core.Test
parseResult.SeasonNumber = 12; parseResult.SeasonNumber = 12;
parseResult.FullSeason = true; parseResult.FullSeason = true;
parseResult.AirDate = null; parseResult.AirDate = null;
parseResult.Quality = new Quality(QualityTypes.HDTV, false); parseResult.Quality = new QualityModel(QualityTypes.HDTV, false);
parseResult.ToString().Should().Be("My Series - Season 12 HDTV"); parseResult.ToString().Should().Be("My Series - Season 12 HDTV");
@ -96,7 +96,7 @@ namespace NzbDrone.Core.Test
parseResult.SeasonNumber = 12; parseResult.SeasonNumber = 12;
parseResult.FullSeason = true; parseResult.FullSeason = true;
parseResult.AirDate = null; parseResult.AirDate = null;
parseResult.Quality = new Quality(QualityTypes.HDTV, true); parseResult.Quality = new QualityModel(QualityTypes.HDTV, true);
parseResult.ToString().Should().Be("My Series - Season 12 HDTV [proper]"); parseResult.ToString().Should().Be("My Series - Season 12 HDTV [proper]");
@ -110,7 +110,7 @@ namespace NzbDrone.Core.Test
parseResult.SeasonNumber = 12; parseResult.SeasonNumber = 12;
parseResult.FullSeason = true; parseResult.FullSeason = true;
parseResult.AirDate = new DateTime(2010, 12, 30); parseResult.AirDate = new DateTime(2010, 12, 30);
parseResult.Quality = new Quality(QualityTypes.HDTV, false); parseResult.Quality = new QualityModel(QualityTypes.HDTV, false);
parseResult.ToString().Should().Be("My Series - 2010-12-30 HDTV"); parseResult.ToString().Should().Be("My Series - 2010-12-30 HDTV");
@ -124,7 +124,7 @@ namespace NzbDrone.Core.Test
parseResult.SeasonNumber = 12; parseResult.SeasonNumber = 12;
parseResult.FullSeason = true; parseResult.FullSeason = true;
parseResult.AirDate = new DateTime(2010, 12, 30); parseResult.AirDate = new DateTime(2010, 12, 30);
parseResult.Quality = new Quality(QualityTypes.HDTV, true); parseResult.Quality = new QualityModel(QualityTypes.HDTV, true);
parseResult.ToString().Should().Be("My Series - 2010-12-30 HDTV [proper]"); parseResult.ToString().Should().Be("My Series - 2010-12-30 HDTV [proper]");

3
NzbDrone.Core.Test/NzbDrone.Core.Test.ncrunchproject
View File

@ -23,5 +23,8 @@
<NamedTestSelector> <NamedTestSelector>
<TestName>NzbDrone.Core.Test.Integeration.ServiceIntegerationFixture.should_be_able_to_submit_exceptions</TestName> <TestName>NzbDrone.Core.Test.Integeration.ServiceIntegerationFixture.should_be_able_to_submit_exceptions</TestName>
</NamedTestSelector> </NamedTestSelector>
<NamedTestSelector>
<TestName>NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests.ImportFileFixture.import_unparsable_file_should_skip</TestName>
</NamedTestSelector>
</IgnoredTests> </IgnoredTests>
</ProjectConfiguration> </ProjectConfiguration>

4
NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/AcceptableSizeSpecificationFixture.cs
View File

@ -33,7 +33,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DecisionEngineTests
{ {
SeriesTitle = "Title", SeriesTitle = "Title",
Language = LanguageType.English, Language = LanguageType.English,
Quality = new Quality(QualityTypes.SDTV, true), Quality = new QualityModel(QualityTypes.SDTV, true),
EpisodeNumbers = new List<int> { 3, 4 }, EpisodeNumbers = new List<int> { 3, 4 },
SeasonNumber = 12, SeasonNumber = 12,
AirDate = DateTime.Now.AddDays(-12).Date AirDate = DateTime.Now.AddDays(-12).Date
@ -43,7 +43,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DecisionEngineTests
{ {
SeriesTitle = "Title", SeriesTitle = "Title",
Language = LanguageType.English, Language = LanguageType.English,
Quality = new Quality(QualityTypes.SDTV, true), Quality = new QualityModel(QualityTypes.SDTV, true),
EpisodeNumbers = new List<int> { 3 }, EpisodeNumbers = new List<int> { 3 },
SeasonNumber = 12, SeasonNumber = 12,
AirDate = DateTime.Now.AddDays(-12).Date AirDate = DateTime.Now.AddDays(-12).Date

2
NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/AllowedReleaseGroupSpecificationFixture.cs
View File

@ -30,7 +30,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DecisionEngineTests
{ {
SeriesTitle = "Title", SeriesTitle = "Title",
Language = LanguageType.English, Language = LanguageType.English,
Quality = new Quality(QualityTypes.SDTV, true), Quality = new QualityModel(QualityTypes.SDTV, true),
EpisodeNumbers = new List<int> { 3 }, EpisodeNumbers = new List<int> { 3 },
SeasonNumber = 12, SeasonNumber = 12,
AirDate = DateTime.Now.AddDays(-12).Date, AirDate = DateTime.Now.AddDays(-12).Date,

2
NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/QualityAllowedByProfileSpecificationFixtrue.cs
View File

@ -35,7 +35,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DecisionEngineTests
parseResult = new EpisodeParseResult parseResult = new EpisodeParseResult
{ {
Series = fakeSeries, Series = fakeSeries,
Quality = new Quality(QualityTypes.DVD, true), Quality = new QualityModel(QualityTypes.DVD, true),
EpisodeNumbers = new List<int> { 3 }, EpisodeNumbers = new List<int> { 3 },
SeasonNumber = 12, SeasonNumber = 12,
}; };

2
NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs
View File

@ -24,7 +24,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DecisionEngineTests
[TestCase(QualityTypes.SDTV, false, QualityTypes.SDTV, true, QualityTypes.SDTV, Result = true)] [TestCase(QualityTypes.SDTV, false, QualityTypes.SDTV, true, QualityTypes.SDTV, Result = true)]
public bool IsUpgradeTest(QualityTypes current, bool currentProper, QualityTypes newQuality, bool newProper, QualityTypes cutoff) public bool IsUpgradeTest(QualityTypes current, bool currentProper, QualityTypes newQuality, bool newProper, QualityTypes cutoff)
{ {
return new QualityUpgradeSpecification().IsSatisfiedBy(new Quality(current, currentProper), new Quality(newQuality, newProper), cutoff); return new QualityUpgradeSpecification().IsSatisfiedBy(new QualityModel(current, currentProper), new QualityModel(newQuality, newProper), cutoff);
} }
} }
} }

4
NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/UpgradeDiskSpecificationFixtrue.cs
View File

@ -38,7 +38,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DecisionEngineTests
parseResultMulti = new EpisodeParseResult parseResultMulti = new EpisodeParseResult
{ {
Series = fakeSeries, Series = fakeSeries,
Quality = new Quality(QualityTypes.DVD, true), Quality = new QualityModel(QualityTypes.DVD, true),
EpisodeNumbers = new List<int> { 3, 4 }, EpisodeNumbers = new List<int> { 3, 4 },
SeasonNumber = 12, SeasonNumber = 12,
}; };
@ -46,7 +46,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DecisionEngineTests
parseResultSingle = new EpisodeParseResult parseResultSingle = new EpisodeParseResult
{ {
Series = fakeSeries, Series = fakeSeries,
Quality = new Quality(QualityTypes.DVD, true), Quality = new QualityModel(QualityTypes.DVD, true),
EpisodeNumbers = new List<int> { 3 }, EpisodeNumbers = new List<int> { 3 },
SeasonNumber = 12, SeasonNumber = 12,
}; };

14
NzbDrone.Core.Test/ProviderTests/DecisionEngineTests/UpgradeHistorySpecificationFixtrue.cs
View File

@ -22,8 +22,8 @@ namespace NzbDrone.Core.Test.ProviderTests.DecisionEngineTests
private EpisodeParseResult parseResultMulti; private EpisodeParseResult parseResultMulti;
private EpisodeParseResult parseResultSingle; private EpisodeParseResult parseResultSingle;
private Quality firstQuality; private QualityModel firstQuality;
private Quality secondQuality; private QualityModel secondQuality;
[SetUp] [SetUp]
public void Setup() public void Setup()
@ -38,7 +38,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DecisionEngineTests
parseResultMulti = new EpisodeParseResult parseResultMulti = new EpisodeParseResult
{ {
Series = fakeSeries, Series = fakeSeries,
Quality = new Quality(QualityTypes.DVD, true), Quality = new QualityModel(QualityTypes.DVD, true),
EpisodeNumbers = new List<int> { 3, 4 }, EpisodeNumbers = new List<int> { 3, 4 },
SeasonNumber = 12, SeasonNumber = 12,
}; };
@ -46,13 +46,13 @@ namespace NzbDrone.Core.Test.ProviderTests.DecisionEngineTests
parseResultSingle = new EpisodeParseResult parseResultSingle = new EpisodeParseResult
{ {
Series = fakeSeries, Series = fakeSeries,
Quality = new Quality(QualityTypes.DVD, true), Quality = new QualityModel(QualityTypes.DVD, true),
EpisodeNumbers = new List<int> { 3 }, EpisodeNumbers = new List<int> { 3 },
SeasonNumber = 12, SeasonNumber = 12,
}; };
firstQuality = new Quality(QualityTypes.Bluray1080p, true); firstQuality = new QualityModel(QualityTypes.Bluray1080p, true);
secondQuality = new Quality(QualityTypes.Bluray1080p, true); secondQuality = new QualityModel(QualityTypes.Bluray1080p, true);
var singleEpisodeList = new List<Episode> { new Episode { SeasonNumber = 12, EpisodeNumber = 3 } }; var singleEpisodeList = new List<Episode> { new Episode { SeasonNumber = 12, EpisodeNumber = 3 } };
var doubleEpisodeList = new List<Episode> { var doubleEpisodeList = new List<Episode> {
@ -66,7 +66,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DecisionEngineTests
Mocker.GetMock<HistoryProvider>().Setup(c => c.GetBestQualityInHistory(fakeSeries.SeriesId, 12, 3)).Returns(firstQuality); Mocker.GetMock<HistoryProvider>().Setup(c => c.GetBestQualityInHistory(fakeSeries.SeriesId, 12, 3)).Returns(firstQuality);
Mocker.GetMock<HistoryProvider>().Setup(c => c.GetBestQualityInHistory(fakeSeries.SeriesId, 12, 4)).Returns(secondQuality); Mocker.GetMock<HistoryProvider>().Setup(c => c.GetBestQualityInHistory(fakeSeries.SeriesId, 12, 4)).Returns(secondQuality);
Mocker.GetMock<HistoryProvider>().Setup(c => c.GetBestQualityInHistory(fakeSeries.SeriesId, 12, 5)).Returns<Quality>(null); Mocker.GetMock<HistoryProvider>().Setup(c => c.GetBestQualityInHistory(fakeSeries.SeriesId, 12, 5)).Returns<QualityModel>(null);
} }
private void WithFirstReportUpgradable() private void WithFirstReportUpgradable()

2
NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/MoveEpisodeFileFixture.cs
View File

@ -112,7 +112,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
.Returns(fi); .Returns(fi);
Mocker.GetMock<DownloadProvider>() Mocker.GetMock<DownloadProvider>()
.Setup(s => s.GetDownloadTitle(It.Is<EpisodeParseResult>(e => e.Quality == new Quality{ QualityType = QualityTypes.WEBDL, Proper = false }))) .Setup(s => s.GetDownloadTitle(It.Is<EpisodeParseResult>(e => e.Quality == new QualityModel{ QualityType = QualityTypes.WEBDL, Proper = false })))
.Returns(message); .Returns(message);
Mocker.GetMock<ExternalNotificationProvider>() Mocker.GetMock<ExternalNotificationProvider>()

16
NzbDrone.Core.Test/ProviderTests/DownloadClientTests/SabProviderTests/QueueFixture.cs
View File

@ -128,7 +128,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DownloadClientTests.SabProviderTests
EpisodeTitle = "Title", EpisodeTitle = "Title",
EpisodeNumbers = new List<int> { 5 }, EpisodeNumbers = new List<int> { 5 },
SeasonNumber = 1, SeasonNumber = 1,
Quality = new Quality { QualityType = QualityTypes.SDTV, Proper = false }, Quality = new QualityModel { QualityType = QualityTypes.SDTV, Proper = false },
Series = new Series { Title = "30 Rock", CleanTitle = Parser.NormalizeTitle("30 Rock") }, Series = new Series { Title = "30 Rock", CleanTitle = Parser.NormalizeTitle("30 Rock") },
}; };
@ -145,7 +145,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DownloadClientTests.SabProviderTests
var parseResult = new EpisodeParseResult var parseResult = new EpisodeParseResult
{ {
Quality = new Quality { QualityType = QualityTypes.Bluray720p, Proper = false }, Quality = new QualityModel { QualityType = QualityTypes.Bluray720p, Proper = false },
AirDate = new DateTime(2011, 12, 01), AirDate = new DateTime(2011, 12, 01),
Series = new Series { Title = "The Dailyshow", CleanTitle = Parser.NormalizeTitle("The Dailyshow"), IsDaily = true }, Series = new Series { Title = "The Dailyshow", CleanTitle = Parser.NormalizeTitle("The Dailyshow"), IsDaily = true },
}; };
@ -164,7 +164,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DownloadClientTests.SabProviderTests
var parseResult = new EpisodeParseResult var parseResult = new EpisodeParseResult
{ {
Quality = new Quality { QualityType = QualityTypes.Bluray720p, Proper = false }, Quality = new QualityModel { QualityType = QualityTypes.Bluray720p, Proper = false },
FullSeason = true, FullSeason = true,
SeasonNumber = 5, SeasonNumber = 5,
Series = new Series { Title = "My Name is earl", CleanTitle = Parser.NormalizeTitle("My Name is earl") }, Series = new Series { Title = "My Name is earl", CleanTitle = Parser.NormalizeTitle("My Name is earl") },
@ -191,7 +191,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DownloadClientTests.SabProviderTests
EpisodeTitle = "Title", EpisodeTitle = "Title",
EpisodeNumbers = new List<int>(episodes), EpisodeNumbers = new List<int>(episodes),
SeasonNumber = season, SeasonNumber = season,
Quality = new Quality { QualityType = qualityType, Proper = proper }, Quality = new QualityModel { QualityType = qualityType, Proper = proper },
Series = new Series { Title = title, CleanTitle = Parser.NormalizeTitle(title) }, Series = new Series { Title = title, CleanTitle = Parser.NormalizeTitle(title) },
}; };
@ -215,7 +215,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DownloadClientTests.SabProviderTests
EpisodeTitle = "Title", EpisodeTitle = "Title",
EpisodeNumbers = new List<int>(episodes), EpisodeNumbers = new List<int>(episodes),
SeasonNumber = season, SeasonNumber = season,
Quality = new Quality { QualityType = qualityType, Proper = proper }, Quality = new QualityModel { QualityType = qualityType, Proper = proper },
Series = new Series { Title = title, CleanTitle = Parser.NormalizeTitle(title) }, Series = new Series { Title = title, CleanTitle = Parser.NormalizeTitle(title) },
}; };
@ -237,7 +237,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DownloadClientTests.SabProviderTests
EpisodeTitle = "Title", EpisodeTitle = "Title",
EpisodeNumbers = new List<int>(episodes), EpisodeNumbers = new List<int>(episodes),
SeasonNumber = season, SeasonNumber = season,
Quality = new Quality { QualityType = qualityType, Proper = proper }, Quality = new QualityModel { QualityType = qualityType, Proper = proper },
Series = new Series { Title = title, CleanTitle = Parser.NormalizeTitle(title) }, Series = new Series { Title = title, CleanTitle = Parser.NormalizeTitle(title) },
}; };
@ -259,7 +259,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DownloadClientTests.SabProviderTests
EpisodeTitle = "Title", EpisodeTitle = "Title",
EpisodeNumbers = new List<int>(episodes), EpisodeNumbers = new List<int>(episodes),
SeasonNumber = season, SeasonNumber = season,
Quality = new Quality { QualityType = qualityType, Proper = proper }, Quality = new QualityModel { QualityType = qualityType, Proper = proper },
Series = new Series { Title = title, CleanTitle = Parser.NormalizeTitle(title) }, Series = new Series { Title = title, CleanTitle = Parser.NormalizeTitle(title) },
}; };
@ -278,7 +278,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DownloadClientTests.SabProviderTests
EpisodeTitle = "Title", EpisodeTitle = "Title",
EpisodeNumbers = new List<int> { 1 }, EpisodeNumbers = new List<int> { 1 },
SeasonNumber = 2, SeasonNumber = 2,
Quality = new Quality { QualityType = QualityTypes.Bluray1080p, Proper = true }, Quality = new QualityModel { QualityType = QualityTypes.Bluray1080p, Proper = true },
Series = new Series { Title = "Test", CleanTitle = Parser.NormalizeTitle("Test") }, Series = new Series { Title = "Test", CleanTitle = Parser.NormalizeTitle("Test") },
}; };

8
NzbDrone.Core.Test/ProviderTests/DownloadProviderFixture.cs
View File

@ -40,7 +40,7 @@ namespace NzbDrone.Core.Test.ProviderTests
.Setup(c => c.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>())).Returns(episodes); .Setup(c => c.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>())).Returns(episodes);
return Builder<EpisodeParseResult>.CreateNew() return Builder<EpisodeParseResult>.CreateNew()
.With(c => c.Quality = new Quality(QualityTypes.DVD, false)) .With(c => c.Quality = new QualityModel(QualityTypes.DVD, false))
.With(c => c.Series = Builder<Series>.CreateNew().Build()) .With(c => c.Series = Builder<Series>.CreateNew().Build())
.With(c => c.EpisodeNumbers = new List<int>{2}) .With(c => c.EpisodeNumbers = new List<int>{2})
.Build(); .Build();
@ -195,7 +195,7 @@ namespace NzbDrone.Core.Test.ProviderTests
{ {
AirDate = DateTime.Now, AirDate = DateTime.Now,
EpisodeNumbers = episodes.ToList(), EpisodeNumbers = episodes.ToList(),
Quality = new Quality(quality, proper), Quality = new QualityModel(quality, proper),
SeasonNumber = seasons, SeasonNumber = seasons,
Series = series, Series = series,
EpisodeTitle = title EpisodeTitle = title
@ -215,7 +215,7 @@ namespace NzbDrone.Core.Test.ProviderTests
var parsResult = new EpisodeParseResult() var parsResult = new EpisodeParseResult()
{ {
AirDate = DateTime.Now, AirDate = DateTime.Now,
Quality = new Quality(QualityTypes.Bluray720p, proper), Quality = new QualityModel(QualityTypes.Bluray720p, proper),
SeasonNumber = 1, SeasonNumber = 1,
Series = series, Series = series,
EpisodeTitle = "My Episode Title", EpisodeTitle = "My Episode Title",
@ -237,7 +237,7 @@ namespace NzbDrone.Core.Test.ProviderTests
var parsResult = new EpisodeParseResult var parsResult = new EpisodeParseResult
{ {
AirDate = new DateTime(2011, 12, 1), AirDate = new DateTime(2011, 12, 1),
Quality = new Quality(QualityTypes.Bluray720p, proper), Quality = new QualityModel(QualityTypes.Bluray720p, proper),
Series = series, Series = series,
EpisodeTitle = "My Episode Title", EpisodeTitle = "My Episode Title",
}; };

20
NzbDrone.Core.Test/ProviderTests/SearchProviderTests/ProcessDailySearchResultsFixture.cs
View File

@ -93,9 +93,9 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchProviderTests
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(5) var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(5)
.All() .All()
.With(c => c.AirDate = DateTime.Today) .With(c => c.AirDate = DateTime.Today)
.With(c => c.Quality = new Quality(QualityTypes.DVD, true)) .With(c => c.Quality = new QualityModel(QualityTypes.DVD, true))
.Random(1) .Random(1)
.With(c => c.Quality = new Quality(QualityTypes.Bluray1080p, true)) .With(c => c.Quality = new QualityModel(QualityTypes.Bluray1080p, true))
.Build(); .Build();
WithMatchingSeries(); WithMatchingSeries();
@ -123,7 +123,7 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchProviderTests
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(5) var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(5)
.All() .All()
.With(c => c.AirDate = DateTime.Today) .With(c => c.AirDate = DateTime.Today)
.With(c => c.Quality = new Quality(QualityTypes.DVD, true)) .With(c => c.Quality = new QualityModel(QualityTypes.DVD, true))
.Build(); .Build();
WithMatchingSeries(); WithMatchingSeries();
@ -147,7 +147,7 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchProviderTests
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(5) var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(5)
.All() .All()
.With(e => e.AirDate = DateTime.Today) .With(e => e.AirDate = DateTime.Today)
.With(e => e.Quality = new Quality(QualityTypes.HDTV, false)) .With(e => e.Quality = new QualityModel(QualityTypes.HDTV, false))
.Build(); .Build();
WithNullSeries(); WithNullSeries();
@ -168,7 +168,7 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchProviderTests
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(5) var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(5)
.All() .All()
.With(e => e.AirDate = DateTime.Today) .With(e => e.AirDate = DateTime.Today)
.With(e => e.Quality = new Quality(QualityTypes.HDTV, false)) .With(e => e.Quality = new QualityModel(QualityTypes.HDTV, false))
.Build(); .Build();
WithMisMatchedSeries(); WithMisMatchedSeries();
@ -189,7 +189,7 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchProviderTests
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(2) var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(2)
.All() .All()
.With(e => e.AirDate = DateTime.Today) .With(e => e.AirDate = DateTime.Today)
.With(c => c.Quality = new Quality(QualityTypes.DVD, true)) .With(c => c.Quality = new QualityModel(QualityTypes.DVD, true))
.Build(); .Build();
WithMatchingSeries(); WithMatchingSeries();
@ -212,9 +212,9 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchProviderTests
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(2) var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(2)
.All() .All()
.With(e => e.AirDate = DateTime.Today) .With(e => e.AirDate = DateTime.Today)
.With(c => c.Quality = new Quality(QualityTypes.DVD, true)) .With(c => c.Quality = new QualityModel(QualityTypes.DVD, true))
.TheLast(1) .TheLast(1)
.With(c => c.Quality = new Quality(QualityTypes.SDTV, true)) .With(c => c.Quality = new QualityModel(QualityTypes.SDTV, true))
.Build(); .Build();
WithMatchingSeries(); WithMatchingSeries();
@ -244,7 +244,7 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchProviderTests
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(5) var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(5)
.All() .All()
.With(e => e.AirDate = null) .With(e => e.AirDate = null)
.With(e => e.Quality = new Quality(QualityTypes.HDTV, false)) .With(e => e.Quality = new QualityModel(QualityTypes.HDTV, false))
.Build(); .Build();
WithMatchingSeries(); WithMatchingSeries();
@ -265,7 +265,7 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchProviderTests
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(5) var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(5)
.All() .All()
.With(e => e.AirDate = DateTime.Today.AddDays(10)) .With(e => e.AirDate = DateTime.Today.AddDays(10))
.With(e => e.Quality = new Quality(QualityTypes.HDTV, false)) .With(e => e.Quality = new QualityModel(QualityTypes.HDTV, false))
.Build(); .Build();
WithMatchingSeries(); WithMatchingSeries();

26
NzbDrone.Core.Test/ProviderTests/SearchProviderTests/ProcessSearchResultsFixture.cs
View File

@ -91,10 +91,10 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchProviderTests
.All() .All()
.With(e => e.SeasonNumber = 1) .With(e => e.SeasonNumber = 1)
.With(e => e.EpisodeNumbers = new List<int> { 1 }) .With(e => e.EpisodeNumbers = new List<int> { 1 })
.With(c => c.Quality = new Quality(QualityTypes.DVD, true)) .With(c => c.Quality = new QualityModel(QualityTypes.DVD, true))
.With(c => c.Age = 10) .With(c => c.Age = 10)
.Random(1) .Random(1)
.With(c => c.Quality = new Quality(QualityTypes.Bluray1080p, true)) .With(c => c.Quality = new QualityModel(QualityTypes.Bluray1080p, true))
.With(c => c.Age = 100) .With(c => c.Age = 100)
.Build(); .Build();
@ -125,7 +125,7 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchProviderTests
.All() .All()
.With(e => e.SeasonNumber = 1) .With(e => e.SeasonNumber = 1)
.With(e => e.EpisodeNumbers = new List<int> { 1 }) .With(e => e.EpisodeNumbers = new List<int> { 1 })
.With(c => c.Quality = new Quality(QualityTypes.Bluray1080p, true)) .With(c => c.Quality = new QualityModel(QualityTypes.Bluray1080p, true))
.With(c => c.Age = 300) .With(c => c.Age = 300)
.Build(); .Build();
@ -157,7 +157,7 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchProviderTests
.All() .All()
.With(e => e.SeasonNumber = 1) .With(e => e.SeasonNumber = 1)
.With(e => e.EpisodeNumbers = new List<int> { 1 }) .With(e => e.EpisodeNumbers = new List<int> { 1 })
.With(c => c.Quality = new Quality(QualityTypes.DVD, true)) .With(c => c.Quality = new QualityModel(QualityTypes.DVD, true))
.Build(); .Build();
WithMatchingSeries(); WithMatchingSeries();
@ -183,7 +183,7 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchProviderTests
.All() .All()
.With(e => e.SeasonNumber = 1) .With(e => e.SeasonNumber = 1)
.With(e => e.EpisodeNumbers = new List<int> { 1 }) .With(e => e.EpisodeNumbers = new List<int> { 1 })
.With(e => e.Quality = new Quality(QualityTypes.HDTV, false)) .With(e => e.Quality = new QualityModel(QualityTypes.HDTV, false))
.Build(); .Build();
WithNullSeries(); WithNullSeries();
@ -206,7 +206,7 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchProviderTests
.All() .All()
.With(e => e.SeasonNumber = 1) .With(e => e.SeasonNumber = 1)
.With(e => e.EpisodeNumbers = new List<int> { 1 }) .With(e => e.EpisodeNumbers = new List<int> { 1 })
.With(e => e.Quality = new Quality(QualityTypes.HDTV, false)) .With(e => e.Quality = new QualityModel(QualityTypes.HDTV, false))
.Build(); .Build();
WithMisMatchedSeries(); WithMisMatchedSeries();
@ -229,7 +229,7 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchProviderTests
.All() .All()
.With(e => e.SeasonNumber = 2) .With(e => e.SeasonNumber = 2)
.With(e => e.EpisodeNumbers = new List<int> { 1 }) .With(e => e.EpisodeNumbers = new List<int> { 1 })
.With(e => e.Quality = new Quality(QualityTypes.HDTV, false)) .With(e => e.Quality = new QualityModel(QualityTypes.HDTV, false))
.Build(); .Build();
WithMatchingSeries(); WithMatchingSeries();
@ -252,7 +252,7 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchProviderTests
.All() .All()
.With(e => e.SeasonNumber = 1) .With(e => e.SeasonNumber = 1)
.With(e => e.EpisodeNumbers = new List<int> { 2 }) .With(e => e.EpisodeNumbers = new List<int> { 2 })
.With(e => e.Quality = new Quality(QualityTypes.HDTV, false)) .With(e => e.Quality = new QualityModel(QualityTypes.HDTV, false))
.Build(); .Build();
WithMatchingSeries(); WithMatchingSeries();
@ -275,7 +275,7 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchProviderTests
.All() .All()
.With(e => e.SeasonNumber = 1) .With(e => e.SeasonNumber = 1)
.With(e => e.EpisodeNumbers = new List<int> { 5 }) .With(e => e.EpisodeNumbers = new List<int> { 5 })
.With(c => c.Quality = new Quality(QualityTypes.DVD, true)) .With(c => c.Quality = new QualityModel(QualityTypes.DVD, true))
.TheLast(1) .TheLast(1)
.With(e => e.EpisodeNumbers = new List<int> { 1, 2, 3, 4, 5 }) .With(e => e.EpisodeNumbers = new List<int> { 1, 2, 3, 4, 5 })
.Build(); .Build();
@ -302,9 +302,9 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchProviderTests
.All() .All()
.With(e => e.SeasonNumber = 1) .With(e => e.SeasonNumber = 1)
.With(e => e.EpisodeNumbers = new List<int> { 1 }) .With(e => e.EpisodeNumbers = new List<int> { 1 })
.With(c => c.Quality = new Quality(QualityTypes.DVD, true)) .With(c => c.Quality = new QualityModel(QualityTypes.DVD, true))
.TheLast(1) .TheLast(1)
.With(c => c.Quality = new Quality(QualityTypes.SDTV, true)) .With(c => c.Quality = new QualityModel(QualityTypes.SDTV, true))
.Build(); .Build();
WithMatchingSeries(); WithMatchingSeries();
@ -336,10 +336,10 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchProviderTests
.All() .All()
.With(e => e.SeasonNumber = 1) .With(e => e.SeasonNumber = 1)
.With(e => e.EpisodeNumbers = new List<int> { 1 }) .With(e => e.EpisodeNumbers = new List<int> { 1 })
.With(c => c.Quality = new Quality(QualityTypes.DVD, true)) .With(c => c.Quality = new QualityModel(QualityTypes.DVD, true))
.With(c => c.Age = 10) .With(c => c.Age = 10)
.Random(1) .Random(1)
.With(c => c.Quality = new Quality(QualityTypes.Bluray1080p, true)) .With(c => c.Quality = new QualityModel(QualityTypes.Bluray1080p, true))
.With(c => c.Age = 100) .With(c => c.Age = 100)
.Build(); .Build();

48
NzbDrone.Core.Test/QualityTest.cs
View File

@ -13,8 +13,8 @@ namespace NzbDrone.Core.Test
[Test] [Test]
public void Icomparer_greater_test() public void Icomparer_greater_test()
{ {
var first = new Quality(QualityTypes.DVD, true); var first = new QualityModel(QualityTypes.DVD, true);
var second = new Quality(QualityTypes.Bluray1080p, true); var second = new QualityModel(QualityTypes.Bluray1080p, true);
second.Should().BeGreaterThan(first); second.Should().BeGreaterThan(first);
} }
@ -22,8 +22,8 @@ namespace NzbDrone.Core.Test
[Test] [Test]
public void Icomparer_greater_proper() public void Icomparer_greater_proper()
{ {
var first = new Quality(QualityTypes.Bluray1080p, false); var first = new QualityModel(QualityTypes.Bluray1080p, false);
var second = new Quality(QualityTypes.Bluray1080p, true); var second = new QualityModel(QualityTypes.Bluray1080p, true);
second.Should().BeGreaterThan(first); second.Should().BeGreaterThan(first);
} }
@ -31,8 +31,8 @@ namespace NzbDrone.Core.Test
[Test] [Test]
public void Icomparer_lesser() public void Icomparer_lesser()
{ {
var first = new Quality(QualityTypes.DVD, true); var first = new QualityModel(QualityTypes.DVD, true);
var second = new Quality(QualityTypes.Bluray1080p, true); var second = new QualityModel(QualityTypes.Bluray1080p, true);
first.Should().BeLessThan(second); first.Should().BeLessThan(second);
} }
@ -40,8 +40,8 @@ namespace NzbDrone.Core.Test
[Test] [Test]
public void Icomparer_lesser_proper() public void Icomparer_lesser_proper()
{ {
var first = new Quality(QualityTypes.DVD, false); var first = new QualityModel(QualityTypes.DVD, false);
var second = new Quality(QualityTypes.DVD, true); var second = new QualityModel(QualityTypes.DVD, true);
first.Should().BeLessThan(second); first.Should().BeLessThan(second);
} }
@ -49,8 +49,8 @@ namespace NzbDrone.Core.Test
[Test] [Test]
public void equal_operand() public void equal_operand()
{ {
var first = new Quality(QualityTypes.Bluray1080p, true); var first = new QualityModel(QualityTypes.Bluray1080p, true);
var second = new Quality(QualityTypes.Bluray1080p, true); var second = new QualityModel(QualityTypes.Bluray1080p, true);
(first == second).Should().BeTrue(); (first == second).Should().BeTrue();
(first >= second).Should().BeTrue(); (first >= second).Should().BeTrue();
@ -60,8 +60,8 @@ namespace NzbDrone.Core.Test
[Test] [Test]
public void equal_operand_false() public void equal_operand_false()
{ {
var first = new Quality(QualityTypes.Bluray1080p, true); var first = new QualityModel(QualityTypes.Bluray1080p, true);
var second = new Quality(QualityTypes.Unknown, true); var second = new QualityModel(QualityTypes.Unknown, true);
(first == second).Should().BeFalse(); (first == second).Should().BeFalse();
} }
@ -69,8 +69,8 @@ namespace NzbDrone.Core.Test
[Test] [Test]
public void equal_operand_false_proper() public void equal_operand_false_proper()
{ {
var first = new Quality(QualityTypes.Bluray1080p, true); var first = new QualityModel(QualityTypes.Bluray1080p, true);
var second = new Quality(QualityTypes.Bluray1080p, false); var second = new QualityModel(QualityTypes.Bluray1080p, false);
(first == second).Should().BeFalse(); (first == second).Should().BeFalse();
} }
@ -79,8 +79,8 @@ namespace NzbDrone.Core.Test
[Test] [Test]
public void not_equal_operand() public void not_equal_operand()
{ {
var first = new Quality(QualityTypes.Bluray1080p, true); var first = new QualityModel(QualityTypes.Bluray1080p, true);
var second = new Quality(QualityTypes.Bluray1080p, true); var second = new QualityModel(QualityTypes.Bluray1080p, true);
(first != second).Should().BeFalse(); (first != second).Should().BeFalse();
} }
@ -88,8 +88,8 @@ namespace NzbDrone.Core.Test
[Test] [Test]
public void not_equal_operand_false() public void not_equal_operand_false()
{ {
var first = new Quality(QualityTypes.Bluray1080p, true); var first = new QualityModel(QualityTypes.Bluray1080p, true);
var second = new Quality(QualityTypes.Unknown, true); var second = new QualityModel(QualityTypes.Unknown, true);
(first != second).Should().BeTrue(); (first != second).Should().BeTrue();
} }
@ -97,8 +97,8 @@ namespace NzbDrone.Core.Test
[Test] [Test]
public void not_equal_operand_false_proper() public void not_equal_operand_false_proper()
{ {
var first = new Quality(QualityTypes.Bluray1080p, true); var first = new QualityModel(QualityTypes.Bluray1080p, true);
var second = new Quality(QualityTypes.Bluray1080p, false); var second = new QualityModel(QualityTypes.Bluray1080p, false);
(first != second).Should().BeTrue(); (first != second).Should().BeTrue();
} }
@ -106,8 +106,8 @@ namespace NzbDrone.Core.Test
[Test] [Test]
public void greater_operand() public void greater_operand()
{ {
var first = new Quality(QualityTypes.DVD, true); var first = new QualityModel(QualityTypes.DVD, true);
var second = new Quality(QualityTypes.Bluray1080p, true); var second = new QualityModel(QualityTypes.Bluray1080p, true);
(first < second).Should().BeTrue(); (first < second).Should().BeTrue();
(first <= second).Should().BeTrue(); (first <= second).Should().BeTrue();
@ -116,8 +116,8 @@ namespace NzbDrone.Core.Test
[Test] [Test]
public void lesser_operand() public void lesser_operand()
{ {
var first = new Quality(QualityTypes.DVD, true); var first = new QualityModel(QualityTypes.DVD, true);
var second = new Quality(QualityTypes.Bluray1080p, true); var second = new QualityModel(QualityTypes.Bluray1080p, true);
(second > first).Should().BeTrue(); (second > first).Should().BeTrue();
(second >= first).Should().BeTrue(); (second >= first).Should().BeTrue();

2
NzbDrone.Core/Model/EpisodeParseResult.cs
View File

@ -24,7 +24,7 @@ namespace NzbDrone.Core.Model
public DateTime? AirDate { get; set; } public DateTime? AirDate { get; set; }
public Quality Quality { get; set; } public QualityModel Quality { get; set; }
public LanguageType Language { get; set; } public LanguageType Language { get; set; }

26
NzbDrone.Core/Model/Quality.cs → NzbDrone.Core/Model/QualityModel.cs
View File

@ -3,21 +3,21 @@ using NzbDrone.Core.Repository.Quality;
namespace NzbDrone.Core.Model namespace NzbDrone.Core.Model
{ {
public class Quality : IComparable<Quality> public class QualityModel : IComparable<QualityModel>
{ {
public QualityTypes QualityType { get; set; } public QualityTypes QualityType { get; set; }
public Boolean Proper { get; set; } public Boolean Proper { get; set; }
public Quality() { } public QualityModel() { }
public Quality(QualityTypes quality, Boolean proper) public QualityModel(QualityTypes quality, Boolean proper)
{ {
QualityType = quality; QualityType = quality;
Proper = proper; Proper = proper;
} }
public int CompareTo(Quality other) public int CompareTo(QualityModel other)
{ {
if (other.QualityType > QualityType) if (other.QualityType > QualityType)
return -1; return -1;
@ -37,12 +37,12 @@ namespace NzbDrone.Core.Model
return 0; return 0;
} }
public static bool operator !=(Quality x, Quality y) public static bool operator !=(QualityModel x, QualityModel y)
{ {
return !(x == y); return !(x == y);
} }
public static bool operator ==(Quality x, Quality y) public static bool operator ==(QualityModel x, QualityModel y)
{ {
var xObj = (Object)x; var xObj = (Object)x;
var yObj = (object)y; var yObj = (object)y;
@ -55,22 +55,22 @@ namespace NzbDrone.Core.Model
return x.CompareTo(y) == 0; return x.CompareTo(y) == 0;
} }
public static bool operator >(Quality x, Quality y) public static bool operator >(QualityModel x, QualityModel y)
{ {
return x.CompareTo(y) > 0; return x.CompareTo(y) > 0;
} }
public static bool operator <(Quality x, Quality y) public static bool operator <(QualityModel x, QualityModel y)
{ {
return x.CompareTo(y) < 1; return x.CompareTo(y) < 1;
} }
public static bool operator <=(Quality x, Quality y) public static bool operator <=(QualityModel x, QualityModel y)
{ {
return x.CompareTo(y) <= 0; return x.CompareTo(y) <= 0;
} }
public static bool operator >=(Quality x, Quality y) public static bool operator >=(QualityModel x, QualityModel y)
{ {
return x.CompareTo(y) >= 0; return x.CompareTo(y) >= 0;
} }
@ -97,7 +97,7 @@ namespace NzbDrone.Core.Model
} }
} }
public bool Equals(Quality other) public bool Equals(QualityModel other)
{ {
if (ReferenceEquals(null, other)) return false; if (ReferenceEquals(null, other)) return false;
if (ReferenceEquals(this, other)) return true; if (ReferenceEquals(this, other)) return true;
@ -108,8 +108,8 @@ namespace NzbDrone.Core.Model
{ {
if (ReferenceEquals(null, obj)) return false; if (ReferenceEquals(null, obj)) return false;
if (ReferenceEquals(this, obj)) return true; if (ReferenceEquals(this, obj)) return true;
if (obj.GetType() != typeof (Quality)) return false; if (obj.GetType() != typeof (QualityModel)) return false;
return Equals((Quality) obj); return Equals((QualityModel) obj);
} }
} }
} }

2
NzbDrone.Core/Model/SeasonParseResult.cs
View File

@ -6,7 +6,7 @@
internal int SeasonNumber { get; set; } internal int SeasonNumber { get; set; }
internal int Year { get; set; } internal int Year { get; set; }
public Quality Quality { get; set; } public QualityModel Quality { get; set; }
public override string ToString() public override string ToString()
{ {

4
NzbDrone.Core/Parser.cs
View File

@ -245,13 +245,13 @@ namespace NzbDrone.Core
return NormalizeTitle(title); return NormalizeTitle(title);
} }
internal static Quality ParseQuality(string name) internal static QualityModel ParseQuality(string name)
{ {
Logger.Trace("Trying to parse quality for {0}", name); Logger.Trace("Trying to parse quality for {0}", name);
name = name.Trim(); name = name.Trim();
var normalizedName = NormalizeTitle(name); var normalizedName = NormalizeTitle(name);
var result = new Quality { QualityType = QualityTypes.Unknown }; var result = new QualityModel { QualityType = QualityTypes.Unknown };
result.Proper = (normalizedName.Contains("proper") || normalizedName.Contains("repack")); result.Proper = (normalizedName.Contains("proper") || normalizedName.Contains("repack"));
if (normalizedName.Contains("dvd") || normalizedName.Contains("bdrip") || normalizedName.Contains("brrip")) if (normalizedName.Contains("dvd") || normalizedName.Contains("bdrip") || normalizedName.Contains("brrip"))

2
NzbDrone.Core/Providers/DecisionEngine/QualityUpgradeSpecification.cs
View File

@ -9,7 +9,7 @@ namespace NzbDrone.Core.Providers.DecisionEngine
{ {
private static readonly Logger logger = LogManager.GetCurrentClassLogger(); private static readonly Logger logger = LogManager.GetCurrentClassLogger();
public virtual bool IsSatisfiedBy(Quality currentQuality, Quality newQuality, QualityTypes cutOff) public virtual bool IsSatisfiedBy(QualityModel currentQuality, QualityModel newQuality, QualityTypes cutOff)
{ {
if (currentQuality >= newQuality) if (currentQuality >= newQuality)
{ {

2
NzbDrone.Core/Providers/DecisionEngine/UpgradeDiskSpecification.cs
View File

@ -27,7 +27,7 @@ namespace NzbDrone.Core.Providers.DecisionEngine
foreach (var file in _episodeProvider.GetEpisodesByParseResult(subject).Select(c => c.EpisodeFile).Where(c => c != null)) foreach (var file in _episodeProvider.GetEpisodesByParseResult(subject).Select(c => c.EpisodeFile).Where(c => c != null))
{ {
logger.Trace("Comparing file quality with report. Existing file is {0} proper:{1}", file.Quality, file.Proper); logger.Trace("Comparing file quality with report. Existing file is {0} proper:{1}", file.Quality, file.Proper);
if (!_qualityUpgradeSpecification.IsSatisfiedBy(new Quality { QualityType = file.Quality, Proper = file.Proper }, subject.Quality, subject.Series.QualityProfile.Cutoff)) if (!_qualityUpgradeSpecification.IsSatisfiedBy(new QualityModel { QualityType = file.Quality, Proper = file.Proper }, subject.Quality, subject.Series.QualityProfile.Cutoff))
return false; return false;
} }

2
NzbDrone.Core/Providers/DiskScanProvider.cs
View File

@ -202,7 +202,7 @@ namespace NzbDrone.Core.Providers
var parseResult = Parser.ParsePath(episodeFile.Path); var parseResult = Parser.ParsePath(episodeFile.Path);
parseResult.Series = series; parseResult.Series = series;
parseResult.Quality = new Quality{ QualityType = episodeFile.Quality, Proper = episodeFile.Proper }; parseResult.Quality = new QualityModel{ QualityType = episodeFile.Quality, Proper = episodeFile.Proper };
var message = _downloadProvider.GetDownloadTitle(parseResult); var message = _downloadProvider.GetDownloadTitle(parseResult);

4
NzbDrone.Core/Providers/HistoryProvider.cs
View File

@ -60,7 +60,7 @@ namespace NzbDrone.Core.Providers
logger.Debug("Item added to history: {0}", item.NzbTitle); logger.Debug("Item added to history: {0}", item.NzbTitle);
} }
public virtual Quality GetBestQualityInHistory(int seriesId, int seasonNumber, int episodeNumber) public virtual QualityModel GetBestQualityInHistory(int seriesId, int seasonNumber, int episodeNumber)
{ {
var quality = _database.SingleOrDefault<dynamic>(@"SELECT TOP 1 History.Quality , History.IsProper FROM History var quality = _database.SingleOrDefault<dynamic>(@"SELECT TOP 1 History.Quality , History.IsProper FROM History
INNER JOIN Episodes ON History.EpisodeId = Episodes.EpisodeId INNER JOIN Episodes ON History.EpisodeId = Episodes.EpisodeId
@ -72,7 +72,7 @@ namespace NzbDrone.Core.Providers
if (quality == null) return null; if (quality == null) return null;
return new Quality((QualityTypes)quality.Quality, quality.IsProper); return new QualityModel((QualityTypes)quality.Quality, quality.IsProper);
} }
public virtual void Delete(int historyId) public virtual void Delete(int historyId)

2
NzbDrone.Core/Providers/SignalRProvider.cs
View File

@ -16,7 +16,7 @@ namespace NzbDrone.Core.Providers
{ {
private static readonly Logger logger = LogManager.GetCurrentClassLogger(); private static readonly Logger logger = LogManager.GetCurrentClassLogger();
public virtual void UpdateEpisodeStatus(int episodeId, EpisodeStatusType episodeStatus, Quality quality) public virtual void UpdateEpisodeStatus(int episodeId, EpisodeStatusType episodeStatus, QualityModel quality)
{ {
try try
{ {

4
NzbDrone.Core/Repository/EpisodeFile.cs
View File

@ -38,11 +38,11 @@ namespace NzbDrone.Core.Repository
public string ReleaseGroup { get; set; } public string ReleaseGroup { get; set; }
[Ignore] [Ignore]
public Model.Quality QualityWrapper public Model.QualityModel QualityWrapper
{ {
get get
{ {
return new Model.Quality(Quality, Proper); return new Model.QualityModel(Quality, Proper);
} }
set set
{ {