github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-21 05:53:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of git://github.com/kayone/NzbDrone

Browse source 
Conflicts:
	NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
This commit is contained in:
Mark McDowall 2011-07-09 19:48:02 -07:00
commit 67299f0d97
80 changed files with 3341 additions and 1496 deletions
Download patch file Download diff file Expand all files Collapse all files

17
NzbDrone.Web/Controllers/AddSeriesController.cs
View file

@ -49,17 +49,12 @@ namespace NzbDrone.Web.Controllers
public ActionResult AddNew()
{
var rootDirs = _rootFolderProvider.GetAll().Select(r =>
new RootDirModel
{
Path = r.Path,
CleanPath = r.Path.Replace(Path.DirectorySeparatorChar, '|').Replace(Path.VolumeSeparatorChar, '^').Replace('\'', '`')
});
ViewData["RootDirs"] = rootDirs.ToList();
ViewData["DirSep"] = Path.DirectorySeparatorChar.ToString().Replace(Path.DirectorySeparatorChar, '|');
ViewData["RootDirs"] = _rootFolderProvider.GetAll().Select(c => c.Path).OrderBy(e => e).ToList();
var defaultQuality = _configProvider.DefaultQualityProfile;
var qualityProfiles = _qualityProvider.GetAllProfiles();
var qualityProfiles = _qualityProvider.All();
ViewData["qualityList"] = qualityProfiles;
ViewData["quality"] = new SelectList(
qualityProfiles,
@ -74,7 +69,7 @@ namespace NzbDrone.Web.Controllers
{
var rootDirs = _rootFolderProvider.GetAll();
var profiles = _qualityProvider.GetAllProfiles();
var profiles = _qualityProvider.All();
var defaultQuality = Convert.ToInt32(_configProvider.DefaultQualityProfile);
var selectList = new SelectList(profiles, "QualityProfileId", "Name", defaultQuality);
ViewData["qualities"] = selectList;
@ -111,7 +106,7 @@ namespace NzbDrone.Web.Controllers
ViewData["javaPath"] = path.Replace(Path.DirectorySeparatorChar, '|').Replace(Path.VolumeSeparatorChar, '^').Replace('\'', '`');
var defaultQuality = _configProvider.DefaultQualityProfile;
var qualityProfiles = _qualityProvider.GetAllProfiles();
var qualityProfiles = _qualityProvider.All();
ViewData["quality"] = new SelectList(
qualityProfiles,

2
NzbDrone.Web/Controllers/SeriesController.cs
View file

@ -41,7 +41,7 @@ namespace NzbDrone.Web.Controllers
public ActionResult Index()
{
var profiles = _qualityProvider.GetAllProfiles();
var profiles = _qualityProvider.All();
ViewData["SelectList"] = new SelectList(profiles, "QualityProfileId", "Name");
return View();

36
NzbDrone.Web/Controllers/SettingsController.cs
View file

@ -116,7 +116,7 @@ namespace NzbDrone.Web.Controllers
ViewData["Qualities"] = qualityTypes;
var profiles = _qualityProvider.GetAllProfiles().ToList();
var profiles = _qualityProvider.All().ToList();
foreach (var qualityProfile in profiles)
{
@ -157,15 +157,15 @@ namespace NzbDrone.Web.Controllers
{
var model = new EpisodeSortingModel();
model.SeriesName = _configProvider.SeriesName;
model.EpisodeName = _configProvider.EpisodeName;
model.ReplaceSpaces = _configProvider.ReplaceSpaces;
model.AppendQuality = _configProvider.AppendQuality;
model.SeriesName = _configProvider.SortingIncludeSeriesName;
model.EpisodeName = _configProvider.SortingIncludeEpisodeTitle;
model.ReplaceSpaces = _configProvider.SortingReplaceSpaces;
model.AppendQuality = _configProvider.SortingAppendQuality;
model.SeasonFolders = _configProvider.UseSeasonFolder;
model.SeasonFolderFormat = _configProvider.SeasonFolderFormat;
model.SeparatorStyle = _configProvider.SeparatorStyle;
model.NumberStyle = _configProvider.NumberStyle;
model.MultiEpisodeStyle = _configProvider.MultiEpisodeStyle;
model.SeasonFolderFormat = _configProvider.SortingSeasonFolderFormat;
model.SeparatorStyle = _configProvider.SortingSeparatorStyle;
model.NumberStyle = _configProvider.SortingNumberStyle;
model.MultiEpisodeStyle = _configProvider.SortingMultiEpisodeStyle;
model.SeparatorStyles = new SelectList(EpisodeSortingHelper.GetSeparatorStyles(), "Id", "Name");
model.NumberStyles = new SelectList(EpisodeSortingHelper.GetNumberStyles(), "Id", "Name");
@ -223,7 +223,7 @@ namespace NzbDrone.Web.Controllers
public QualityModel GetUpdatedProfileList()
{
var profiles = _qualityProvider.GetAllProfiles().ToList();
var profiles = _qualityProvider.All().ToList();
var defaultQualityQualityProfileId =
Convert.ToInt32(_configProvider.GetValue("DefaultQualityProfile", profiles[0].QualityProfileId));
var selectList = new SelectList(profiles, "QualityProfileId", "Name");
@ -423,15 +423,15 @@ namespace NzbDrone.Web.Controllers
if (ModelState.IsValid)
{
_configProvider.SeriesName = data.SeriesName;
_configProvider.EpisodeName = data.EpisodeName;
_configProvider.ReplaceSpaces = data.ReplaceSpaces;
_configProvider.AppendQuality = data.AppendQuality;
_configProvider.SortingIncludeSeriesName = data.SeriesName;
_configProvider.SortingIncludeEpisodeTitle = data.EpisodeName;
_configProvider.SortingReplaceSpaces = data.ReplaceSpaces;
_configProvider.SortingAppendQuality = data.AppendQuality;
_configProvider.UseSeasonFolder = data.SeasonFolders;
_configProvider.SeasonFolderFormat = data.SeasonFolderFormat;
_configProvider.SeparatorStyle = data.SeparatorStyle;
_configProvider.NumberStyle = data.NumberStyle;
_configProvider.MultiEpisodeStyle = data.MultiEpisodeStyle;
_configProvider.SortingSeasonFolderFormat = data.SeasonFolderFormat;
_configProvider.SortingSeparatorStyle = data.SeparatorStyle;
_configProvider.SortingNumberStyle = data.NumberStyle;
_configProvider.SortingMultiEpisodeStyle = data.MultiEpisodeStyle;
basicNotification.Title = SETTINGS_SAVED;
_notificationProvider.Register(basicNotification);

2
NzbDrone.Web/Controllers/SystemController.cs
View file

@ -33,7 +33,7 @@ namespace NzbDrone.Web.Controllers
public ActionResult Indexers()
{
return View(_indexerProvider.GetAllISettings());
return View(_indexerProvider.All());
}