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

Merge remote-tracking branch 'origin/master' into backbone

This commit is contained in:
Mark McDowall 2012-11-26 16:45:57 -08:00
parent 0333da1062 0758a5eb1e
commit bc424709af
7 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NzbDrone.Core.Test/ParserFixture/ParserTest.cs
View File

@ -13,8 +13,8 @@ using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.ParserFixture namespace NzbDrone.Core.Test.ParserFixture
{ {
[TestFixture]
// ReSharper disable InconsistentNaming // ReSharper disable InconsistentNaming
[TestFixture]
public class ParserTest : CoreTest public class ParserTest : CoreTest
{ {
/*Fucked-up hall of shame, /*Fucked-up hall of shame,
@ -189,6 +189,7 @@ namespace NzbDrone.Core.Test.ParserFixture
[TestCase("Parks.and.Recreation.S02.720p.x264-DIMENSION", "Parks.and.Recreation", 2)] [TestCase("Parks.and.Recreation.S02.720p.x264-DIMENSION", "Parks.and.Recreation", 2)]
[TestCase("The.Office.US.S03.720p.x264-DIMENSION", "The.Office.US", 3)] [TestCase("The.Office.US.S03.720p.x264-DIMENSION", "The.Office.US", 3)]
[TestCase(@"Sons.of.Anarchy.S03.720p.BluRay-CLUE\REWARD", "Sons.of.Anarchy", 3)] [TestCase(@"Sons.of.Anarchy.S03.720p.BluRay-CLUE\REWARD", "Sons.of.Anarchy", 3)]
[TestCase("Adventure Time S02 720p HDTV x264 CRON", "Adventure Time", 2)]
public void full_season_release_parse(string postTitle, string title, int season) public void full_season_release_parse(string postTitle, string title, int season)
{ {
var result = Parser.ParseTitle(postTitle); var result = Parser.ParseTitle(postTitle);
@ -285,6 +286,7 @@ namespace NzbDrone.Core.Test.ParserFixture
[TestCase("The Daily Show With Jon Stewart -", "dailyshowwithjonstewart")] [TestCase("The Daily Show With Jon Stewart -", "dailyshowwithjonstewart")]
[TestCase("The Venture Bros. (2004)", "venturebros2004")] [TestCase("The Venture Bros. (2004)", "venturebros2004")]
[TestCase("Castle (2011)", "castle2011")] [TestCase("Castle (2011)", "castle2011")]
[TestCase("Adventure Time S02 720p HDTV x264 CRON", "adventuretime")]
public void parse_series_name(string postTitle, string title) public void parse_series_name(string postTitle, string title)
{ {
var result = Parser.ParseSeriesName(postTitle); var result = Parser.ParseSeriesName(postTitle);

16
NzbDrone.Core/Parser.cs
View File

@ -236,20 +236,12 @@ namespace NzbDrone.Core
{ {
Logger.Trace("Parsing string '{0}'", title); Logger.Trace("Parsing string '{0}'", title);
foreach (var regex in ReportTitleRegex) var parseResult = ParseTitle(title);
{
var match = regex.Matches(title);
if (match.Count != 0) if(parseResult == null)
{ return NormalizeTitle(title);
var seriesName = NormalizeTitle(match[0].Groups["title"].Value);
Logger.Trace("Series Parsed. {0}", seriesName); return parseResult.CleanTitle;
return seriesName;
}
}
return NormalizeTitle(title);
} }
internal static QualityModel ParseQuality(string name) internal static QualityModel ParseQuality(string name)

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

@ -70,7 +70,7 @@ namespace NzbDrone.Core.Providers
ON Series.SeriesId = SearchHistory.SeriesId ON Series.SeriesId = SearchHistory.SeriesId
LEFT JOIN Episodes LEFT JOIN Episodes
ON Episodes.EpisodeId = SearchHistory.EpisodeId ON Episodes.EpisodeId = SearchHistory.EpisodeId
INNER JOIN SearchHistoryItems LEFT JOIN SearchHistoryItems
ON SearchHistoryItems.SearchHistoryId = SearchHistory.Id ON SearchHistoryItems.SearchHistoryId = SearchHistory.Id
GROUP BY SearchHistory.Id, SearchHistory.SeriesId, SearchHistory.SeasonNumber, GROUP BY SearchHistory.Id, SearchHistory.SeriesId, SearchHistory.SeasonNumber,
SearchHistory.EpisodeId, SearchHistory.SearchTime, SearchHistory.EpisodeId, SearchHistory.SearchTime,

BIN
NzbDrone.Web/Content/Images/apple-touch-icon-114.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
NzbDrone.Web/Content/Images/apple-touch-icon-144.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

2
NzbDrone.Web/NzbDrone.Web.csproj
View File

@ -208,6 +208,8 @@
<Content Include="Content\font-awesome-ie7.css" /> <Content Include="Content\font-awesome-ie7.css" />
<Content Include="Content\font-awesome.css" /> <Content Include="Content\font-awesome.css" />
<Content Include="Content\font\fontawesome-webfont.svg" /> <Content Include="Content\font\fontawesome-webfont.svg" />
<Content Include="Content\Images\apple-touch-icon-114.png" />
<Content Include="Content\Images\apple-touch-icon-144.png" />
<Content Include="Content\SeriesEditor.css" /> <Content Include="Content\SeriesEditor.css" />
<Content Include="Content\DataTables-NzbDrone\media\css\jquery.dataTables.css" /> <Content Include="Content\DataTables-NzbDrone\media\css\jquery.dataTables.css" />
<Content Include="Content\DataTables-NzbDrone\media\images\back.png" /> <Content Include="Content\DataTables-NzbDrone\media\images\back.png" />

10
NzbDrone.Web/Views/Shared/_ReferenceLayout.cshtml
View File

@ -6,6 +6,16 @@
<head runat="server"> <head runat="server">
@this.InitClientTimings() @this.InitClientTimings()
<link rel="SHORTCUT ICON" href="../../favicon.ico" /> <link rel="SHORTCUT ICON" href="../../favicon.ico" />
<!-- Standard iPhone -->
<link rel="apple-touch-icon" sizes="57x57" href="../../Content/Images/apple-touch-icon-114.png" />
<!-- Retina iPhone -->
<link rel="apple-touch-icon" sizes="114x114" href="../../Content/Images/apple-touch-icon-114.png" />
<!-- Standard iPad -->
<link rel="apple-touch-icon" sizes="72x72" href="../../Content/Images/apple-touch-icon-144.png" />
<!-- Retina iPad -->
<link rel="apple-touch-icon" sizes="144x144" href="../../Content/Images/apple-touch-icon-144.png" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta http-equiv="X-UA-Compatible" content="IE=edge" />
<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,300' rel='stylesheet' type='text/css'> <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,300' rel='stylesheet' type='text/css'>
@Html.IncludeCss("jQueryUI/jquery-ui-1.8.16.custom.css") @Html.IncludeCss("jQueryUI/jquery-ui-1.8.16.custom.css")