Mirrors/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-10-30 23:42:33 +01:00
Code Issues Releases Wiki Activity

Merge branch 'markus101'

Browse Source
This commit is contained in:
kay.one 2011-06-21 18:17:03 -07:00
commit 31c16b9004
7 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -241,8 +241,6 @@ namespace NzbDrone.Core.Providers
tvDbSeriesInfo.SeriesName, successCount, failCount);
}
public virtual void UpdateEpisode(Episode episode)
{
_database.Update(episode);

26
NzbDrone.Core/Providers/SeriesProvider.cs
View File

@ -118,19 +118,29 @@ namespace NzbDrone.Core.Providers
public virtual Series FindSeries(string title)
{
var normalizeTitle = Parser.NormalizeTitle(title);
var seriesId = _sceneNameMappingProvider.GetSeriesId(normalizeTitle);
if (seriesId != null)
try
{
return GetSeries(seriesId.Value);
}
var normalizeTitle = Parser.NormalizeTitle(title);
var series = _database.Fetch<Series, QualityProfile>(@"SELECT * FROM Series
var seriesId = _sceneNameMappingProvider.GetSeriesId(normalizeTitle);
if (seriesId != null)
{
return GetSeries(seriesId.Value);
}
var series = _database.Fetch<Series, QualityProfile>(@"SELECT * FROM Series
INNER JOIN QualityProfiles ON Series.QualityProfileId = QualityProfiles.QualityProfileId
WHERE CleanTitle = @0", normalizeTitle).FirstOrDefault();
return series;
return series;
}
//This will catch InvalidOperationExceptions that may be thrown for GetSeries due to the series being in SceneMapping, but not in the users Database
catch (InvalidOperationException ex)
{
Logger.DebugException(ex.Message, ex);
return null;
}
}
public virtual void UpdateSeries(Series series)

2
NzbDrone.Core/Repository/Series.cs
View File

@ -46,7 +46,7 @@ namespace NzbDrone.Core.Repository
[Ignore]
public bool Hidden { get; set; }
[Ignore]
[ResultColumn]
public QualityProfile QualityProfile { get; set; }
[ResultColumn]

1
NzbDrone.Web/Controllers/AddSeriesController.cs
View File

@ -215,6 +215,7 @@ namespace NzbDrone.Web.Controllers
{
Id = 0,
Path = "",
CleanPath = "",
SelectList = new SelectList(new List<string> { "" }, "")
};

7
NzbDrone.Web/Controllers/HistoryController.cs
View File

@ -12,15 +12,10 @@ namespace NzbDrone.Web.Controllers
public class HistoryController : Controller
{
private readonly HistoryProvider _historyProvider;
private readonly EpisodeProvider _episodeProvider;
private readonly SeriesProvider _seriesProvider;
public HistoryController(HistoryProvider historyProvider, EpisodeProvider episodeProvider,
SeriesProvider seriesProvider)
public HistoryController(HistoryProvider historyProvider)
{
_historyProvider = historyProvider;
_episodeProvider = episodeProvider;
_seriesProvider = seriesProvider;
}
//

4
NzbDrone.Web/Controllers/UpcomingController.cs
View File

@ -11,12 +11,10 @@ namespace NzbDrone.Web.Controllers
public class UpcomingController : Controller
{
private readonly UpcomingEpisodesProvider _upcomingEpisodesProvider;
private readonly SeriesProvider _seriesProvider;
public UpcomingController(UpcomingEpisodesProvider upcomingEpisodesProvider, SeriesProvider seriesProvider)
public UpcomingController(UpcomingEpisodesProvider upcomingEpisodesProvider)
{
_upcomingEpisodesProvider = upcomingEpisodesProvider;
_seriesProvider = seriesProvider;
}
//

8
NzbDrone.Web/Views/AddSeries/Index.cshtml
View File

@ -1,7 +1,13 @@
@model List<RootDir>
@using NzbDrone.Core.Repository
<script type="text/javascript" src="../../Scripts/2011.1.315/telerik.window.min.js"></script>
@{ Html.Telerik().ScriptRegistrar().DefaultGroup(group => group
.Add("telerik.common.min.js")
.Add("telerik.draganddrop.min.js")
.Add("telerik.window.min.js")
.Add("telerik.panelbar.min.js")
.Add("telerik.list.min.js")
.Add("telerik.combobox.min.js")); }
<style>
.root_dir_text