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

more project clean up.

Browse Source
pull/23/head
kay.one 11 years ago
parent 126f499259
commit 50674d388c
98 changed files with 86 additions and 225 deletions
Show Stats Download Patch File Download Diff File

1
NzbDrone.Api/NancyBootstrapper.cs
Unescape View File

@ -13,7 +13,6 @@ using NzbDrone.Common;
using NzbDrone.Core;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Lifecycle;
using NzbDrone.Core.Providers.Core;
using SignalR;
namespace NzbDrone.Api

9
NzbDrone.Core/Providers/Core/ArchiveProvider.cs → NzbDrone.Common/ArchiveProvider.cs
Unescape View File

@ -1,11 +1,8 @@
using System;
using System.IO;
using System.Linq;
using System.Linq;
using Ionic.Zip;
using NLog;
using NzbDrone.Common;
namespace NzbDrone.Core.Providers.Core
namespace NzbDrone.Common
{
public class ArchiveProvider
{
@ -15,7 +12,7 @@ namespace NzbDrone.Core.Providers.Core
{
logger.Trace("Extracting archive [{0}] to [{1}]", compressedFile, destination);
using (ZipFile zipFile = ZipFile.Read(compressedFile))
using (var zipFile = ZipFile.Read(compressedFile))
{
zipFile.ExtractAll(destination);
}

5
NzbDrone.Common/NzbDrone.Common.csproj
Unescape View File

@ -61,6 +61,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Autofac.3.0.1\lib\net40\Autofac.Configuration.dll</HintPath>
</Reference>
<Reference Include="Ionic.Zip">
<HintPath>..\packages\DotNetZip.1.9.1.8\lib\net20\Ionic.Zip.dll</HintPath>
</Reference>
<Reference Include="Nancy">
<HintPath>..\packages\Nancy.0.16.1\lib\net40\Nancy.dll</HintPath>
</Reference>
@ -85,6 +88,7 @@
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Compile Include="ArchiveProvider.cs" />
<Compile Include="CommonContainerExtentions.cs" />
<Compile Include="EnsureThat\Ensure.cs" />
<Compile Include="EnsureThat\EnsureBoolExtensions.cs" />
@ -135,6 +139,7 @@
</Compile>
<Compile Include="SysTray\SysTrayProvider.cs" />
<Compile Include="TryParseExtension.cs" />
<Compile Include="UdpProvider.cs" />
</ItemGroup>
<ItemGroup>
<None Include="EnsureThat\ve-3BAF.tmp" />

7
NzbDrone.Core/Providers/Core/UdpProvider.cs → NzbDrone.Common/UdpProvider.cs
Unescape View File

@ -1,11 +1,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System;
using System.Net;
using System.Net.Sockets;
using System.Text;
using NLog;
namespace NzbDrone.Core.Providers.Core
namespace NzbDrone.Common
{
public class UdpProvider
{

1
NzbDrone.Common/packages.config
Unescape View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Autofac" version="3.0.1" targetFramework="net40" />
<package id="DotNetZip" version="1.9.1.8" targetFramework="net40" />
<package id="Nancy" version="0.16.1" targetFramework="net40" />
<package id="Nancy.Hosting.Self" version="0.16.1" targetFramework="net40" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" />

1
NzbDrone.Core.Test/DecisionEngineTests/AllowedReleaseGroupSpecificationFixture.cs
Unescape View File

@ -12,7 +12,6 @@ using NzbDrone.Core.Qualities;
using NzbDrone.Core.Tv;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.DecisionEngine;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Test.Framework;

1
NzbDrone.Core.Test/DecisionEngineTests/LanguageSpecificationFixture.cs
Unescape View File

@ -9,7 +9,6 @@ using Moq;
using NUnit.Framework;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.DecisionEngine;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Test.Framework;

1
NzbDrone.Core.Test/DecisionEngineTests/RetentionSpecificationFixture.cs
Unescape View File

@ -10,7 +10,6 @@ using NUnit.Framework;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.DecisionEngine;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Test.Framework;

1
NzbDrone.Core.Test/Framework/TestDbHelper.cs
Unescape View File

@ -7,7 +7,6 @@ using FluentAssertions;
using Moq;
using NzbDrone.Common;
using NzbDrone.Core.Datastore;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Repository;

1
NzbDrone.Core.Test/IndexerTests/IndexerFixture.cs
Unescape View File

@ -14,7 +14,6 @@ using NzbDrone.Core.Configuration;
using NzbDrone.Core.Indexers;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Qualities;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Test.Framework;

1
NzbDrone.Core.Test/IndexerTests/NzbxFixture.cs
Unescape View File

@ -13,7 +13,6 @@ using NzbDrone.Common;
using NzbDrone.Core.Indexers;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Test.ProviderTests;

1
NzbDrone.Core.Test/Indexers/IndexerServiceTest.cs
Unescape View File

@ -12,7 +12,6 @@ using NzbDrone.Core.Configuration;
using NzbDrone.Core.Indexers;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common.AutoMoq;

1
NzbDrone.Core.Test/JobTests/AppUpdateJobFixture.cs
Unescape View File

@ -11,7 +11,6 @@ using NzbDrone.Core.Jobs;
using NzbDrone.Core.Lifecycle;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;

1
NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs
Unescape View File

@ -10,7 +10,6 @@ using NzbDrone.Core.Jobs;
using NzbDrone.Core.Model;
using NzbDrone.Core.Model.Notification;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;

1
NzbDrone.Core.Test/JobTests/PostDownloadScanJobFixture.cs
Unescape View File

@ -11,7 +11,6 @@ using NzbDrone.Core.Configuration;
using NzbDrone.Core.Jobs;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;

1
NzbDrone.Core.Test/JobTests/RecentBacklogSearchJobTest.cs
Unescape View File

@ -12,7 +12,6 @@ using NzbDrone.Core.Jobs;
using NzbDrone.Core.Model;
using NzbDrone.Core.Model.Notification;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;

1
NzbDrone.Core.Test/JobTests/RssSyncJobTest.cs
Unescape View File

@ -7,7 +7,6 @@ using NzbDrone.Core.Configuration;
using NzbDrone.Core.Jobs;
using NzbDrone.Core.Model.Notification;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common.AutoMoq;

2
NzbDrone.Core.Test/ProviderTests/DiskProviderTests/ExtractArchiveFixture.cs
Unescape View File

@ -1,6 +1,6 @@
using FluentAssertions;
using NUnit.Framework;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Common;
using NzbDrone.Core.Test.Framework;
using System.IO;

1
NzbDrone.Core.Test/ProviderTests/DiskProviderTests/FreeDiskSpaceTest.cs
Unescape View File

@ -8,7 +8,6 @@ using FluentAssertions;
using Moq;
using NUnit.Framework;
using NzbDrone.Common;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common.AutoMoq;

1
NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpDropFolderFixture.cs
Unescape View File

@ -13,7 +13,6 @@ using NzbDrone.Core.Qualities;
using NzbDrone.Core.Tv;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;

1
NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpFixture.cs
Unescape View File

@ -13,7 +13,6 @@ using NzbDrone.Core.MediaFiles;
using NzbDrone.Core.Tv;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;

1
NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/GetVideoFilesFixture.cs
Unescape View File

@ -10,7 +10,6 @@ using NUnit.Framework;
using NzbDrone.Common;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;

1
NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ImportFileFixture.cs
Unescape View File

@ -11,7 +11,6 @@ using NzbDrone.Core.Qualities;
using NzbDrone.Core.Tv;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;

1
NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/MoveEpisodeFileFixture.cs
Unescape View File

@ -15,7 +15,6 @@ using NzbDrone.Core.Qualities;
using NzbDrone.Core.Tv;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;

3
NzbDrone.Core.Test/ProviderTests/DownloadClientTests/BlackholeProviderFixture.cs
Unescape View File

@ -9,8 +9,7 @@ using Moq;
using NUnit.Framework;
using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Providers.DownloadClients;
using NzbDrone.Core.Download.Clients;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;

5
NzbDrone.Core.Test/ProviderTests/DownloadClientTests/NzbgetProviderTests/DownloadNzbFixture.cs
Unescape View File

@ -8,9 +8,8 @@ using Moq;
using NUnit.Framework;
using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Model.Nzbget;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Providers.DownloadClients;
using NzbDrone.Core.Download.Clients;
using NzbDrone.Core.Download.Clients.Nzbget;
using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.ProviderTests.DownloadClientTests.NzbgetProviderTests

5
NzbDrone.Core.Test/ProviderTests/DownloadClientTests/NzbgetProviderTests/QueueFixture.cs
Unescape View File

@ -8,9 +8,8 @@ using Moq;
using NUnit.Framework;
using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Model.Nzbget;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Providers.DownloadClients;
using NzbDrone.Core.Download.Clients;
using NzbDrone.Core.Download.Clients.Nzbget;
using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.ProviderTests.DownloadClientTests.NzbgetProviderTests

3
NzbDrone.Core.Test/ProviderTests/DownloadClientTests/PneumaticProviderFixture.cs
Unescape View File

@ -9,8 +9,7 @@ using Moq;
using NUnit.Framework;
using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Providers.DownloadClients;
using NzbDrone.Core.Download.Clients;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;

5
NzbDrone.Core.Test/ProviderTests/DownloadClientTests/SabProviderTests/QueueFixture.cs
Unescape View File

@ -9,12 +9,11 @@ using Moq;
using NUnit.Framework;
using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Download.Clients;
using NzbDrone.Core.Qualities;
using NzbDrone.Core.Tv;
using NzbDrone.Core.Model;
using NzbDrone.Core.Model.Sabnzbd;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Providers.DownloadClients;
using NzbDrone.Core.Download.Clients.Sabnzbd;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;

5
NzbDrone.Core.Test/ProviderTests/DownloadClientTests/SabProviderTests/SabProviderFixture.cs
Unescape View File

@ -11,10 +11,9 @@ using Moq;
using NUnit.Framework;
using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Download.Clients;
using NzbDrone.Core.Model;
using NzbDrone.Core.Model.Sabnzbd;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Providers.DownloadClients;
using NzbDrone.Core.Download.Clients.Sabnzbd;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;

3
NzbDrone.Core.Test/ProviderTests/DownloadProviderTests/DownloadProviderFixture.cs
Unescape View File

@ -7,10 +7,11 @@ using Moq;
using NUnit.Framework;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Download;
using NzbDrone.Core.Download.Clients;
using NzbDrone.Core.Download.Clients.Sabnzbd;
using NzbDrone.Core.Qualities;
using NzbDrone.Core.Tv;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers.DownloadClients;
using NzbDrone.Core.Test.Framework;
// ReSharper disable InconsistentNaming

2
NzbDrone.Core.Test/ProviderTests/EventClientProviderTest.cs
Unescape View File

@ -3,8 +3,8 @@
using System;
using Moq;
using NUnit.Framework;
using NzbDrone.Common;
using NzbDrone.Core.Model.Xbmc;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Providers.Xbmc;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common.AutoMoq;

1
NzbDrone.Core.Test/ProviderTests/PlexProviderTest.cs
Unescape View File

@ -14,7 +14,6 @@ using NzbDrone.Core.Configuration;
using NzbDrone.Core.ExternalNotification;
using NzbDrone.Core.Model.Xbmc;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Providers.Xbmc;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Test.Framework;

1
NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/CleanupFixture.cs
Unescape View File

@ -13,7 +13,6 @@ using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common.AutoMoq;

1
NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/DeleteDirectoryFixture.cs
Unescape View File

@ -13,7 +13,6 @@ using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common.AutoMoq;

1
NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/DeleteFileFixture.cs
Unescape View File

@ -13,7 +13,6 @@ using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common.AutoMoq;

1
NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/EmptyFixture.cs
Unescape View File

@ -13,7 +13,6 @@ using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common.AutoMoq;

1
NzbDrone.Core.Test/ProviderTests/UpdateProviderTests/GetAvilableUpdateFixture.cs
Unescape View File

@ -6,7 +6,6 @@ using NUnit.Framework;
using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common.AutoMoq;

1
NzbDrone.Core.Test/ProviderTests/XbmcProviderTest.cs
Unescape View File

@ -11,7 +11,6 @@ using NzbDrone.Core.Configuration;
using NzbDrone.Core.Tv;
using NzbDrone.Core.Model.Xbmc;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Providers.Xbmc;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Test.Framework;

BIN
NzbDrone.Core.Test/TvTests/SeriesProviderTest.cs
View File

Binary file not shown.

4
NzbDrone.Core/Configuration/ConfigService.cs
Unescape View File

@ -3,8 +3,8 @@ using System.Collections.Generic;
using System.Linq;
using NLog;
using NzbDrone.Core.Model;
using NzbDrone.Core.Model.Nzbget;
using NzbDrone.Core.Model.Sabnzbd;
using NzbDrone.Core.Download.Clients.Nzbget;
using NzbDrone.Core.Download.Clients.Sabnzbd;
using NzbDrone.Core.Providers;
namespace NzbDrone.Core.Configuration

4
NzbDrone.Core/Configuration/IConfigService.cs
Unescape View File

@ -1,8 +1,8 @@
using System;
using System.Collections.Generic;
using NzbDrone.Core.Model;
using NzbDrone.Core.Model.Nzbget;
using NzbDrone.Core.Model.Sabnzbd;
using NzbDrone.Core.Download.Clients.Nzbget;
using NzbDrone.Core.Download.Clients.Sabnzbd;
namespace NzbDrone.Core.Configuration
{

1
NzbDrone.Core/DecisionEngine/AllowedReleaseGroupSpecification.cs
Unescape View File

@ -3,7 +3,6 @@ using System.Linq;
using NLog;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers.Core;
namespace NzbDrone.Core.DecisionEngine
{

1
NzbDrone.Core/DecisionEngine/LanguageSpecification.cs
Unescape View File

@ -2,7 +2,6 @@
using NLog;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers.Core;
namespace NzbDrone.Core.DecisionEngine
{

1
NzbDrone.Core/DecisionEngine/RetentionSpecification.cs
Unescape View File

@ -2,7 +2,6 @@
using NLog;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers.Core;
namespace NzbDrone.Core.DecisionEngine
{

4
NzbDrone.Core/Providers/DownloadClients/BlackholeProvider.cs → NzbDrone.Core/Download/Clients/BlackholeProvider.cs
Unescape View File

@ -7,10 +7,9 @@ using NzbDrone.Core.Configuration;
using NzbDrone.Core.History;
using NzbDrone.Core.MediaFiles;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.DecisionEngine;
namespace NzbDrone.Core.Providers.DownloadClients
namespace NzbDrone.Core.Download.Clients
{
public class BlackholeProvider : IDownloadClient
{
@ -18,7 +17,6 @@ namespace NzbDrone.Core.Providers.DownloadClients
private readonly HttpProvider _httpProvider;
private readonly DiskProvider _diskProvider;
private readonly UpgradeHistorySpecification _upgradeHistorySpecification;
private readonly HistoryService _historyService;
private static readonly Logger logger = LogManager.GetCurrentClassLogger();

2
NzbDrone.Core/Model/Nzbget/EnqueueResponse.cs → NzbDrone.Core/Download/Clients/Nzbget/EnqueueResponse.cs
Unescape View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace NzbDrone.Core.Model.Nzbget
namespace NzbDrone.Core.Download.Clients.Nzbget
{
public class EnqueueResponse
{

2
NzbDrone.Core/Model/Nzbget/ErrorModel.cs → NzbDrone.Core/Download/Clients/Nzbget/ErrorModel.cs
Unescape View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace NzbDrone.Core.Model.Nzbget
namespace NzbDrone.Core.Download.Clients.Nzbget
{
public class ErrorModel
{

2
NzbDrone.Core/Model/Nzbget/JsonError.cs → NzbDrone.Core/Download/Clients/Nzbget/JsonError.cs
Unescape View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace NzbDrone.Core.Model.Nzbget
namespace NzbDrone.Core.Download.Clients.Nzbget
{
public class JsonError
{

2
NzbDrone.Core/Model/Nzbget/JsonRequest.cs → NzbDrone.Core/Download/Clients/Nzbget/JsonRequest.cs
Unescape View File

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using Newtonsoft.Json;
namespace NzbDrone.Core.Model.Nzbget
namespace NzbDrone.Core.Download.Clients.Nzbget
{
public class JsonRequest
{

7
NzbDrone.Core/Providers/DownloadClients/NzbgetProvider.cs → NzbDrone.Core/Download/Clients/Nzbget/NzbgetProvider.cs
Unescape View File

@ -2,19 +2,14 @@
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Text.RegularExpressions;
using System.Web;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using NLog;
using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Model;
using NzbDrone.Core.Model.Nzbget;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Tv;
namespace NzbDrone.Core.Providers.DownloadClients
namespace NzbDrone.Core.Download.Clients.Nzbget
{
public class NzbgetProvider : IDownloadClient
{

2
NzbDrone.Core/Model/Nzbget/PriorityType.cs → NzbDrone.Core/Download/Clients/Nzbget/PriorityType.cs
Unescape View File

@ -1,4 +1,4 @@
namespace NzbDrone.Core.Model.Nzbget
namespace NzbDrone.Core.Download.Clients.Nzbget
{
public enum PriorityType
{

2
NzbDrone.Core/Model/Nzbget/Queue.cs → NzbDrone.Core/Download/Clients/Nzbget/Queue.cs
Unescape View File

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using Newtonsoft.Json;
namespace NzbDrone.Core.Model.Nzbget
namespace NzbDrone.Core.Download.Clients.Nzbget
{
public class Queue
{

5
NzbDrone.Core/Model/Nzbget/QueueItem.cs → NzbDrone.Core/Download/Clients/Nzbget/QueueItem.cs
Unescape View File

@ -1,10 +1,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Newtonsoft.Json;
using NzbDrone.Core.Model;
namespace NzbDrone.Core.Model.Nzbget
namespace NzbDrone.Core.Download.Clients.Nzbget
{
public class QueueItem
{

2
NzbDrone.Core/Model/Nzbget/VersionModel.cs → NzbDrone.Core/Download/Clients/Nzbget/VersionModel.cs
Unescape View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace NzbDrone.Core.Model.Nzbget
namespace NzbDrone.Core.Download.Clients.Nzbget
{
public class VersionModel
{

3
NzbDrone.Core/Providers/DownloadClients/PneumaticProvider.cs → NzbDrone.Core/Download/Clients/PneumaticProvider.cs
Unescape View File

@ -6,10 +6,9 @@ using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.MediaFiles;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.DecisionEngine;
namespace NzbDrone.Core.Providers.DownloadClients
namespace NzbDrone.Core.Download.Clients
{
public class PneumaticProvider : IDownloadClient
{

2
NzbDrone.Core/Model/Sabnzbd/SabAddResponse.cs → NzbDrone.Core/Download/Clients/Sabnzbd/SabAddResponse.cs
Unescape View File

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using Newtonsoft.Json;
namespace NzbDrone.Core.Model.Sabnzbd
namespace NzbDrone.Core.Download.Clients.Sabnzbd
{
public class SabAddResponse
{

2
NzbDrone.Core/Model/Sabnzbd/SabCategoryModel.cs → NzbDrone.Core/Download/Clients/Sabnzbd/SabCategoryModel.cs
Unescape View File

@ -1,6 +1,6 @@
using System.Collections.Generic;
namespace NzbDrone.Core.Model.Sabnzbd
namespace NzbDrone.Core.Download.Clients.Sabnzbd
{
public class SabCategoryModel
{

2
NzbDrone.Core/Model/Sabnzbd/SabHistory.cs → NzbDrone.Core/Download/Clients/Sabnzbd/SabHistory.cs
Unescape View File

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using Newtonsoft.Json;
namespace NzbDrone.Core.Model.Sabnzbd
namespace NzbDrone.Core.Download.Clients.Sabnzbd
{
public class SabHistory
{

2
NzbDrone.Core/Model/Sabnzbd/SabHistoryItem.cs → NzbDrone.Core/Download/Clients/Sabnzbd/SabHistoryItem.cs
Unescape View File

@ -1,7 +1,7 @@
using System.Linq;
using Newtonsoft.Json;
namespace NzbDrone.Core.Model.Sabnzbd
namespace NzbDrone.Core.Download.Clients.Sabnzbd
{
public class SabHistoryItem
{

2
NzbDrone.Core/Model/Sabnzbd/SabJsonError.cs → NzbDrone.Core/Download/Clients/Sabnzbd/SabJsonError.cs
Unescape View File

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using Newtonsoft.Json;
namespace NzbDrone.Core.Model.Sabnzbd
namespace NzbDrone.Core.Download.Clients.Sabnzbd
{
public class SabJsonError
{

2
NzbDrone.Core/Model/Sabnzbd/SabModel.cs → NzbDrone.Core/Download/Clients/Sabnzbd/SabModel.cs
Unescape View File

@ -1,4 +1,4 @@
namespace NzbDrone.Core.Model.Sabnzbd
namespace NzbDrone.Core.Download.Clients.Sabnzbd
{
public class SabModel
{

2
NzbDrone.Core/Model/Sabnzbd/SabPriorityType.cs → NzbDrone.Core/Download/Clients/Sabnzbd/SabPriorityType.cs
Unescape View File

@ -1,4 +1,4 @@
namespace NzbDrone.Core.Model.Sabnzbd
namespace NzbDrone.Core.Download.Clients.Sabnzbd
{
public enum SabPriorityType
{

5
NzbDrone.Core/Providers/DownloadClients/SabProvider.cs → NzbDrone.Core/Download/Clients/Sabnzbd/SabProvider.cs
Unescape View File

@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Text.RegularExpressions;
using System.Web;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
@ -10,11 +9,9 @@ using NLog;
using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Model;
using NzbDrone.Core.Model.Sabnzbd;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Tv;
namespace NzbDrone.Core.Providers.DownloadClients
namespace NzbDrone.Core.Download.Clients.Sabnzbd
{
public class SabProvider : IDownloadClient
{

2
NzbDrone.Core/Model/Sabnzbd/SabQueue.cs → NzbDrone.Core/Download/Clients/Sabnzbd/SabQueue.cs
Unescape View File

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using Newtonsoft.Json;
namespace NzbDrone.Core.Model.Sabnzbd
namespace NzbDrone.Core.Download.Clients.Sabnzbd
{
public class SabQueue
{

5
NzbDrone.Core/Model/Sabnzbd/SabQueueItem.cs → NzbDrone.Core/Download/Clients/Sabnzbd/SabQueueItem.cs
Unescape View File

@ -1,11 +1,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Newtonsoft.Json;
using NzbDrone.Core.Helpers;
using NzbDrone.Core.Model;
namespace NzbDrone.Core.Model.Sabnzbd
namespace NzbDrone.Core.Download.Clients.Sabnzbd
{
public class SabQueueItem
{

2
NzbDrone.Core/Model/Sabnzbd/SabVersionModel.cs → NzbDrone.Core/Download/Clients/Sabnzbd/SabVersionModel.cs
Unescape View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace NzbDrone.Core.Model.Sabnzbd
namespace NzbDrone.Core.Download.Clients.Sabnzbd
{
public class SabVersionModel
{

4
NzbDrone.Core/Download/DownloadProvider.cs
Unescape View File

@ -3,8 +3,10 @@ using System.Linq;
using NLog;
using NzbDrone.Common.Eventing;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Download.Clients;
using NzbDrone.Core.Download.Clients.Nzbget;
using NzbDrone.Core.Download.Clients.Sabnzbd;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers.DownloadClients;
namespace NzbDrone.Core.Download
{

2
NzbDrone.Core/Providers/DownloadClients/IDownloadClient.cs → NzbDrone.Core/Download/IDownloadClient.cs
Unescape View File

@ -1,7 +1,7 @@
using System.Linq;
using NzbDrone.Core.Model;
namespace NzbDrone.Core.Providers.DownloadClients
namespace NzbDrone.Core.Download
{
public interface IDownloadClient
{

2
NzbDrone.Core/Helpers/SabnzbdPriorityTypeConverter.cs
Unescape View File

@ -1,7 +1,7 @@
using System;
using System.Linq;
using Newtonsoft.Json;
using NzbDrone.Core.Model.Sabnzbd;
using NzbDrone.Core.Download.Clients.Sabnzbd;
namespace NzbDrone.Core.Helpers
{

1
NzbDrone.Core/Indexers/FileSharingTalk.cs
Unescape View File

@ -5,7 +5,6 @@ using System.ServiceModel.Syndication;
using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers.Core;
namespace NzbDrone.Core.Indexers
{

1
NzbDrone.Core/Indexers/IndexerBase.cs
Unescape View File

@ -8,7 +8,6 @@ using NLog;
using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers.Core;
namespace NzbDrone.Core.Indexers
{

1
NzbDrone.Core/Indexers/Newznab.cs
Unescape View File

@ -7,7 +7,6 @@ using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
namespace NzbDrone.Core.Indexers
{

1
NzbDrone.Core/Indexers/NzbClub.cs
Unescape View File

@ -6,7 +6,6 @@ using System.Text.RegularExpressions;
using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers.Core;
namespace NzbDrone.Core.Indexers
{

1
NzbDrone.Core/Indexers/NzbIndex.cs
Unescape View File

@ -6,7 +6,6 @@ using System.Text.RegularExpressions;
using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers.Core;
namespace NzbDrone.Core.Indexers
{

1
NzbDrone.Core/Indexers/NzbsRUs.cs
Unescape View File

@ -6,7 +6,6 @@ using System.Text.RegularExpressions;
using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers.Core;
namespace NzbDrone.Core.Indexers
{

1
NzbDrone.Core/Indexers/Nzbx.cs
Unescape View File

@ -8,7 +8,6 @@ using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Model;
using NzbDrone.Core.Model.Nzbx;
using NzbDrone.Core.Providers.Core;
namespace NzbDrone.Core.Indexers
{

1
NzbDrone.Core/Indexers/Omgwtfnzbs.cs
Unescape View File

@ -6,7 +6,6 @@ using System.Text.RegularExpressions;
using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers.Core;
namespace NzbDrone.Core.Indexers
{

1
NzbDrone.Core/Indexers/Wombles.cs
Unescape View File

@ -5,7 +5,6 @@ using System.ServiceModel.Syndication;
using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers.Core;
namespace NzbDrone.Core.Indexers
{

1
NzbDrone.Core/Jobs/DiskScanJob.cs
Unescape View File

@ -8,7 +8,6 @@ using NzbDrone.Core.Tv;
using NzbDrone.Core.Helpers;
using NzbDrone.Core.Model.Notification;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Repository;
namespace NzbDrone.Core.Jobs

1
NzbDrone.Core/Jobs/PastWeekBacklogSearchJob.cs
Unescape View File

@ -8,7 +8,6 @@ using NzbDrone.Core.Tv;
using NzbDrone.Core.Model;
using NzbDrone.Core.Model.Notification;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Repository;
namespace NzbDrone.Core.Jobs

1
NzbDrone.Core/Jobs/PostDownloadScanJob.cs
Unescape View File

@ -6,7 +6,6 @@ using NzbDrone.Core.Configuration;
using NzbDrone.Core.Jobs.Framework;
using NzbDrone.Core.Model.Notification;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
namespace NzbDrone.Core.Jobs
{

1
NzbDrone.Core/Jobs/RecentBacklogSearchJob.cs
Unescape View File

@ -8,7 +8,6 @@ using NzbDrone.Core.Tv;
using NzbDrone.Core.Model;
using NzbDrone.Core.Model.Notification;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Repository;
namespace NzbDrone.Core.Jobs

1
NzbDrone.Core/Jobs/RssSyncJob.cs
Unescape View File

@ -10,7 +10,6 @@ using NzbDrone.Core.Jobs.Framework;
using NzbDrone.Core.Model;
using NzbDrone.Core.Model.Notification;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.DecisionEngine;
namespace NzbDrone.Core.Jobs

1
NzbDrone.Core/Jobs/UpdateInfoJob.cs
Unescape View File

@ -10,7 +10,6 @@ using NzbDrone.Core.Tv;
using NzbDrone.Core.Helpers;
using NzbDrone.Core.Model.Notification;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Repository;
namespace NzbDrone.Core.Jobs

1
NzbDrone.Core/Lifecycle/AppUpdateJob.cs
Unescape View File

@ -8,7 +8,6 @@ using NzbDrone.Core.Jobs;
using NzbDrone.Core.Jobs.Framework;
using NzbDrone.Core.Model.Notification;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
namespace NzbDrone.Core.Lifecycle
{

56
NzbDrone.Core/NzbDrone.Core.csproj
Unescape View File

@ -222,14 +222,14 @@
<Compile Include="Model\ConnectionInfoModel.cs" />
<Compile Include="Model\BacklogSettingType.cs" />
<Compile Include="Model\MediaInfoModel.cs" />
<Compile Include="Model\Nzbget\EnqueueResponse.cs" />
<Compile Include="Model\Nzbget\ErrorModel.cs" />
<Compile Include="Model\Nzbget\JsonError.cs" />
<Compile Include="Model\Nzbget\JsonRequest.cs" />
<Compile Include="Model\Nzbget\Queue.cs" />
<Compile Include="Model\Nzbget\QueueItem.cs" />
<Compile Include="Model\Nzbget\PriorityType.cs" />
<Compile Include="Model\Nzbget\VersionModel.cs" />
<Compile Include="Download\Clients\Nzbget\EnqueueResponse.cs" />
<Compile Include="Download\Clients\Nzbget\ErrorModel.cs" />
<Compile Include="Download\Clients\Nzbget\JsonError.cs" />
<Compile Include="Download\Clients\Nzbget\JsonRequest.cs" />
<Compile Include="Download\Clients\Nzbget\Queue.cs" />
<Compile Include="Download\Clients\Nzbget\QueueItem.cs" />
<Compile Include="Download\Clients\Nzbget\PriorityType.cs" />
<Compile Include="Download\Clients\Nzbget\VersionModel.cs" />
<Compile Include="Model\Nzbx\NzbxSearchItem.cs" />
<Compile Include="Model\Nzbx\NzbxRecentItem.cs" />
<Compile Include="Model\Nzbx\NzbxVotesModel.cs" />
@ -250,15 +250,15 @@
<Compile Include="Tv\SeasonRepository.cs" />
<Compile Include="Tv\SeriesRepository.cs" />
<Compile Include="Tv\QualityModel.cs" />
<Compile Include="Model\Sabnzbd\SabAddResponse.cs" />
<Compile Include="Model\Sabnzbd\SabHistoryItem.cs" />
<Compile Include="Model\Sabnzbd\SabHistory.cs" />
<Compile Include="Model\Sabnzbd\SabJsonError.cs" />
<Compile Include="Model\Sabnzbd\SabQueue.cs" />
<Compile Include="Model\Sabnzbd\SabCategoryModel.cs" />
<Compile Include="Model\Sabnzbd\SabModel.cs" />
<Compile Include="Model\Sabnzbd\SabQueueItem.cs" />
<Compile Include="Model\Sabnzbd\SabVersionModel.cs" />
<Compile Include="Download\Clients\Sabnzbd\SabAddResponse.cs" />
<Compile Include="Download\Clients\Sabnzbd\SabHistoryItem.cs" />
<Compile Include="Download\Clients\Sabnzbd\SabHistory.cs" />
<Compile Include="Download\Clients\Sabnzbd\SabJsonError.cs" />
<Compile Include="Download\Clients\Sabnzbd\SabQueue.cs" />
<Compile Include="Download\Clients\Sabnzbd\SabCategoryModel.cs" />
<Compile Include="Download\Clients\Sabnzbd\SabModel.cs" />
<Compile Include="Download\Clients\Sabnzbd\SabQueueItem.cs" />
<Compile Include="Download\Clients\Sabnzbd\SabVersionModel.cs" />
<Compile Include="Model\StatsModel.cs" />
<Compile Include="Model\TvRage\TvRageEpisode.cs" />
<Compile Include="Model\TvRage\TvRageSearchResult.cs" />
@ -279,13 +279,12 @@
<Compile Include="AutofacSignalrDependencyResolver.cs" />
<Compile Include="MediaCover\MediaCoverService.cs" />
<Compile Include="DecisionEngine\LanguageSpecification.cs" />
<Compile Include="Providers\DownloadClients\NzbgetProvider.cs" />
<Compile Include="Download\Clients\Nzbget\NzbgetProvider.cs" />
<Compile Include="Providers\MediaInfoProvider.cs" />
<Compile Include="DecisionEngine\AllowedReleaseGroupSpecification.cs" />
<Compile Include="DecisionEngine\CustomStartDateSpecification.cs" />
<Compile Include="Providers\DownloadClients\PneumaticProvider.cs" />
<Compile Include="Download\Clients\PneumaticProvider.cs" />
<Compile Include="Indexers\Nzbx.cs" />
<Compile Include="Providers\Hubs\EpisodeHub.cs" />
<Compile Include="Indexers\NzbClub.cs" />
<Compile Include="Indexers\NzbIndex.cs" />
<Compile Include="Indexers\FileSharingTalk.cs" />
@ -340,15 +339,9 @@
<Compile Include="Providers\Converting\HandbrakeProvider.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Providers\Core\ArchiveProvider.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Configuration\ConfigService.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Providers\Core\UdpProvider.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="DecisionEngine\AcceptableSizeSpecification.cs">
<SubType>Code</SubType>
</Compile>
@ -382,13 +375,13 @@
<Compile Include="Providers\DiskScanProvider.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Providers\DownloadClients\BlackholeProvider.cs">
<Compile Include="Download\Clients\BlackholeProvider.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Providers\DownloadClients\IDownloadClient.cs">
<Compile Include="Download\IDownloadClient.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Providers\DownloadClients\SabProvider.cs">
<Compile Include="Download\Clients\Sabnzbd\SabProvider.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Download\DownloadProvider.cs">
@ -480,9 +473,6 @@
<Compile Include="Tv\SeriesService.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Providers\SignalRProvider.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Providers\SmtpProvider.cs">
<SubType>Code</SubType>
</Compile>
@ -511,7 +501,7 @@
<Compile Include="Model\EpisodeParseResult.cs" />
<Compile Include="Model\EpisodeSortingType.cs" />
<Compile Include="Model\EpisodeStatusType.cs" />
<Compile Include="Model\Sabnzbd\SabPriorityType.cs" />
<Compile Include="Download\Clients\Sabnzbd\SabPriorityType.cs" />
<Compile Include="Model\SeasonParseResult.cs" />
<Compile Include="MediaFiles\EpisodeFile.cs" />
<Compile Include="Model\Notification\ProgressNotificationStatus.cs" />

2
NzbDrone.Core/Providers/AutoConfigureProvider.cs
Unescape View File

@ -7,7 +7,7 @@ using System.Net.NetworkInformation;
using System.Text.RegularExpressions;
using NLog;
using NzbDrone.Core.Model;
using NzbDrone.Core.Model.Sabnzbd;
using NzbDrone.Core.Download.Clients.Sabnzbd;
namespace NzbDrone.Core.Providers
{

1
NzbDrone.Core/Providers/Converting/AtomicParsleyProvider.cs
Unescape View File

@ -5,7 +5,6 @@ using NLog;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Tv;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Repository;
namespace NzbDrone.Core.Providers.Converting

1
NzbDrone.Core/Providers/Converting/HandbrakeProvider.cs
Unescape View File

@ -5,7 +5,6 @@ using NLog;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Tv;
using NzbDrone.Core.Model.Notification;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Repository;
namespace NzbDrone.Core.Providers.Converting

10
NzbDrone.Core/Providers/DiskScanProvider.cs
Unescape View File

@ -21,21 +21,18 @@ namespace NzbDrone.Core.Providers
private readonly DiskProvider _diskProvider;
private readonly IEpisodeService _episodeService;
private readonly IMediaFileService _mediaFileService;
private readonly SignalRProvider _signalRProvider;
private readonly IConfigService _configService;
private readonly RecycleBinProvider _recycleBinProvider;
private readonly MediaInfoProvider _mediaInfoProvider;
private readonly ISeriesRepository _seriesRepository;
private readonly IEventAggregator _eventAggregator;
public DiskScanProvider(DiskProvider diskProvider, IEpisodeService episodeService, IMediaFileService mediaFileService,
SignalRProvider signalRProvider, IConfigService configService,
public DiskScanProvider(DiskProvider diskProvider, IEpisodeService episodeService, IMediaFileService mediaFileService, IConfigService configService,
RecycleBinProvider recycleBinProvider, MediaInfoProvider mediaInfoProvider, ISeriesRepository seriesRepository, IEventAggregator eventAggregator)
{
_diskProvider = diskProvider;
_episodeService = episodeService;
_mediaFileService = mediaFileService;
_signalRProvider = signalRProvider;
_configService = configService;
_recycleBinProvider = recycleBinProvider;
_mediaInfoProvider = mediaInfoProvider;
@ -168,7 +165,7 @@ namespace NzbDrone.Core.Providers
//Todo: We shouldn't actually import the file until we confirm its the only one we want.
//Todo: Separate episodeFile creation from importing (pass file to import to import)
_mediaFileService.Add(episodeFile);
_mediaFileService.Add(episodeFile);
//Link file to all episodes
foreach (var ep in episodes)
@ -233,9 +230,6 @@ namespace NzbDrone.Core.Providers
if (newDownload)
{
_eventAggregator.Publish(new EpisodeDownloadedEvent(parseResult));
foreach (var episode in episodes)
_signalRProvider.UpdateEpisodeStatus(episode.Id, EpisodeStatusType.Ready, parseResult.Quality);
}
return episodeFile;

12
NzbDrone.Core/Providers/Hubs/EpisodeHub.cs
Unescape View File

@ -1,12 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using SignalR.Hubs;
namespace NzbDrone.Core.Providers.Hubs
{
public class EpisodeHub : Hub
{
}
}

1
NzbDrone.Core/Providers/RecycleBinProvider.cs
Unescape View File

@ -6,7 +6,6 @@ using System.Text;
using NLog;
using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Providers.Core;
namespace NzbDrone.Core.Providers
{

46
NzbDrone.Core/Providers/SignalRProvider.cs
Unescape View File

@ -1,46 +0,0 @@
using System;
using System.Linq;
using NLog;
using NzbDrone.Common.Eventing;
using NzbDrone.Core.Download;
using NzbDrone.Core.Tv;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers.Hubs;
using SignalR;
namespace NzbDrone.Core.Providers
{
public class SignalRProvider : IHandle<EpisodeGrabbedEvent>
{
private static readonly Logger logger = LogManager.GetCurrentClassLogger();
public virtual void UpdateEpisodeStatus(int episodeId, EpisodeStatusType episodeStatus, QualityModel quality)
{
try
{
logger.Trace("Sending Status update to client. EpisodeId: {0}, Status: {1}", episodeId, episodeStatus);
var context = GlobalHost.ConnectionManager.GetHubContext<EpisodeHub>();
context.Clients.updatedStatus(new
{
EpisodeId = episodeId,
EpisodeStatus = episodeStatus.ToString(),
Quality = (quality == null ? String.Empty : quality.Quality.ToString())
});
}
catch (Exception ex)
{
logger.TraceException("Error", ex);
throw;
}
}
public void Handle(EpisodeGrabbedEvent message)
{
foreach (var episode in message.ParseResult.Episodes)
{
UpdateEpisodeStatus(episode.Id, EpisodeStatusType.Downloading, message.ParseResult.Quality);
}
}
}
}

1
NzbDrone.Core/Providers/TwitterProvider.cs
Unescape View File

@ -6,7 +6,6 @@ using NLog;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Model;
using NzbDrone.Core.Model.Twitter;
using NzbDrone.Core.Providers.Core;
using Twitterizer;
namespace NzbDrone.Core.Providers

1
NzbDrone.Core/Providers/UpdateProvider.cs
Unescape View File

@ -9,7 +9,6 @@ using NLog;
using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers.Core;
namespace NzbDrone.Core.Providers

2
NzbDrone.Core/Providers/Xbmc/EventClientProvider.cs
Unescape View File

@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.Text;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Common;
using NzbDrone.Core.Model.Xbmc;
namespace NzbDrone.Core.Providers.Xbmc

1
NzbDrone.Core/Providers/XbmcProvider.cs
Unescape View File

@ -11,7 +11,6 @@ using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Tv;
using NzbDrone.Core.Model.Xbmc;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Providers.Xbmc;
using NzbDrone.Core.Repository;

Write Preview
Loading…
Cancel
Save