mirror of https://github.com/Sonarr/Sonarr
Ninject is now forced to use proper constructor.
This commit is contained in:
parent
5293d0e204
commit
add780b431
|
@ -86,7 +86,6 @@ namespace NzbDrone.Core
|
||||||
_kernel.Bind<ExternalNotificationProvider>().ToSelf().InSingletonScope();
|
_kernel.Bind<ExternalNotificationProvider>().ToSelf().InSingletonScope();
|
||||||
_kernel.Bind<XbmcProvider>().ToSelf().InSingletonScope();
|
_kernel.Bind<XbmcProvider>().ToSelf().InSingletonScope();
|
||||||
_kernel.Bind<ConfigProvider>().To<ConfigProvider>().InSingletonScope();
|
_kernel.Bind<ConfigProvider>().To<ConfigProvider>().InSingletonScope();
|
||||||
_kernel.Bind<SyncProvider>().ToSelf().InSingletonScope();
|
|
||||||
_kernel.Bind<NotificationProvider>().ToSelf().InSingletonScope();
|
_kernel.Bind<NotificationProvider>().ToSelf().InSingletonScope();
|
||||||
_kernel.Bind<LogProvider>().ToSelf().InSingletonScope();
|
_kernel.Bind<LogProvider>().ToSelf().InSingletonScope();
|
||||||
_kernel.Bind<MediaFileProvider>().ToSelf().InSingletonScope();
|
_kernel.Bind<MediaFileProvider>().ToSelf().InSingletonScope();
|
||||||
|
|
|
@ -13,9 +13,6 @@ namespace NzbDrone.Core.Providers
|
||||||
{
|
{
|
||||||
public class AutoConfigureProvider
|
public class AutoConfigureProvider
|
||||||
{
|
{
|
||||||
public AutoConfigureProvider()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public SabnzbdInfoModel AutoConfigureSab()
|
public SabnzbdInfoModel AutoConfigureSab()
|
||||||
{
|
{
|
||||||
|
@ -29,8 +26,7 @@ namespace NzbDrone.Core.Providers
|
||||||
var info =
|
var info =
|
||||||
ipProperties.GetActiveTcpListeners().Select(
|
ipProperties.GetActiveTcpListeners().Select(
|
||||||
p =>
|
p =>
|
||||||
new ConnectionInfoModel
|
new ConnectionInfoModel { Address = p.Address.ToString().Replace("0.0.0.0", "127.0.0.1"), Port = p.Port }).Distinct().
|
||||||
{Address = p.Address.ToString().Replace("0.0.0.0", "127.0.0.1"), Port = p.Port}).Distinct().
|
|
||||||
ToList();
|
ToList();
|
||||||
|
|
||||||
info.RemoveAll(i => i.Port == 135);
|
info.RemoveAll(i => i.Port == 135);
|
||||||
|
@ -51,7 +47,8 @@ namespace NzbDrone.Core.Providers
|
||||||
{
|
{
|
||||||
var apiKey = GetApiKey(connection.Address, connection.Port);
|
var apiKey = GetApiKey(connection.Address, connection.Port);
|
||||||
if (!String.IsNullOrEmpty(apiKey))
|
if (!String.IsNullOrEmpty(apiKey))
|
||||||
return new SabnzbdInfoModel {
|
return new SabnzbdInfoModel
|
||||||
|
{
|
||||||
Host = connection.Address,
|
Host = connection.Address,
|
||||||
Port = connection.Port,
|
Port = connection.Port,
|
||||||
ApiKey = apiKey
|
ApiKey = apiKey
|
||||||
|
|
|
@ -1,19 +0,0 @@
|
||||||
using System;
|
|
||||||
|
|
||||||
namespace NzbDrone.Core.Providers
|
|
||||||
{
|
|
||||||
public class BacklogProvider
|
|
||||||
{
|
|
||||||
//Will provide Backlog Search functionality
|
|
||||||
|
|
||||||
public virtual bool StartSearch()
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual bool StartSearch(int seriesId)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,6 +1,7 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using Ninject;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Core.Model;
|
using NzbDrone.Core.Model;
|
||||||
using NzbDrone.Core.Repository;
|
using NzbDrone.Core.Repository;
|
||||||
|
@ -13,6 +14,7 @@ namespace NzbDrone.Core.Providers.Core
|
||||||
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
||||||
private readonly IRepository _repository;
|
private readonly IRepository _repository;
|
||||||
|
|
||||||
|
[Inject]
|
||||||
public ConfigProvider(IRepository repository)
|
public ConfigProvider(IRepository repository)
|
||||||
{
|
{
|
||||||
_repository = repository;
|
_repository = repository;
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using Ninject;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Core.Model;
|
using NzbDrone.Core.Model;
|
||||||
using NzbDrone.Core.Providers.Core;
|
using NzbDrone.Core.Providers.Core;
|
||||||
|
@ -17,6 +18,7 @@ namespace NzbDrone.Core.Providers
|
||||||
private readonly EpisodeProvider _episodeProvider;
|
private readonly EpisodeProvider _episodeProvider;
|
||||||
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
[Inject]
|
||||||
public DownloadProvider(SabProvider sabProvider, HistoryProvider historyProvider, EpisodeProvider episodeProvider)
|
public DownloadProvider(SabProvider sabProvider, HistoryProvider historyProvider, EpisodeProvider episodeProvider)
|
||||||
{
|
{
|
||||||
_sabProvider = sabProvider;
|
_sabProvider = sabProvider;
|
||||||
|
|
Binary file not shown.
|
@ -1,6 +1,7 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using Ninject;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Core.Helpers;
|
using NzbDrone.Core.Helpers;
|
||||||
using NzbDrone.Core.Model;
|
using NzbDrone.Core.Model;
|
||||||
|
@ -16,6 +17,7 @@ namespace NzbDrone.Core.Providers
|
||||||
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
||||||
private readonly IRepository _repository;
|
private readonly IRepository _repository;
|
||||||
|
|
||||||
|
[Inject]
|
||||||
public ExternalNotificationProvider(IRepository repository)
|
public ExternalNotificationProvider(IRepository repository)
|
||||||
{
|
{
|
||||||
_repository = repository;
|
_repository = repository;
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using Ninject;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Core.Model;
|
using NzbDrone.Core.Model;
|
||||||
using NzbDrone.Core.Repository;
|
using NzbDrone.Core.Repository;
|
||||||
|
@ -14,6 +15,7 @@ namespace NzbDrone.Core.Providers
|
||||||
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
||||||
private readonly IRepository _repository;
|
private readonly IRepository _repository;
|
||||||
|
|
||||||
|
[Inject]
|
||||||
public HistoryProvider(IRepository repository)
|
public HistoryProvider(IRepository repository)
|
||||||
{
|
{
|
||||||
_repository = repository;
|
_repository = repository;
|
||||||
|
|
|
@ -3,6 +3,7 @@ using System.Collections.Generic;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using System.ServiceModel.Syndication;
|
using System.ServiceModel.Syndication;
|
||||||
using System.Web;
|
using System.Web;
|
||||||
|
using Ninject;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Core.Model;
|
using NzbDrone.Core.Model;
|
||||||
using NzbDrone.Core.Providers.Core;
|
using NzbDrone.Core.Providers.Core;
|
||||||
|
@ -15,6 +16,7 @@ namespace NzbDrone.Core.Providers.Indexer
|
||||||
private readonly HttpProvider _httpProvider;
|
private readonly HttpProvider _httpProvider;
|
||||||
protected readonly ConfigProvider _configProvider;
|
protected readonly ConfigProvider _configProvider;
|
||||||
|
|
||||||
|
[Inject]
|
||||||
protected IndexerBase(HttpProvider httpProvider, ConfigProvider configProvider)
|
protected IndexerBase(HttpProvider httpProvider, ConfigProvider configProvider)
|
||||||
{
|
{
|
||||||
_httpProvider = httpProvider;
|
_httpProvider = httpProvider;
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using System.ServiceModel.Syndication;
|
using System.ServiceModel.Syndication;
|
||||||
|
using Ninject;
|
||||||
using NzbDrone.Core.Model;
|
using NzbDrone.Core.Model;
|
||||||
using NzbDrone.Core.Providers.Core;
|
using NzbDrone.Core.Providers.Core;
|
||||||
using NzbDrone.Core.Providers.ExternalNotification;
|
using NzbDrone.Core.Providers.ExternalNotification;
|
||||||
|
@ -10,6 +11,7 @@ namespace NzbDrone.Core.Providers.Indexer
|
||||||
{
|
{
|
||||||
public class Newzbin : IndexerBase
|
public class Newzbin : IndexerBase
|
||||||
{
|
{
|
||||||
|
[Inject]
|
||||||
public Newzbin(HttpProvider httpProvider, ConfigProvider configProvider)
|
public Newzbin(HttpProvider httpProvider, ConfigProvider configProvider)
|
||||||
: base(httpProvider, configProvider)
|
: base(httpProvider, configProvider)
|
||||||
{
|
{
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using System.ServiceModel.Syndication;
|
using System.ServiceModel.Syndication;
|
||||||
|
using Ninject;
|
||||||
using NzbDrone.Core.Model;
|
using NzbDrone.Core.Model;
|
||||||
using NzbDrone.Core.Providers.Core;
|
using NzbDrone.Core.Providers.Core;
|
||||||
using NzbDrone.Core.Providers.ExternalNotification;
|
using NzbDrone.Core.Providers.ExternalNotification;
|
||||||
|
@ -11,6 +12,7 @@ namespace NzbDrone.Core.Providers.Indexer
|
||||||
{
|
{
|
||||||
public class NzbMatrix : IndexerBase
|
public class NzbMatrix : IndexerBase
|
||||||
{
|
{
|
||||||
|
[Inject]
|
||||||
public NzbMatrix(HttpProvider httpProvider, ConfigProvider configProvider) : base(httpProvider, configProvider)
|
public NzbMatrix(HttpProvider httpProvider, ConfigProvider configProvider) : base(httpProvider, configProvider)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using System.ServiceModel.Syndication;
|
using System.ServiceModel.Syndication;
|
||||||
|
using Ninject;
|
||||||
using NzbDrone.Core.Model;
|
using NzbDrone.Core.Model;
|
||||||
using NzbDrone.Core.Providers.Core;
|
using NzbDrone.Core.Providers.Core;
|
||||||
using NzbDrone.Core.Providers.ExternalNotification;
|
using NzbDrone.Core.Providers.ExternalNotification;
|
||||||
|
@ -11,6 +12,7 @@ namespace NzbDrone.Core.Providers.Indexer
|
||||||
{
|
{
|
||||||
public class NzbsOrg : IndexerBase
|
public class NzbsOrg : IndexerBase
|
||||||
{
|
{
|
||||||
|
[Inject]
|
||||||
public NzbsOrg(HttpProvider httpProvider, ConfigProvider configProvider)
|
public NzbsOrg(HttpProvider httpProvider, ConfigProvider configProvider)
|
||||||
: base(httpProvider, configProvider)
|
: base(httpProvider, configProvider)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using System.ServiceModel.Syndication;
|
using System.ServiceModel.Syndication;
|
||||||
|
using Ninject;
|
||||||
using NzbDrone.Core.Model;
|
using NzbDrone.Core.Model;
|
||||||
using NzbDrone.Core.Providers.Core;
|
using NzbDrone.Core.Providers.Core;
|
||||||
using NzbDrone.Core.Providers.ExternalNotification;
|
using NzbDrone.Core.Providers.ExternalNotification;
|
||||||
|
@ -10,6 +11,7 @@ namespace NzbDrone.Core.Providers.Indexer
|
||||||
{
|
{
|
||||||
public class NzbsRUs : IndexerBase
|
public class NzbsRUs : IndexerBase
|
||||||
{
|
{
|
||||||
|
[Inject]
|
||||||
public NzbsRUs(HttpProvider httpProvider, ConfigProvider configProvider) : base(httpProvider, configProvider)
|
public NzbsRUs(HttpProvider httpProvider, ConfigProvider configProvider) : base(httpProvider, configProvider)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using Ninject;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Core.Providers.Indexer;
|
using NzbDrone.Core.Providers.Indexer;
|
||||||
using NzbDrone.Core.Repository;
|
using NzbDrone.Core.Repository;
|
||||||
|
@ -15,6 +16,7 @@ namespace NzbDrone.Core.Providers
|
||||||
|
|
||||||
private IList<IndexerBase> _indexers = new List<IndexerBase>();
|
private IList<IndexerBase> _indexers = new List<IndexerBase>();
|
||||||
|
|
||||||
|
[Inject]
|
||||||
public IndexerProvider(IRepository repository)
|
public IndexerProvider(IRepository repository)
|
||||||
{
|
{
|
||||||
_repository = repository;
|
_repository = repository;
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using Ninject;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Core.Model;
|
using NzbDrone.Core.Model;
|
||||||
using NzbDrone.Core.Repository;
|
using NzbDrone.Core.Repository;
|
||||||
|
@ -15,6 +16,7 @@ namespace NzbDrone.Core.Providers
|
||||||
|
|
||||||
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
[Inject]
|
||||||
public InventoryProvider(SeriesProvider seriesProvider, EpisodeProvider episodeProvider, HistoryProvider historyProvider)
|
public InventoryProvider(SeriesProvider seriesProvider, EpisodeProvider episodeProvider, HistoryProvider historyProvider)
|
||||||
{
|
{
|
||||||
_seriesProvider = seriesProvider;
|
_seriesProvider = seriesProvider;
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using Ninject;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Core.Model.Notification;
|
using NzbDrone.Core.Model.Notification;
|
||||||
using NzbDrone.Core.Repository;
|
using NzbDrone.Core.Repository;
|
||||||
|
@ -14,6 +15,7 @@ namespace NzbDrone.Core.Providers.Jobs
|
||||||
|
|
||||||
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
[Inject]
|
||||||
public DeleteSeriesJob(SeriesProvider seriesProvider)
|
public DeleteSeriesJob(SeriesProvider seriesProvider)
|
||||||
{
|
{
|
||||||
_seriesProvider = seriesProvider;
|
_seriesProvider = seriesProvider;
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
using Ninject;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Core.Model.Notification;
|
using NzbDrone.Core.Model.Notification;
|
||||||
using NzbDrone.Core.Repository;
|
using NzbDrone.Core.Repository;
|
||||||
|
@ -14,6 +15,7 @@ namespace NzbDrone.Core.Providers.Jobs
|
||||||
private readonly MediaFileProvider _mediaFileProvider;
|
private readonly MediaFileProvider _mediaFileProvider;
|
||||||
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
[Inject]
|
||||||
public DiskScanJob(SeriesProvider seriesProvider, MediaFileProvider mediaFileProvider)
|
public DiskScanJob(SeriesProvider seriesProvider, MediaFileProvider mediaFileProvider)
|
||||||
{
|
{
|
||||||
_seriesProvider = seriesProvider;
|
_seriesProvider = seriesProvider;
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using Ninject;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Core.Helpers;
|
using NzbDrone.Core.Helpers;
|
||||||
using NzbDrone.Core.Model;
|
using NzbDrone.Core.Model;
|
||||||
|
@ -20,6 +21,7 @@ namespace NzbDrone.Core.Providers.Jobs
|
||||||
|
|
||||||
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
[Inject]
|
||||||
public EpisodeSearchJob(InventoryProvider inventoryProvider, DownloadProvider downloadProvider, IndexerProvider indexerProvider, EpisodeProvider episodeProvider)
|
public EpisodeSearchJob(InventoryProvider inventoryProvider, DownloadProvider downloadProvider, IndexerProvider indexerProvider, EpisodeProvider episodeProvider)
|
||||||
{
|
{
|
||||||
_inventoryProvider = inventoryProvider;
|
_inventoryProvider = inventoryProvider;
|
||||||
|
@ -44,7 +46,7 @@ namespace NzbDrone.Core.Providers.Jobs
|
||||||
throw new ArgumentOutOfRangeException("targetId");
|
throw new ArgumentOutOfRangeException("targetId");
|
||||||
|
|
||||||
var episode = _episodeProvider.GetEpisode(targetId);
|
var episode = _episodeProvider.GetEpisode(targetId);
|
||||||
|
|
||||||
if (episode == null)
|
if (episode == null)
|
||||||
{
|
{
|
||||||
Logger.Error("Unable to find an episode {0} in database", targetId);
|
Logger.Error("Unable to find an episode {0} in database", targetId);
|
||||||
|
@ -58,7 +60,7 @@ namespace NzbDrone.Core.Providers.Jobs
|
||||||
|
|
||||||
var title = SceneNameHelper.GetTitleById(series.SeriesId);
|
var title = SceneNameHelper.GetTitleById(series.SeriesId);
|
||||||
|
|
||||||
if(string.IsNullOrWhiteSpace(title))
|
if (string.IsNullOrWhiteSpace(title))
|
||||||
{
|
{
|
||||||
title = series.Title;
|
title = series.Title;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using Ninject;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Core.Model.Notification;
|
using NzbDrone.Core.Model.Notification;
|
||||||
using NzbDrone.Core.Repository;
|
using NzbDrone.Core.Repository;
|
||||||
|
@ -23,12 +24,13 @@ namespace NzbDrone.Core.Providers.Jobs
|
||||||
|
|
||||||
private List<int> _attemptedSeries;
|
private List<int> _attemptedSeries;
|
||||||
|
|
||||||
|
[Inject]
|
||||||
public ImportNewSeriesJob(SeriesProvider seriesProvider,
|
public ImportNewSeriesJob(SeriesProvider seriesProvider,
|
||||||
MediaFileProvider mediaFileProvider, UpdateInfoJob updateInfoJob, DiskScanJob diskScanJob)
|
MediaFileProvider mediaFileProvider, UpdateInfoJob updateInfoJob, DiskScanJob diskScanJob)
|
||||||
{
|
{
|
||||||
_seriesProvider = seriesProvider;
|
_seriesProvider = seriesProvider;
|
||||||
_mediaFileProvider = mediaFileProvider;
|
_mediaFileProvider = mediaFileProvider;
|
||||||
_updateInfoJob = updateInfoJob;
|
_updateInfoJob = updateInfoJob;
|
||||||
_diskScanJob = diskScanJob;
|
_diskScanJob = diskScanJob;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -91,22 +93,22 @@ namespace NzbDrone.Core.Providers.Jobs
|
||||||
|
|
||||||
foreach (var season in seasons)
|
foreach (var season in seasons)
|
||||||
{
|
{
|
||||||
if (season!=currentSeasons )
|
if (season != currentSeasons)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Logger.Debug("Looking for seasons to ignore");
|
/* Logger.Debug("Looking for seasons to ignore");
|
||||||
foreach (var season in updatedSeries.Seasons)
|
foreach (var season in updatedSeries.Seasons)
|
||||||
{
|
{
|
||||||
if (season.SeasonNumber != updatedSeries.Seasons.Max(s => s.SeasonNumber) && _mediaFileProvider.GetSeasonFiles(season.SeasonId).Count() == 0)
|
if (season.SeasonNumber != updatedSeries.Seasons.Max(s => s.SeasonNumber) && _mediaFileProvider.GetSeasonFiles(season.SeasonId).Count() == 0)
|
||||||
{
|
{
|
||||||
Logger.Info("Season {0} of {1} doesn't have any files on disk. season will not be monitored.", season.SeasonNumber, updatedSeries.Title);
|
Logger.Info("Season {0} of {1} doesn't have any files on disk. season will not be monitored.", season.SeasonNumber, updatedSeries.Title);
|
||||||
season.Monitored = false;
|
season.Monitored = false;
|
||||||
_seasonProvider.SaveSeason(season);
|
_seasonProvider.SaveSeason(season);
|
||||||
}
|
}
|
||||||
}*/
|
}*/
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,6 +3,7 @@ using System.Collections.Generic;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
using Ninject;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Core.Model.Notification;
|
using NzbDrone.Core.Model.Notification;
|
||||||
using NzbDrone.Core.Repository;
|
using NzbDrone.Core.Repository;
|
||||||
|
@ -24,6 +25,7 @@ namespace NzbDrone.Core.Providers.Jobs
|
||||||
|
|
||||||
private ProgressNotification _notification;
|
private ProgressNotification _notification;
|
||||||
|
|
||||||
|
[Inject]
|
||||||
public JobProvider(IRepository repository, NotificationProvider notificationProvider, IList<IJob> jobs)
|
public JobProvider(IRepository repository, NotificationProvider notificationProvider, IList<IJob> jobs)
|
||||||
{
|
{
|
||||||
_repository = repository;
|
_repository = repository;
|
||||||
|
|
|
@ -3,6 +3,7 @@ using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
using Ninject;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Core.Model.Notification;
|
using NzbDrone.Core.Model.Notification;
|
||||||
using NzbDrone.Core.Providers.Core;
|
using NzbDrone.Core.Providers.Core;
|
||||||
|
@ -18,6 +19,7 @@ namespace NzbDrone.Core.Providers.Jobs
|
||||||
private readonly SeriesProvider _seriesProvider;
|
private readonly SeriesProvider _seriesProvider;
|
||||||
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
[Inject]
|
||||||
public PostDownloadScanJob(ConfigProvider configProvider, DiskProvider diskProvider,
|
public PostDownloadScanJob(ConfigProvider configProvider, DiskProvider diskProvider,
|
||||||
MediaFileProvider mediaFileProvider, SeriesProvider seriesProvider)
|
MediaFileProvider mediaFileProvider, SeriesProvider seriesProvider)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using Ninject;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Core.Model.Notification;
|
using NzbDrone.Core.Model.Notification;
|
||||||
using NzbDrone.Core.Providers.Core;
|
using NzbDrone.Core.Providers.Core;
|
||||||
|
@ -16,6 +17,7 @@ namespace NzbDrone.Core.Providers.Jobs
|
||||||
|
|
||||||
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
[Inject]
|
||||||
public RenameEpisodeJob(DiskProvider diskProvider, EpisodeProvider episodeProvider,
|
public RenameEpisodeJob(DiskProvider diskProvider, EpisodeProvider episodeProvider,
|
||||||
MediaFileProvider mediaFileProvider, SeriesProvider seriesProvider)
|
MediaFileProvider mediaFileProvider, SeriesProvider seriesProvider)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using Ninject;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Core.Model;
|
using NzbDrone.Core.Model;
|
||||||
using NzbDrone.Core.Model.Notification;
|
using NzbDrone.Core.Model.Notification;
|
||||||
|
@ -18,6 +19,7 @@ namespace NzbDrone.Core.Providers.Jobs
|
||||||
|
|
||||||
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
[Inject]
|
||||||
public RssSyncJob(IEnumerable<IndexerBase> indexers, InventoryProvider inventoryProvider, DownloadProvider downloadProvider, IndexerProvider indexerProvider)
|
public RssSyncJob(IEnumerable<IndexerBase> indexers, InventoryProvider inventoryProvider, DownloadProvider downloadProvider, IndexerProvider indexerProvider)
|
||||||
{
|
{
|
||||||
_indexers = indexers;
|
_indexers = indexers;
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using Ninject;
|
||||||
using NzbDrone.Core.Model.Notification;
|
using NzbDrone.Core.Model.Notification;
|
||||||
using NzbDrone.Core.Repository;
|
using NzbDrone.Core.Repository;
|
||||||
|
|
||||||
|
@ -10,6 +11,7 @@ namespace NzbDrone.Core.Providers.Jobs
|
||||||
private readonly SeriesProvider _seriesProvider;
|
private readonly SeriesProvider _seriesProvider;
|
||||||
private readonly EpisodeProvider _episodeProvider;
|
private readonly EpisodeProvider _episodeProvider;
|
||||||
|
|
||||||
|
[Inject]
|
||||||
public UpdateInfoJob(SeriesProvider seriesProvider, EpisodeProvider episodeProvider)
|
public UpdateInfoJob(SeriesProvider seriesProvider, EpisodeProvider episodeProvider)
|
||||||
{
|
{
|
||||||
_seriesProvider = seriesProvider;
|
_seriesProvider = seriesProvider;
|
||||||
|
@ -18,7 +20,7 @@ namespace NzbDrone.Core.Providers.Jobs
|
||||||
|
|
||||||
public UpdateInfoJob()
|
public UpdateInfoJob()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public string Name
|
public string Name
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using Ninject;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Core.Helpers;
|
using NzbDrone.Core.Helpers;
|
||||||
using NzbDrone.Core.Model.Notification;
|
using NzbDrone.Core.Model.Notification;
|
||||||
|
@ -22,6 +23,7 @@ namespace NzbDrone.Core.Providers
|
||||||
private readonly IRepository _repository;
|
private readonly IRepository _repository;
|
||||||
private readonly ConfigProvider _configProvider;
|
private readonly ConfigProvider _configProvider;
|
||||||
|
|
||||||
|
[Inject]
|
||||||
public MediaFileProvider(IRepository repository, DiskProvider diskProvider,
|
public MediaFileProvider(IRepository repository, DiskProvider diskProvider,
|
||||||
EpisodeProvider episodeProvider, SeriesProvider seriesProvider,
|
EpisodeProvider episodeProvider, SeriesProvider seriesProvider,
|
||||||
ConfigProvider configProvider)
|
ConfigProvider configProvider)
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using Ninject;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Core.Repository.Quality;
|
using NzbDrone.Core.Repository.Quality;
|
||||||
using SubSonic.Repository;
|
using SubSonic.Repository;
|
||||||
|
@ -16,6 +17,7 @@ namespace NzbDrone.Core.Providers
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Inject]
|
||||||
public QualityProvider(IRepository repository)
|
public QualityProvider(IRepository repository)
|
||||||
{
|
{
|
||||||
_repository = repository;
|
_repository = repository;
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using Ninject;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Core.Providers.Core;
|
using NzbDrone.Core.Providers.Core;
|
||||||
using NzbDrone.Core.Repository;
|
using NzbDrone.Core.Repository;
|
||||||
|
@ -16,7 +17,7 @@ namespace NzbDrone.Core.Providers
|
||||||
private readonly DiskProvider _diskProvider;
|
private readonly DiskProvider _diskProvider;
|
||||||
private readonly SeriesProvider _seriesProvider;
|
private readonly SeriesProvider _seriesProvider;
|
||||||
|
|
||||||
|
[Inject]
|
||||||
public RootDirProvider(IRepository repository, SeriesProvider seriesProvider, DiskProvider diskProvider)
|
public RootDirProvider(IRepository repository, SeriesProvider seriesProvider, DiskProvider diskProvider)
|
||||||
{
|
{
|
||||||
_repository = repository;
|
_repository = repository;
|
||||||
|
|
|
@ -5,6 +5,7 @@ using System.Linq;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using System.Web;
|
using System.Web;
|
||||||
using System.Xml.Linq;
|
using System.Xml.Linq;
|
||||||
|
using Ninject;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Core.Model;
|
using NzbDrone.Core.Model;
|
||||||
using NzbDrone.Core.Providers.Core;
|
using NzbDrone.Core.Providers.Core;
|
||||||
|
@ -21,6 +22,7 @@ namespace NzbDrone.Core.Providers
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Inject]
|
||||||
public SabProvider(ConfigProvider configProvider, HttpProvider httpProvider)
|
public SabProvider(ConfigProvider configProvider, HttpProvider httpProvider)
|
||||||
{
|
{
|
||||||
_configProvider = configProvider;
|
_configProvider = configProvider;
|
||||||
|
|
|
@ -3,6 +3,7 @@ using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
|
using Ninject;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Core.Helpers;
|
using NzbDrone.Core.Helpers;
|
||||||
using NzbDrone.Core.Providers.Core;
|
using NzbDrone.Core.Providers.Core;
|
||||||
|
@ -15,14 +16,12 @@ namespace NzbDrone.Core.Providers
|
||||||
{
|
{
|
||||||
public class SeriesProvider
|
public class SeriesProvider
|
||||||
{
|
{
|
||||||
//TODO: Remove parsing of rest of tv show info we just need the show name
|
|
||||||
//Trims all white spaces and separators from the end of the title.
|
|
||||||
|
|
||||||
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
||||||
private readonly IRepository _repository;
|
private readonly IRepository _repository;
|
||||||
private readonly ConfigProvider _configProvider;
|
private readonly ConfigProvider _configProvider;
|
||||||
private readonly TvDbProvider _tvDbProvider;
|
private readonly TvDbProvider _tvDbProvider;
|
||||||
|
|
||||||
|
[Inject]
|
||||||
public SeriesProvider(ConfigProvider configProviderProvider, IRepository repository, TvDbProvider tvDbProviderProvider)
|
public SeriesProvider(ConfigProvider configProviderProvider, IRepository repository, TvDbProvider tvDbProviderProvider)
|
||||||
{
|
{
|
||||||
_configProvider = configProviderProvider;
|
_configProvider = configProviderProvider;
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
using Ninject;
|
||||||
|
|
||||||
namespace NzbDrone.Core.Providers
|
namespace NzbDrone.Core.Providers
|
||||||
{
|
{
|
||||||
|
@ -9,6 +10,7 @@ namespace NzbDrone.Core.Providers
|
||||||
{
|
{
|
||||||
private readonly SeriesProvider _seriesProvider;
|
private readonly SeriesProvider _seriesProvider;
|
||||||
|
|
||||||
|
[Inject]
|
||||||
public StatsProvider(SeriesProvider seriesProvider)
|
public StatsProvider(SeriesProvider seriesProvider)
|
||||||
{
|
{
|
||||||
_seriesProvider = seriesProvider;
|
_seriesProvider = seriesProvider;
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using Ninject;
|
||||||
using NzbDrone.Core.Model;
|
using NzbDrone.Core.Model;
|
||||||
using NzbDrone.Core.Repository;
|
using NzbDrone.Core.Repository;
|
||||||
using SubSonic.Repository;
|
using SubSonic.Repository;
|
||||||
|
@ -11,6 +12,7 @@ namespace NzbDrone.Core.Providers
|
||||||
{
|
{
|
||||||
private readonly IRepository _repository;
|
private readonly IRepository _repository;
|
||||||
|
|
||||||
|
[Inject]
|
||||||
public UpcomingEpisodesProvider(IRepository repository)
|
public UpcomingEpisodesProvider(IRepository repository)
|
||||||
{
|
{
|
||||||
_repository = repository;
|
_repository = repository;
|
||||||
|
@ -26,7 +28,7 @@ namespace NzbDrone.Core.Providers
|
||||||
var today = allEps.Where(e => e.AirDate == DateTime.Today).ToList();
|
var today = allEps.Where(e => e.AirDate == DateTime.Today).ToList();
|
||||||
var week = allEps.Where(e => e.AirDate > DateTime.Today).ToList();
|
var week = allEps.Where(e => e.AirDate > DateTime.Today).ToList();
|
||||||
|
|
||||||
return new UpcomingEpisodesModel {Yesterday = yesterday, Today = today, Week = week};
|
return new UpcomingEpisodesModel { Yesterday = yesterday, Today = today, Week = week };
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual List<Episode> Yesterday()
|
public virtual List<Episode> Yesterday()
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Xml.Linq;
|
using System.Xml.Linq;
|
||||||
|
using Ninject;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Core.Helpers;
|
using NzbDrone.Core.Helpers;
|
||||||
using NzbDrone.Core.Providers.Core;
|
using NzbDrone.Core.Providers.Core;
|
||||||
|
@ -14,6 +15,7 @@ namespace NzbDrone.Core.Providers
|
||||||
private readonly ConfigProvider _configProvider;
|
private readonly ConfigProvider _configProvider;
|
||||||
private readonly HttpProvider _httpProvider;
|
private readonly HttpProvider _httpProvider;
|
||||||
|
|
||||||
|
[Inject]
|
||||||
public XbmcProvider(ConfigProvider configProvider, HttpProvider httpProvider)
|
public XbmcProvider(ConfigProvider configProvider, HttpProvider httpProvider)
|
||||||
{
|
{
|
||||||
_configProvider = configProvider;
|
_configProvider = configProvider;
|
||||||
|
|
|
@ -21,17 +21,16 @@ namespace NzbDrone.Web.Controllers
|
||||||
private readonly RootDirProvider _rootFolderProvider;
|
private readonly RootDirProvider _rootFolderProvider;
|
||||||
private readonly SeriesProvider _seriesProvider;
|
private readonly SeriesProvider _seriesProvider;
|
||||||
private readonly JobProvider _jobProvider;
|
private readonly JobProvider _jobProvider;
|
||||||
private readonly SyncProvider _syncProvider;
|
|
||||||
private readonly TvDbProvider _tvDbProvider;
|
private readonly TvDbProvider _tvDbProvider;
|
||||||
private readonly DiskProvider _diskProvider;
|
private readonly DiskProvider _diskProvider;
|
||||||
|
|
||||||
public AddSeriesController(SyncProvider syncProvider, RootDirProvider rootFolderProvider,
|
public AddSeriesController(RootDirProvider rootFolderProvider,
|
||||||
ConfigProvider configProvider,
|
ConfigProvider configProvider,
|
||||||
QualityProvider qualityProvider, TvDbProvider tvDbProvider,
|
QualityProvider qualityProvider, TvDbProvider tvDbProvider,
|
||||||
SeriesProvider seriesProvider, JobProvider jobProvider,
|
SeriesProvider seriesProvider, JobProvider jobProvider,
|
||||||
DiskProvider diskProvider)
|
DiskProvider diskProvider)
|
||||||
{
|
{
|
||||||
_syncProvider = syncProvider;
|
|
||||||
_rootFolderProvider = rootFolderProvider;
|
_rootFolderProvider = rootFolderProvider;
|
||||||
_configProvider = configProvider;
|
_configProvider = configProvider;
|
||||||
_qualityProvider = qualityProvider;
|
_qualityProvider = qualityProvider;
|
||||||
|
@ -50,7 +49,7 @@ namespace NzbDrone.Web.Controllers
|
||||||
|
|
||||||
public ActionResult AddNew()
|
public ActionResult AddNew()
|
||||||
{
|
{
|
||||||
var rootDirs =_rootFolderProvider.GetAll().Select(r =>
|
var rootDirs = _rootFolderProvider.GetAll().Select(r =>
|
||||||
new RootDirModel
|
new RootDirModel
|
||||||
{
|
{
|
||||||
Path = r.Path,
|
Path = r.Path,
|
||||||
|
@ -137,10 +136,10 @@ namespace NzbDrone.Web.Controllers
|
||||||
|
|
||||||
_seriesProvider.AddSeries(path, seriesId, qualityProfileId);
|
_seriesProvider.AddSeries(path, seriesId, qualityProfileId);
|
||||||
ScanNewSeries();
|
ScanNewSeries();
|
||||||
return new JsonResult {Data = "ok"};
|
return new JsonResult { Data = "ok" };
|
||||||
}
|
}
|
||||||
|
|
||||||
catch(Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
return new JsonResult { Data = "failed" };
|
return new JsonResult { Data = "failed" };
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
using System.Web.Mvc;
|
using System.Web.Mvc;
|
||||||
|
using MvcMiniProfiler;
|
||||||
using NzbDrone.Core.Providers;
|
using NzbDrone.Core.Providers;
|
||||||
|
|
||||||
namespace NzbDrone.Web.Controllers
|
namespace NzbDrone.Web.Controllers
|
||||||
|
@ -35,6 +36,12 @@ namespace NzbDrone.Web.Controllers
|
||||||
message = _notifications.GetProgressNotifications[0].CurrentMessage;
|
message = _notifications.GetProgressNotifications[0].CurrentMessage;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if (MiniProfiler.Current.DurationMilliseconds < 100)
|
||||||
|
{
|
||||||
|
MiniProfiler.Stop(true);
|
||||||
|
}
|
||||||
|
|
||||||
return Json(message, JsonRequestBehavior.AllowGet);
|
return Json(message, JsonRequestBehavior.AllowGet);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue