open-source-mirrors
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactored BacklogProvider

Browse Source 
Fixed some issues with root folder and settings controller
pull/3113/head
Keivan 14 years ago
parent e62cb3b5da
commit 613a49c3ea
5 changed files with 97 additions and 88 deletions
Show Stats Download Patch File Download Diff File

2
IISExpress/AppServer/applicationhost.config
Unescape View File

@ -148,7 +148,7 @@
<virtualDirectory path="/" physicalPath="%NZBDRONE_PATH%\NZBDrone.Web" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:8989:" />
<binding protocol="http" bindingInformation="*:8111:" />
</bindings>
</site>
<siteDefaults>

127
NzbDrone.Core/Providers/BacklogProvider.cs
Unescape View File

@ -121,91 +121,94 @@ namespace NzbDrone.Core.Providers
foreach (var series in _seriesList)
{
try
{
//Do the searching here
_backlogSearchNotification.CurrentStatus = String.Format("Backlog Searching For: {0}", series.Title);
BackLogSeries(series);
}
var sceneNames = SceneNameHelper.FindById(series.SeriesId);
_backlogSearchNotification.CurrentStatus = "Backlog Search Completed";
Logger.Info("Backlog Search has successfully completed.");
Thread.Sleep(3000);
_backlogSearchNotification.Status = ProgressNotificationStatus.Completed;
}
}
if (sceneNames.Count < 1)
sceneNames.Add(series.Title);
catch (Exception ex)
{
Logger.WarnException(ex.Message, ex);
}
}
private void BackLogSeries(Series series)
{
try
{
//Do the searching here
_backlogSearchNotification.CurrentStatus = String.Format("Backlog Searching For: {0}", series.Title);
foreach (var season in series.Seasons)
{
var episodesWithoutFiles = season.Episodes.Where(e => e.EpisodeFileId == 0);
var sceneNames = SceneNameHelper.FindById(series.SeriesId);
if (season.Episodes.Count() == episodesWithoutFiles.Count())
{
//Whole season needs to be grabbed, look for the whole season first
//Lookup scene name using seriesId
if (sceneNames.Count < 1)
sceneNames.Add(series.Title);
foreach (var sceneName in sceneNames)
{
var searchString = String.Format("{0} Season {1}", sceneName,
season.SeasonNumber);
foreach (var season in series.Seasons)
{
BackLogSeason(sceneNames, season);
}
//Done searching for each episode
}
foreach (var i in _indexerProvider.EnabledIndexers())
{
//Get the users URL
GetUsersUrl(i, searchString);
catch (Exception ex)
{
Logger.WarnException(ex.Message, ex);
}
//If the url still contains '{' & '}' the user probably hasn't configured the indexer settings
if (i.ApiUrl.Contains("{") && i.ApiUrl.Contains("}"))
{
Logger.Debug("Unable to Sync {0}. User Information has not been configured.", i.IndexerName);
continue; //Skip this indexer
}
_backlogSearchNotification.ProgressValue++;
}
var indexer = new FeedInfoModel(i.IndexerName, i.ApiUrl);
private void BackLogSeason(List<string> sceneNames, Season season)
{
var episodesWithoutFiles = season.Episodes.Where(e => e.EpisodeFileId == 0);
var feedItems = _rssProvider.GetFeed(indexer);
if (season.Episodes.Count() == episodesWithoutFiles.Count())
{
//Whole season needs to be grabbed, look for the whole season first
//Lookup scene name using seriesId
if (feedItems.Count() == 0)
{
Logger.Debug("Failed to download Backlog Search URL: {0}", indexer.Name);
continue; //No need to process anything else
}
foreach (var sceneName in sceneNames)
{
var searchString = String.Format("{0} Season {1}", sceneName,
season.SeasonNumber);
foreach (RssItem item in feedItems)
{
NzbInfoModel nzb = Parser.ParseNzbInfo(indexer, item);
QueueSeasonIfWanted(nzb, i);
}
foreach (var i in _indexerProvider.EnabledIndexers())
{
//Get the users URL
GetUsersUrl(i, searchString);
}
}
}
//If the url still contains '{' & '}' the user probably hasn't configured the indexer settings
if (i.ApiUrl.Contains("{") && i.ApiUrl.Contains("}"))
{
Logger.Debug("Unable to Sync {0}. User Information has not been configured.", i.IndexerName);
continue; //Skip this indexer
}
else
{
//Grab the episodes 1-by-1 (or in smaller chunks)
var indexer = new FeedInfoModel(i.IndexerName, i.ApiUrl);
}
var feedItems = _rssProvider.GetFeed(indexer);
}
//Done searching for each episode
if (feedItems.Count() == 0)
{
Logger.Debug("Failed to download Backlog Search URL: {0}", indexer.Name);
continue; //No need to process anything else
}
catch (Exception ex)
foreach (RssItem item in feedItems)
{
Logger.WarnException(ex.Message, ex);
NzbInfoModel nzb = Parser.ParseNzbInfo(indexer, item);
QueueSeasonIfWanted(nzb, i);
}
_backlogSearchNotification.ProgressValue++;
}
_backlogSearchNotification.CurrentStatus = "Backlog Search Completed";
Logger.Info("Backlog Search has successfully completed.");
Thread.Sleep(3000);
_backlogSearchNotification.Status = ProgressNotificationStatus.Completed;
}
}
catch (Exception ex)
{
Logger.WarnException(ex.Message, ex);
}
}
private void GetUsersUrl(Indexer indexer, string searchString)

43
NzbDrone.Web/Controllers/SettingsController.cs
Unescape View File

@ -24,8 +24,8 @@ namespace NzbDrone.Web.Controllers
private IRootDirProvider _rootDirProvider;
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
private string _settingsSaved = "Settings Saved.";
private string _settingsFailed = "Error Saving Settings, please fix any errors";
private const string SETTINGS_SAVED = "Settings Saved.";
private const string SETTINGS_FAILED = "Error Saving Settings, please fix any errors";
public SettingsController(IConfigProvider configProvider, IIndexerProvider indexerProvider,
IQualityProvider qualityProvider, IRootDirProvider rootDirProvider)
@ -50,10 +50,10 @@ namespace NzbDrone.Web.Controllers
public ActionResult General()
{
ViewData["viewName"] = "General";
return View("Index", new SettingsModel
{
Directories = new List<RootDir>()
Directories = _rootDirProvider.GetAll()
});
}
@ -211,11 +211,14 @@ namespace NzbDrone.Web.Controllers
[HttpPost]
public ActionResult SaveGeneral(SettingsModel data)
{
if (data.Directories.Count > 0)
if (data.Directories != null && data.Directories.Count > 0)
{
//If the Javascript was beaten we need to return an error
if (!data.Directories.Exists(d => d.Default))
return Content(_settingsFailed);
/*
* Kay.one: I can't see what its doing, all it does it dooesn't let me s.
* if (!data.Directories.Exists(d => d.Default))
return Content(SETTINGS_FAILED);*/
var currentRootDirs = _rootDirProvider.GetAll();
@ -235,10 +238,10 @@ namespace NzbDrone.Web.Controllers
_rootDirProvider.Update(dir);
}
return Content(_settingsSaved);
return Content(SETTINGS_SAVED);
}
return Content(_settingsFailed);
return Content(SETTINGS_FAILED);
}
[HttpPost]
@ -257,10 +260,10 @@ namespace NzbDrone.Web.Controllers
_configProvider.SetValue("NzbsrusUId", data.NzbsrusUId);
_configProvider.SetValue("NzbsrusHash", data.NzbsrusHash);
return Content(_settingsSaved);
return Content(SETTINGS_SAVED);
}
return Content(_settingsFailed);
return Content(SETTINGS_FAILED);
}
[HttpPost]
@ -281,10 +284,10 @@ namespace NzbDrone.Web.Controllers
_configProvider.SetValue("UseBlackhole", data.UseBlackHole.ToString());
_configProvider.SetValue("BlackholeDirectory", data.BlackholeDirectory);
return Content(_settingsSaved);
return Content(SETTINGS_SAVED);
}
return Content(_settingsFailed);
return Content(SETTINGS_FAILED);
}
[HttpPost]
@ -296,7 +299,7 @@ namespace NzbDrone.Web.Controllers
//Saves only the Default Quality, skips User Profiles since none exist
if (data.UserProfiles == null)
return Content(_settingsSaved);
return Content(SETTINGS_SAVED);
foreach (var dbProfile in _qualityProvider.GetAllProfiles().Where(q => q.UserProfile))
{
@ -326,11 +329,11 @@ namespace NzbDrone.Web.Controllers
else
_qualityProvider.Add(profile);
return Content(_settingsSaved);
return Content(SETTINGS_SAVED);
}
}
return Content(_settingsFailed);
return Content(SETTINGS_FAILED);
}
[HttpPost]
@ -353,10 +356,10 @@ namespace NzbDrone.Web.Controllers
_configProvider.SetValue("XbmcUsername", data.XbmcUsername);
_configProvider.SetValue("XbmcPassword", data.XbmcPassword);
return Content(_settingsSaved);
return Content(SETTINGS_SAVED);
}
return Content(_settingsFailed);
return Content(SETTINGS_FAILED);
}
[HttpPost]
@ -375,10 +378,10 @@ namespace NzbDrone.Web.Controllers
_configProvider.SetValue("Sorting_NumberStyle", data.NumberStyle.ToString());
_configProvider.SetValue("Sorting_MultiEpisodeStyle", data.MultiEpisodeStyle.ToString());
return Content(_settingsSaved);
return Content(SETTINGS_SAVED);
}
return Content(_settingsFailed);
return Content(SETTINGS_FAILED);
}
}
}

11
NzbDrone/ProcessAttacher.cs
Unescape View File

@ -7,6 +7,7 @@
#if DEBUG
using System;
using System.Collections.Generic;
using EnvDTE;
using EnvDTE80;
namespace NzbDrone
@ -21,6 +22,8 @@ namespace NzbDrone
ManagedAndNative
}
private enum AttachResult
{
Attached,
@ -40,7 +43,7 @@ namespace NzbDrone
}
#region private
#region private
private readonly Dictionary<AttachType, string> _attachTypesMap;
private readonly DTE2 _dte;
@ -49,7 +52,7 @@ namespace NzbDrone
#endregion
#region ctor
#region ctor
private ProcessAttacher(DTE2 dte, string processName, int waitTimeout)
{
@ -63,7 +66,7 @@ namespace NzbDrone
#endregion
#region private methods
#region private methods
private AttachResult Attach(AttachType attachType)
{
@ -130,7 +133,7 @@ namespace NzbDrone
#endregion
#region public methods
#region public methods
public void OptimisticAttachManaged()

2
NzbDrone/app.config
Unescape View File

@ -4,6 +4,6 @@
<supportedRuntime version="v4.0" />
</startup>
<appSettings>
<add key="port" value="8989" />
<add key="port" value="8111" />
</appSettings>
</configuration>
Write Preview
Loading…
Cancel
Save