Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed RemotePathMapping infrastructure. OutputPath on items is now DownloadClientPath.

This commit is contained in:
Taloth Saldono 2017-12-16 09:52:43 +01:00
parent e089bfb4d2
commit 5c1491ca06
31 changed files with 94 additions and 327 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/NzbDrone.Core/Datastore/TableMapping.cs
View File

@ -15,7 +15,6 @@ using NzbDrone.Core.Instrumentation;
using NzbDrone.Core.Jobs; using NzbDrone.Core.Jobs;
using NzbDrone.Core.MediaFiles; using NzbDrone.Core.MediaFiles;
using NzbDrone.Core.Profiles.Delay; using NzbDrone.Core.Profiles.Delay;
using NzbDrone.Core.RemotePathMappings;
using NzbDrone.Core.Notifications; using NzbDrone.Core.Notifications;
using NzbDrone.Core.Organizer; using NzbDrone.Core.Organizer;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
@ -106,7 +105,6 @@ namespace NzbDrone.Core.Datastore
Mapper.Entity<PendingRelease>().RegisterModel("PendingReleases") Mapper.Entity<PendingRelease>().RegisterModel("PendingReleases")
.Ignore(e => e.RemoteEpisode); .Ignore(e => e.RemoteEpisode);
Mapper.Entity<RemotePathMapping>().RegisterModel("RemotePathMappings");
Mapper.Entity<Tag>().RegisterModel("Tags"); Mapper.Entity<Tag>().RegisterModel("Tags");
Mapper.Entity<Restriction>().RegisterModel("Restrictions"); Mapper.Entity<Restriction>().RegisterModel("Restrictions");

8
src/NzbDrone.Core/Download/Clients/Blackhole/TorrentBlackhole.cs
View File

@ -11,7 +11,6 @@ using NzbDrone.Core.Configuration;
using NzbDrone.Core.MediaFiles.TorrentInfo; using NzbDrone.Core.MediaFiles.TorrentInfo;
using NzbDrone.Core.Organizer; using NzbDrone.Core.Organizer;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.RemotePathMappings;
using NzbDrone.Core.ThingiProvider; using NzbDrone.Core.ThingiProvider;
namespace NzbDrone.Core.Download.Clients.Blackhole namespace NzbDrone.Core.Download.Clients.Blackhole
@ -29,9 +28,8 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
IHttpClient httpClient, IHttpClient httpClient,
IConfigService configService, IConfigService configService,
IDiskProvider diskProvider, IDiskProvider diskProvider,
IRemotePathMappingService remotePathMappingService,
Logger logger) Logger logger)
: base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, logger) : base(torrentFileInfoReader, httpClient, configService, diskProvider, logger)
{ {
_scanWatchFolder = scanWatchFolder; _scanWatchFolder = scanWatchFolder;
@ -99,7 +97,7 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
TotalSize = item.TotalSize, TotalSize = item.TotalSize,
RemainingTime = item.RemainingTime, RemainingTime = item.RemainingTime,
OutputPath = item.OutputPath, OutputPath = new DownloadClientPath(Definition.Id, item.OutputPath),
Status = item.Status, Status = item.Status,
@ -124,7 +122,7 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
return new DownloadClientInfo return new DownloadClientInfo
{ {
IsLocalhost = true, IsLocalhost = true,
OutputRootFolders = new List<OsPath> { new OsPath(Settings.WatchFolder) } OutputRootFolders = new List<DownloadClientPath> { new DownloadClientPath(Definition.Id, new OsPath(Settings.WatchFolder)) }
}; };
} }

8
src/NzbDrone.Core/Download/Clients/Blackhole/UsenetBlackhole.cs
View File

@ -9,7 +9,6 @@ using NzbDrone.Common.Http;
using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration;
using NzbDrone.Core.Organizer; using NzbDrone.Core.Organizer;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.RemotePathMappings;
namespace NzbDrone.Core.Download.Clients.Blackhole namespace NzbDrone.Core.Download.Clients.Blackhole
{ {
@ -23,10 +22,9 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
IHttpClient httpClient, IHttpClient httpClient,
IConfigService configService, IConfigService configService,
IDiskProvider diskProvider, IDiskProvider diskProvider,
IRemotePathMappingService remotePathMappingService,
IValidateNzbs nzbValidationService, IValidateNzbs nzbValidationService,
Logger logger) Logger logger)
: base(httpClient, configService, diskProvider, remotePathMappingService, nzbValidationService, logger) : base(httpClient, configService, diskProvider, nzbValidationService, logger)
{ {
_scanWatchFolder = scanWatchFolder; _scanWatchFolder = scanWatchFolder;
@ -67,7 +65,7 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
TotalSize = item.TotalSize, TotalSize = item.TotalSize,
RemainingTime = item.RemainingTime, RemainingTime = item.RemainingTime,
OutputPath = item.OutputPath, OutputPath = new DownloadClientPath(Definition.Id, item.OutputPath),
Status = item.Status, Status = item.Status,
@ -92,7 +90,7 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
return new DownloadClientInfo return new DownloadClientInfo
{ {
IsLocalhost = true, IsLocalhost = true,
OutputRootFolders = new List<OsPath> { new OsPath(Settings.WatchFolder) } OutputRootFolders = new List<DownloadClientPath> { new DownloadClientPath(Definition.Id, new OsPath(Settings.WatchFolder)) }
}; };
} }

10
src/NzbDrone.Core/Download/Clients/Deluge/Deluge.cs
View File

@ -11,7 +11,6 @@ using NzbDrone.Core.Validation;
using NLog; using NLog;
using FluentValidation.Results; using FluentValidation.Results;
using System.Net; using System.Net;
using NzbDrone.Core.RemotePathMappings;
namespace NzbDrone.Core.Download.Clients.Deluge namespace NzbDrone.Core.Download.Clients.Deluge
{ {
@ -24,9 +23,8 @@ namespace NzbDrone.Core.Download.Clients.Deluge
IHttpClient httpClient, IHttpClient httpClient,
IConfigService configService, IConfigService configService,
IDiskProvider diskProvider, IDiskProvider diskProvider,
IRemotePathMappingService remotePathMappingService,
Logger logger) Logger logger)
: base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, logger) : base(torrentFileInfoReader, httpClient, configService, diskProvider, logger)
{ {
_proxy = proxy; _proxy = proxy;
} }
@ -106,8 +104,8 @@ namespace NzbDrone.Core.Download.Clients.Deluge
item.DownloadClient = Definition.Name; item.DownloadClient = Definition.Name;
var outputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(torrent.DownloadPath)); var outputPath = new OsPath(torrent.DownloadPath) + torrent.Name;
item.OutputPath = outputPath + torrent.Name; item.OutputPath = new DownloadClientPath(Definition.Id, outputPath);
item.RemainingSize = torrent.Size - torrent.BytesDownloaded; item.RemainingSize = torrent.Size - torrent.BytesDownloaded;
try try
@ -176,7 +174,7 @@ namespace NzbDrone.Core.Download.Clients.Deluge
if (!destDir.IsEmpty) if (!destDir.IsEmpty)
{ {
status.OutputRootFolders = new List<OsPath> { _remotePathMappingService.RemapRemoteToLocal(Settings.Host, destDir) }; status.OutputRootFolders = new List<DownloadClientPath> { new DownloadClientPath(Definition.Id, destDir) };
} }
return status; return status;

12
src/NzbDrone.Core/Download/Clients/DownloadStation/TorrentDownloadStation.cs
View File

@ -12,7 +12,6 @@ using NzbDrone.Core.Configuration;
using NzbDrone.Core.Download.Clients.DownloadStation.Proxies; using NzbDrone.Core.Download.Clients.DownloadStation.Proxies;
using NzbDrone.Core.MediaFiles.TorrentInfo; using NzbDrone.Core.MediaFiles.TorrentInfo;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.RemotePathMappings;
using NzbDrone.Core.Validation; using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Download.Clients.DownloadStation namespace NzbDrone.Core.Download.Clients.DownloadStation
@ -34,9 +33,8 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
IHttpClient httpClient, IHttpClient httpClient,
IConfigService configService, IConfigService configService,
IDiskProvider diskProvider, IDiskProvider diskProvider,
IRemotePathMappingService remotePathMappingService,
Logger logger) Logger logger)
: base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, logger) : base(torrentFileInfoReader, httpClient, configService, diskProvider, logger)
{ {
_dsInfoProxy = dsInfoProxy; _dsInfoProxy = dsInfoProxy;
_dsTaskProxy = dsTaskProxy; _dsTaskProxy = dsTaskProxy;
@ -96,7 +94,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
if (item.Status == DownloadItemStatus.Completed || item.Status == DownloadItemStatus.Failed) if (item.Status == DownloadItemStatus.Completed || item.Status == DownloadItemStatus.Failed)
{ {
item.OutputPath = GetOutputPath(outputPath, torrent, serialNumber); item.OutputPath = new DownloadClientPath(Definition.Id, GetOutputPath(outputPath, torrent, serialNumber));
} }
items.Add(item); items.Add(item);
@ -114,7 +112,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
return new DownloadClientInfo return new DownloadClientInfo
{ {
IsLocalhost = Settings.Host == "127.0.0.1" || Settings.Host == "localhost", IsLocalhost = Settings.Host == "127.0.0.1" || Settings.Host == "localhost",
OutputRootFolders = new List<OsPath> { _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(path)) } OutputRootFolders = new List<DownloadClientPath> { new DownloadClientPath(Definition.Id, new OsPath(path)) }
}; };
} }
catch (DownloadClientException e) catch (DownloadClientException e)
@ -140,9 +138,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
{ {
var fullPath = _sharedFolderResolver.RemapToFullPath(outputPath, Settings, serialNumber); var fullPath = _sharedFolderResolver.RemapToFullPath(outputPath, Settings, serialNumber);
var remotePath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, fullPath); var finalPath = fullPath + torrent.Title;
var finalPath = remotePath + torrent.Title;
return finalPath; return finalPath;
} }

10
src/NzbDrone.Core/Download/Clients/DownloadStation/UsenetDownloadStation.cs
View File

@ -10,7 +10,6 @@ using NzbDrone.Common.Http;
using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration;
using NzbDrone.Core.Download.Clients.DownloadStation.Proxies; using NzbDrone.Core.Download.Clients.DownloadStation.Proxies;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.RemotePathMappings;
using NzbDrone.Core.Validation; using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Download.Clients.DownloadStation namespace NzbDrone.Core.Download.Clients.DownloadStation
@ -31,11 +30,10 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
IHttpClient httpClient, IHttpClient httpClient,
IConfigService configService, IConfigService configService,
IDiskProvider diskProvider, IDiskProvider diskProvider,
IRemotePathMappingService remotePathMappingService,
IValidateNzbs nzbValidationService, IValidateNzbs nzbValidationService,
Logger logger Logger logger
) )
: base(httpClient, configService, diskProvider, remotePathMappingService, nzbValidationService, logger) : base(httpClient, configService, diskProvider, nzbValidationService, logger)
{ {
_dsInfoProxy = dsInfoProxy; _dsInfoProxy = dsInfoProxy;
_dsTaskProxy = dsTaskProxy; _dsTaskProxy = dsTaskProxy;
@ -111,7 +109,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
if (item.Status == DownloadItemStatus.Completed || item.Status == DownloadItemStatus.Failed) if (item.Status == DownloadItemStatus.Completed || item.Status == DownloadItemStatus.Failed)
{ {
item.OutputPath = GetOutputPath(outputPath, nzb, serialNumber); item.OutputPath = new DownloadClientPath(Definition.Id, GetOutputPath(outputPath, nzb, serialNumber));
} }
items.Add(item); items.Add(item);
@ -124,7 +122,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
{ {
var fullPath = _sharedFolderResolver.RemapToFullPath(outputPath, Settings, serialNumber); var fullPath = _sharedFolderResolver.RemapToFullPath(outputPath, Settings, serialNumber);
var remotePath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, fullPath); var remotePath = fullPath;
var finalPath = remotePath + task.Title; var finalPath = remotePath + task.Title;
@ -140,7 +138,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
return new DownloadClientInfo return new DownloadClientInfo
{ {
IsLocalhost = Settings.Host == "127.0.0.1" || Settings.Host == "localhost", IsLocalhost = Settings.Host == "127.0.0.1" || Settings.Host == "localhost",
OutputRootFolders = new List<OsPath> { _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(path)) } OutputRootFolders = new List<DownloadClientPath> { new DownloadClientPath(Definition.Id, new OsPath(path)) }
}; };
} }
catch (DownloadClientException e) catch (DownloadClientException e)

10
src/NzbDrone.Core/Download/Clients/Hadouken/Hadouken.cs
View File

@ -10,7 +10,6 @@ using NzbDrone.Core.Configuration;
using NzbDrone.Core.Download.Clients.Hadouken.Models; using NzbDrone.Core.Download.Clients.Hadouken.Models;
using NzbDrone.Core.MediaFiles.TorrentInfo; using NzbDrone.Core.MediaFiles.TorrentInfo;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.RemotePathMappings;
using NzbDrone.Core.Validation; using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Download.Clients.Hadouken namespace NzbDrone.Core.Download.Clients.Hadouken
@ -24,9 +23,8 @@ namespace NzbDrone.Core.Download.Clients.Hadouken
IHttpClient httpClient, IHttpClient httpClient,
IConfigService configService, IConfigService configService,
IDiskProvider diskProvider, IDiskProvider diskProvider,
IRemotePathMappingService remotePathMappingService,
Logger logger) Logger logger)
: base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, logger) : base(torrentFileInfoReader, httpClient, configService, diskProvider, logger)
{ {
_proxy = proxy; _proxy = proxy;
} }
@ -46,7 +44,7 @@ namespace NzbDrone.Core.Download.Clients.Hadouken
continue; continue;
} }
var outputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(torrent.SavePath)); var outputPath = new OsPath(torrent.SavePath);
var eta = TimeSpan.FromSeconds(0); var eta = TimeSpan.FromSeconds(0);
if (torrent.DownloadRate > 0 && torrent.TotalSize > 0) if (torrent.DownloadRate > 0 && torrent.TotalSize > 0)
@ -58,7 +56,7 @@ namespace NzbDrone.Core.Download.Clients.Hadouken
{ {
DownloadClient = Definition.Name, DownloadClient = Definition.Name,
DownloadId = torrent.InfoHash.ToUpper(), DownloadId = torrent.InfoHash.ToUpper(),
OutputPath = outputPath + torrent.Name, OutputPath = new DownloadClientPath(Definition.Id, outputPath + torrent.Name),
RemainingSize = torrent.TotalSize - torrent.DownloadedBytes, RemainingSize = torrent.TotalSize - torrent.DownloadedBytes,
RemainingTime = eta, RemainingTime = eta,
Title = torrent.Name, Title = torrent.Name,
@ -119,7 +117,7 @@ namespace NzbDrone.Core.Download.Clients.Hadouken
if (!destDir.IsEmpty) if (!destDir.IsEmpty)
{ {
status.OutputRootFolders = new List<OsPath> { _remotePathMappingService.RemapRemoteToLocal(Settings.Host, destDir) }; status.OutputRootFolders = new List<DownloadClientPath> { new DownloadClientPath(Definition.Id, destDir) };
} }
return status; return status;

8
src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortex.cs
View File

@ -10,7 +10,6 @@ using NzbDrone.Common.Http;
using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Validation; using NzbDrone.Core.Validation;
using NzbDrone.Core.RemotePathMappings;
namespace NzbDrone.Core.Download.Clients.NzbVortex namespace NzbDrone.Core.Download.Clients.NzbVortex
{ {
@ -22,10 +21,9 @@ namespace NzbDrone.Core.Download.Clients.NzbVortex
IHttpClient httpClient, IHttpClient httpClient,
IConfigService configService, IConfigService configService,
IDiskProvider diskProvider, IDiskProvider diskProvider,
IRemotePathMappingService remotePathMappingService,
IValidateNzbs nzbValidationService, IValidateNzbs nzbValidationService,
Logger logger) Logger logger)
: base(httpClient, configService, diskProvider, remotePathMappingService, nzbValidationService, logger) : base(httpClient, configService, diskProvider, nzbValidationService, logger)
{ {
_proxy = proxy; _proxy = proxy;
} }
@ -88,7 +86,7 @@ namespace NzbDrone.Core.Download.Clients.NzbVortex
break; break;
} }
queueItem.OutputPath = GetOutputPath(vortexQueueItem, queueItem); queueItem.OutputPath = new DownloadClientPath(Definition.Id, GetOutputPath(vortexQueueItem, queueItem));
if (vortexQueueItem.State == NzbVortexStateType.PasswordRequest) if (vortexQueueItem.State == NzbVortexStateType.PasswordRequest)
{ {
@ -221,7 +219,7 @@ namespace NzbDrone.Core.Download.Clients.NzbVortex
private OsPath GetOutputPath(NzbVortexQueueItem vortexQueueItem, DownloadClientItem queueItem) private OsPath GetOutputPath(NzbVortexQueueItem vortexQueueItem, DownloadClientItem queueItem)
{ {
var outputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(vortexQueueItem.DestinationPath)); var outputPath = new OsPath(vortexQueueItem.DestinationPath);
if (outputPath.FileName == vortexQueueItem.UiTitle) if (outputPath.FileName == vortexQueueItem.UiTitle)
{ {

8
src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs
View File

@ -10,7 +10,6 @@ using NzbDrone.Common.Extensions;
using NzbDrone.Common.Http; using NzbDrone.Common.Http;
using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.RemotePathMappings;
using NzbDrone.Core.Validation; using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Download.Clients.Nzbget namespace NzbDrone.Core.Download.Clients.Nzbget
@ -25,10 +24,9 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
IHttpClient httpClient, IHttpClient httpClient,
IConfigService configService, IConfigService configService,
IDiskProvider diskProvider, IDiskProvider diskProvider,
IRemotePathMappingService remotePathMappingService,
IValidateNzbs nzbValidationService, IValidateNzbs nzbValidationService,
Logger logger) Logger logger)
: base(httpClient, configService, diskProvider, remotePathMappingService, nzbValidationService, logger) : base(httpClient, configService, diskProvider, nzbValidationService, logger)
{ {
_proxy = proxy; _proxy = proxy;
} }
@ -123,7 +121,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
historyItem.DownloadId = droneParameter == null ? item.Id.ToString() : droneParameter.Value.ToString(); historyItem.DownloadId = droneParameter == null ? item.Id.ToString() : droneParameter.Value.ToString();
historyItem.Title = item.Name; historyItem.Title = item.Name;
historyItem.TotalSize = MakeInt64(item.FileSizeHi, item.FileSizeLo); historyItem.TotalSize = MakeInt64(item.FileSizeHi, item.FileSizeLo);
historyItem.OutputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(item.DestDir)); historyItem.OutputPath = new DownloadClientPath(Definition.Id, new OsPath(item.DestDir));
historyItem.Category = item.Category; historyItem.Category = item.Category;
historyItem.Message = $"PAR Status: {item.ParStatus} - Unpack Status: {item.UnpackStatus} - Move Status: {item.MoveStatus} - Script Status: {item.ScriptStatus} - Delete Status: {item.DeleteStatus} - Mark Status: {item.MarkStatus}"; historyItem.Message = $"PAR Status: {item.ParStatus} - Unpack Status: {item.UnpackStatus} - Move Status: {item.MoveStatus} - Script Status: {item.ScriptStatus} - Delete Status: {item.DeleteStatus} - Mark Status: {item.MarkStatus}";
historyItem.Status = DownloadItemStatus.Completed; historyItem.Status = DownloadItemStatus.Completed;
@ -208,7 +206,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
if (category != null) if (category != null)
{ {
status.OutputRootFolders = new List<OsPath> { _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(category.DestDir)) }; status.OutputRootFolders = new List<DownloadClientPath> { new DownloadClientPath(Definition.Id, new OsPath(category.DestDir)) };
} }
return status; return status;

6
src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs
View File

@ -8,7 +8,6 @@ using NzbDrone.Common.Extensions;
using NzbDrone.Common.Http; using NzbDrone.Common.Http;
using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration;
using NzbDrone.Core.Indexers; using NzbDrone.Core.Indexers;
using NzbDrone.Core.RemotePathMappings;
using NzbDrone.Core.Organizer; using NzbDrone.Core.Organizer;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
@ -21,9 +20,8 @@ namespace NzbDrone.Core.Download.Clients.Pneumatic
public Pneumatic(IHttpClient httpClient, public Pneumatic(IHttpClient httpClient,
IConfigService configService, IConfigService configService,
IDiskProvider diskProvider, IDiskProvider diskProvider,
IRemotePathMappingService remotePathMappingService,
Logger logger) Logger logger)
: base(configService, diskProvider, remotePathMappingService, logger) : base(configService, diskProvider, logger)
{ {
_httpClient = httpClient; _httpClient = httpClient;
} }
@ -82,7 +80,7 @@ namespace NzbDrone.Core.Download.Clients.Pneumatic
TotalSize = _diskProvider.GetFileSize(file), TotalSize = _diskProvider.GetFileSize(file),
OutputPath = new OsPath(file) OutputPath = new DownloadClientPath(Definition.Id, new OsPath(file))
}; };
if (_diskProvider.IsFileLocked(file)) if (_diskProvider.IsFileLocked(file))

17
src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrent.cs
View File

@ -11,7 +11,6 @@ using NzbDrone.Core.Validation;
using FluentValidation.Results; using FluentValidation.Results;
using System.Net; using System.Net;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.RemotePathMappings;
namespace NzbDrone.Core.Download.Clients.QBittorrent namespace NzbDrone.Core.Download.Clients.QBittorrent
{ {
@ -24,9 +23,8 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
IHttpClient httpClient, IHttpClient httpClient,
IConfigService configService, IConfigService configService,
IDiskProvider diskProvider, IDiskProvider diskProvider,
IRemotePathMappingService remotePathMappingService,
Logger logger) Logger logger)
: base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, logger) : base(torrentFileInfoReader, httpClient, configService, diskProvider, logger)
{ {
_proxy = proxy; _proxy = proxy;
} }
@ -109,16 +107,17 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
item.RemainingSize = (long)(torrent.Size * (1.0 - torrent.Progress)); item.RemainingSize = (long)(torrent.Size * (1.0 - torrent.Progress));
item.RemainingTime = TimeSpan.FromSeconds(torrent.Eta); item.RemainingTime = TimeSpan.FromSeconds(torrent.Eta);
item.OutputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(torrent.SavePath)); var outputPath = new OsPath(torrent.SavePath);
if (!outputPath.IsEmpty && outputPath.FileName != torrent.Name)
{
outputPath += torrent.Name;
}
item.OutputPath = new DownloadClientPath(Definition.Id, outputPath);
// Avoid removing torrents that haven't reached the global max ratio. // Avoid removing torrents that haven't reached the global max ratio.
// Removal also requires the torrent to be paused, in case a higher max ratio was set on the torrent itself (which is not exposed by the api). // Removal also requires the torrent to be paused, in case a higher max ratio was set on the torrent itself (which is not exposed by the api).
item.CanMoveFiles = item.CanBeRemoved = (!config.MaxRatioEnabled || config.MaxRatio <= torrent.Ratio) && torrent.State == "pausedUP"; item.CanMoveFiles = item.CanBeRemoved = (!config.MaxRatioEnabled || config.MaxRatio <= torrent.Ratio) && torrent.State == "pausedUP";
if (!item.OutputPath.IsEmpty && item.OutputPath.FileName != torrent.Name)
{
item.OutputPath += torrent.Name;
}
switch (torrent.State) switch (torrent.State)
{ {
@ -176,7 +175,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
return new DownloadClientInfo return new DownloadClientInfo
{ {
IsLocalhost = Settings.Host == "127.0.0.1" || Settings.Host == "localhost", IsLocalhost = Settings.Host == "127.0.0.1" || Settings.Host == "localhost",
OutputRootFolders = new List<OsPath> { _remotePathMappingService.RemapRemoteToLocal(Settings.Host, destDir) } OutputRootFolders = new List<DownloadClientPath> { new DownloadClientPath(Definition.Id, destDir) }
}; };
} }

15
src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs
View File

@ -10,7 +10,6 @@ using NzbDrone.Common.Http;
using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Validation; using NzbDrone.Core.Validation;
using NzbDrone.Core.RemotePathMappings;
namespace NzbDrone.Core.Download.Clients.Sabnzbd namespace NzbDrone.Core.Download.Clients.Sabnzbd
{ {
@ -22,10 +21,9 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
IHttpClient httpClient, IHttpClient httpClient,
IConfigService configService, IConfigService configService,
IDiskProvider diskProvider, IDiskProvider diskProvider,
IRemotePathMappingService remotePathMappingService,
IValidateNzbs nzbValidationService, IValidateNzbs nzbValidationService,
Logger logger) Logger logger)
: base(httpClient, configService, diskProvider, remotePathMappingService, nzbValidationService, logger) : base(httpClient, configService, diskProvider, nzbValidationService, logger)
{ {
_proxy = proxy; _proxy = proxy;
} }
@ -163,23 +161,22 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
historyItem.Status = DownloadItemStatus.Downloading; historyItem.Status = DownloadItemStatus.Downloading;
} }
var outputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(sabHistoryItem.Storage)); var outputPath = new OsPath(sabHistoryItem.Storage);
if (!outputPath.IsEmpty) if (!outputPath.IsEmpty)
{ {
historyItem.OutputPath = outputPath;
var parent = outputPath.Directory; var parent = outputPath.Directory;
while (!parent.IsEmpty) while (!parent.IsEmpty)
{ {
if (parent.FileName == sabHistoryItem.Title) if (parent.FileName == sabHistoryItem.Title)
{ {
historyItem.OutputPath = parent; outputPath = parent;
} }
parent = parent.Directory; parent = parent.Directory;
} }
}
historyItem.OutputPath = new DownloadClientPath(Definition.Id, outputPath);
}
historyItems.Add(historyItem); historyItems.Add(historyItem);
} }
@ -261,7 +258,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
if (category != null) if (category != null)
{ {
status.OutputRootFolders = new List<OsPath> { _remotePathMappingService.RemapRemoteToLocal(Settings.Host, category.FullPath) }; status.OutputRootFolders = new List<DownloadClientPath> { new DownloadClientPath(Definition.Id, category.FullPath) };
} }
return status; return status;

4
src/NzbDrone.Core/Download/Clients/Transmission/Transmission.cs
View File

@ -6,7 +6,6 @@ using NzbDrone.Core.Configuration;
using NLog; using NLog;
using FluentValidation.Results; using FluentValidation.Results;
using NzbDrone.Core.MediaFiles.TorrentInfo; using NzbDrone.Core.MediaFiles.TorrentInfo;
using NzbDrone.Core.RemotePathMappings;
namespace NzbDrone.Core.Download.Clients.Transmission namespace NzbDrone.Core.Download.Clients.Transmission
{ {
@ -17,9 +16,8 @@ namespace NzbDrone.Core.Download.Clients.Transmission
IHttpClient httpClient, IHttpClient httpClient,
IConfigService configService, IConfigService configService,
IDiskProvider diskProvider, IDiskProvider diskProvider,
IRemotePathMappingService remotePathMappingService,
Logger logger) Logger logger)
: base(proxy, torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, logger) : base(proxy, torrentFileInfoReader, httpClient, configService, diskProvider, logger)
{ {
} }

10
src/NzbDrone.Core/Download/Clients/Transmission/TransmissionBase.cs
View File

@ -10,7 +10,6 @@ using NzbDrone.Common.Http;
using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration;
using NzbDrone.Core.MediaFiles.TorrentInfo; using NzbDrone.Core.MediaFiles.TorrentInfo;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.RemotePathMappings;
using NzbDrone.Core.Validation; using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Download.Clients.Transmission namespace NzbDrone.Core.Download.Clients.Transmission
@ -24,9 +23,8 @@ namespace NzbDrone.Core.Download.Clients.Transmission
IHttpClient httpClient, IHttpClient httpClient,
IConfigService configService, IConfigService configService,
IDiskProvider diskProvider, IDiskProvider diskProvider,
IRemotePathMappingService remotePathMappingService,
Logger logger) Logger logger)
: base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, logger) : base(torrentFileInfoReader, httpClient, configService, diskProvider, logger)
{ {
_proxy = proxy; _proxy = proxy;
} }
@ -54,8 +52,6 @@ namespace NzbDrone.Core.Download.Clients.Transmission
if (!directories.Contains(Settings.TvCategory)) continue; if (!directories.Contains(Settings.TvCategory)) continue;
} }
outputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, outputPath);
var item = new DownloadClientItem(); var item = new DownloadClientItem();
item.DownloadId = torrent.HashString.ToUpper(); item.DownloadId = torrent.HashString.ToUpper();
item.Category = Settings.TvCategory; item.Category = Settings.TvCategory;
@ -63,7 +59,7 @@ namespace NzbDrone.Core.Download.Clients.Transmission
item.DownloadClient = Definition.Name; item.DownloadClient = Definition.Name;
item.OutputPath = GetOutputPath(outputPath, torrent); item.OutputPath = new DownloadClientPath(Definition.Id, GetOutputPath(outputPath, torrent));
item.TotalSize = torrent.TotalSize; item.TotalSize = torrent.TotalSize;
item.RemainingSize = torrent.LeftUntilDone; item.RemainingSize = torrent.LeftUntilDone;
if (torrent.Eta >= 0) if (torrent.Eta >= 0)
@ -122,7 +118,7 @@ namespace NzbDrone.Core.Download.Clients.Transmission
return new DownloadClientInfo return new DownloadClientInfo
{ {
IsLocalhost = Settings.Host == "127.0.0.1" || Settings.Host == "localhost", IsLocalhost = Settings.Host == "127.0.0.1" || Settings.Host == "localhost",
OutputRootFolders = new List<OsPath> { _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(destDir)) } OutputRootFolders = new List<DownloadClientPath> { new DownloadClientPath(Definition.Id, new OsPath(destDir)) }
}; };
} }

4
src/NzbDrone.Core/Download/Clients/Vuze/Vuze.cs
View File

@ -5,7 +5,6 @@ using NzbDrone.Common.Http;
using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration;
using NzbDrone.Core.Download.Clients.Transmission; using NzbDrone.Core.Download.Clients.Transmission;
using NzbDrone.Core.MediaFiles.TorrentInfo; using NzbDrone.Core.MediaFiles.TorrentInfo;
using NzbDrone.Core.RemotePathMappings;
namespace NzbDrone.Core.Download.Clients.Vuze namespace NzbDrone.Core.Download.Clients.Vuze
{ {
@ -18,9 +17,8 @@ namespace NzbDrone.Core.Download.Clients.Vuze
IHttpClient httpClient, IHttpClient httpClient,
IConfigService configService, IConfigService configService,
IDiskProvider diskProvider, IDiskProvider diskProvider,
IRemotePathMappingService remotePathMappingService,
Logger logger) Logger logger)
: base(proxy, torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, logger) : base(proxy, torrentFileInfoReader, httpClient, configService, diskProvider, logger)
{ {
} }

6
src/NzbDrone.Core/Download/Clients/rTorrent/RTorrent.cs
View File

@ -13,7 +13,6 @@ using FluentValidation.Results;
using NzbDrone.Core.Download.Clients.rTorrent; using NzbDrone.Core.Download.Clients.rTorrent;
using NzbDrone.Core.Exceptions; using NzbDrone.Core.Exceptions;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.RemotePathMappings;
using NzbDrone.Core.ThingiProvider; using NzbDrone.Core.ThingiProvider;
namespace NzbDrone.Core.Download.Clients.RTorrent namespace NzbDrone.Core.Download.Clients.RTorrent
@ -28,10 +27,9 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
IHttpClient httpClient, IHttpClient httpClient,
IConfigService configService, IConfigService configService,
IDiskProvider diskProvider, IDiskProvider diskProvider,
IRemotePathMappingService remotePathMappingService,
IRTorrentDirectoryValidator rTorrentDirectoryValidator, IRTorrentDirectoryValidator rTorrentDirectoryValidator,
Logger logger) Logger logger)
: base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, logger) : base(torrentFileInfoReader, httpClient, configService, diskProvider, logger)
{ {
_proxy = proxy; _proxy = proxy;
_rTorrentDirectoryValidator = rTorrentDirectoryValidator; _rTorrentDirectoryValidator = rTorrentDirectoryValidator;
@ -100,7 +98,7 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
item.DownloadClient = Definition.Name; item.DownloadClient = Definition.Name;
item.Title = torrent.Name; item.Title = torrent.Name;
item.DownloadId = torrent.Hash; item.DownloadId = torrent.Hash;
item.OutputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(torrent.Path)); item.OutputPath = new DownloadClientPath(Definition.Id, new OsPath(torrent.Path));
item.TotalSize = torrent.TotalSize; item.TotalSize = torrent.TotalSize;
item.RemainingSize = torrent.RemainingSize; item.RemainingSize = torrent.RemainingSize;
item.Category = torrent.Category; item.Category = torrent.Category;

17
src/NzbDrone.Core/Download/Clients/uTorrent/UTorrent.cs
View File

@ -11,7 +11,6 @@ using NzbDrone.Core.Validation;
using FluentValidation.Results; using FluentValidation.Results;
using System.Net; using System.Net;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.RemotePathMappings;
using NzbDrone.Common.Cache; using NzbDrone.Common.Cache;
namespace NzbDrone.Core.Download.Clients.UTorrent namespace NzbDrone.Core.Download.Clients.UTorrent
@ -27,9 +26,8 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
IHttpClient httpClient, IHttpClient httpClient,
IConfigService configService, IConfigService configService,
IDiskProvider diskProvider, IDiskProvider diskProvider,
IRemotePathMappingService remotePathMappingService,
Logger logger) Logger logger)
: base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, logger) : base(torrentFileInfoReader, httpClient, configService, diskProvider, logger)
{ {
_proxy = proxy; _proxy = proxy;
@ -99,16 +97,13 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
item.RemainingTime = TimeSpan.FromSeconds(torrent.Eta); item.RemainingTime = TimeSpan.FromSeconds(torrent.Eta);
} }
var outputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(torrent.RootDownloadPath)); var outputPath = new OsPath(torrent.RootDownloadPath);
if (outputPath == null || outputPath.FileName == torrent.Name) if (outputPath != null && outputPath.FileName != torrent.Name)
{ {
item.OutputPath = outputPath; outputPath += torrent.Name;
}
else
{
item.OutputPath = outputPath + torrent.Name;
} }
item.OutputPath = new DownloadClientPath(Definition.Id, outputPath);
if (torrent.Status.HasFlag(UTorrentTorrentStatus.Error)) if (torrent.Status.HasFlag(UTorrentTorrentStatus.Error))
{ {
@ -209,7 +204,7 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
if (!destDir.IsEmpty) if (!destDir.IsEmpty)
{ {
status.OutputRootFolders = new List<OsPath> { _remotePathMappingService.RemapRemoteToLocal(Settings.Host, destDir) }; status.OutputRootFolders = new List<DownloadClientPath> { new DownloadClientPath(Definition.Id, destDir) };
} }
return status; return status;

9
src/NzbDrone.Core/Download/DownloadClientBase.cs
View File

@ -8,7 +8,6 @@ using NzbDrone.Common.Extensions;
using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration;
using NzbDrone.Core.Indexers; using NzbDrone.Core.Indexers;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.RemotePathMappings;
using NzbDrone.Core.ThingiProvider; using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation; using NzbDrone.Core.Validation;
@ -19,7 +18,6 @@ namespace NzbDrone.Core.Download
{ {
protected readonly IConfigService _configService; protected readonly IConfigService _configService;
protected readonly IDiskProvider _diskProvider; protected readonly IDiskProvider _diskProvider;
protected readonly IRemotePathMappingService _remotePathMappingService;
protected readonly Logger _logger; protected readonly Logger _logger;
public abstract string Name { get; } public abstract string Name { get; }
@ -38,12 +36,10 @@ namespace NzbDrone.Core.Download
protected DownloadClientBase(IConfigService configService, protected DownloadClientBase(IConfigService configService,
IDiskProvider diskProvider, IDiskProvider diskProvider,
IRemotePathMappingService remotePathMappingService,
Logger logger) Logger logger)
{ {
_configService = configService; _configService = configService;
_diskProvider = diskProvider; _diskProvider = diskProvider;
_remotePathMappingService = remotePathMappingService;
_logger = logger; _logger = logger;
} }
@ -76,6 +72,9 @@ namespace NzbDrone.Core.Download
return; return;
} }
// FIXME: Doesn't work if remote.
throw new NotSupportedException();
/*
if (item.OutputPath.IsEmpty) if (item.OutputPath.IsEmpty)
{ {
_logger.Trace("[{0}] Doesn't have an outputPath, skipping delete data.", item.Title); _logger.Trace("[{0}] Doesn't have an outputPath, skipping delete data.", item.Title);
@ -104,7 +103,7 @@ namespace NzbDrone.Core.Download
catch (Exception ex) catch (Exception ex)
{ {
_logger.Warn(ex, string.Format("[{0}] Error occurred while trying to delete data from '{1}'.", item.Title, item.OutputPath)); _logger.Warn(ex, string.Format("[{0}] Error occurred while trying to delete data from '{1}'.", item.Title, item.OutputPath));
} }*/
} }
public ValidationResult Test() public ValidationResult Test()

2
src/NzbDrone.Core/Download/DownloadClientInfo.cs
View File

@ -6,6 +6,6 @@ namespace NzbDrone.Core.Download
public class DownloadClientInfo public class DownloadClientInfo
{ {
public bool IsLocalhost { get; set; } public bool IsLocalhost { get; set; }
public List<OsPath> OutputRootFolders { get; set; } public List<DownloadClientPath> OutputRootFolders { get; set; }
} }
} }

2
src/NzbDrone.Core/Download/DownloadClientItem.cs
View File

@ -16,7 +16,7 @@ namespace NzbDrone.Core.Download
public long RemainingSize { get; set; } public long RemainingSize { get; set; }
public TimeSpan? RemainingTime { get; set; } public TimeSpan? RemainingTime { get; set; }
public OsPath OutputPath { get; set; } public DownloadClientPath OutputPath { get; set; }
public string Message { get; set; } public string Message { get; set; }
public DownloadItemStatus Status { get; set; } public DownloadItemStatus Status { get; set; }

12
src/NzbDrone.Core/Download/DownloadClientPath.cs
View File

@ -1,8 +1,16 @@
namespace NzbDrone.Core.Download using NzbDrone.Common.Disk;
namespace NzbDrone.Core.Download
{ {
public class DownloadClientPath public class DownloadClientPath
{ {
public int DownloadClientId { get; set; } public int DownloadClientId { get; set; }
public string Path { get; set; } public OsPath Path { get; set; }
public DownloadClientPath(int downloadClientId, OsPath path)
{
DownloadClientId = downloadClientId;
Path = path;
}
} }
} }

4
src/NzbDrone.Core/Download/TorrentClientBase.cs
View File

@ -12,7 +12,6 @@ using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.ThingiProvider; using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration;
using NLog; using NLog;
using NzbDrone.Core.RemotePathMappings;
namespace NzbDrone.Core.Download namespace NzbDrone.Core.Download
{ {
@ -26,9 +25,8 @@ namespace NzbDrone.Core.Download
IHttpClient httpClient, IHttpClient httpClient,
IConfigService configService, IConfigService configService,
IDiskProvider diskProvider, IDiskProvider diskProvider,
IRemotePathMappingService remotePathMappingService,
Logger logger) Logger logger)
: base(configService, diskProvider, remotePathMappingService, logger) : base(configService, diskProvider, logger)
{ {
_httpClient = httpClient; _httpClient = httpClient;
_torrentFileInfoReader = torrentFileInfoReader; _torrentFileInfoReader = torrentFileInfoReader;

4
src/NzbDrone.Core/Download/UsenetClientBase.cs
View File

@ -8,7 +8,6 @@ using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.ThingiProvider; using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration;
using NLog; using NLog;
using NzbDrone.Core.RemotePathMappings;
namespace NzbDrone.Core.Download namespace NzbDrone.Core.Download
{ {
@ -21,10 +20,9 @@ namespace NzbDrone.Core.Download
protected UsenetClientBase(IHttpClient httpClient, protected UsenetClientBase(IHttpClient httpClient,
IConfigService configService, IConfigService configService,
IDiskProvider diskProvider, IDiskProvider diskProvider,
IRemotePathMappingService remotePathMappingService,
IValidateNzbs nzbValidationService, IValidateNzbs nzbValidationService,
Logger logger) Logger logger)
: base(configService, diskProvider, remotePathMappingService, logger) : base(configService, diskProvider, logger)
{ {
_httpClient = httpClient; _httpClient = httpClient;
_nzbValidationService = nzbValidationService; _nzbValidationService = nzbValidationService;

4
src/NzbDrone.Core/NzbDrone.Core.csproj
View File

@ -949,7 +949,6 @@
<Compile Include="Qualities\Revision.cs" /> <Compile Include="Qualities\Revision.cs" />
<Compile Include="TransferProviders\Providers\DefaultTransfer.cs" /> <Compile Include="TransferProviders\Providers\DefaultTransfer.cs" />
<Compile Include="TransferProviders\Providers\DirectVirtualDiskProvider.cs" /> <Compile Include="TransferProviders\Providers\DirectVirtualDiskProvider.cs" />
<Compile Include="TransferProviders\Providers\Dummy.cs" />
<Compile Include="TransferProviders\Providers\EmptyVirtualDiskProvider.cs" /> <Compile Include="TransferProviders\Providers\EmptyVirtualDiskProvider.cs" />
<Compile Include="TransferProviders\Providers\MountVirtualDiskProvider.cs" /> <Compile Include="TransferProviders\Providers\MountVirtualDiskProvider.cs" />
<Compile Include="TransferProviders\TransferProviderDefinition.cs" /> <Compile Include="TransferProviders\TransferProviderDefinition.cs" />
@ -958,9 +957,6 @@
<Compile Include="TransferProviders\ITransferProvider.cs" /> <Compile Include="TransferProviders\ITransferProvider.cs" />
<Compile Include="TransferProviders\IVirtualDiskProvider.cs" /> <Compile Include="TransferProviders\IVirtualDiskProvider.cs" />
<Compile Include="TransferProviders\Providers\MountTransfer.cs" /> <Compile Include="TransferProviders\Providers\MountTransfer.cs" />
<Compile Include="TransferProviders\old\RemotePathMapping.cs" />
<Compile Include="TransferProviders\old\RemotePathMappingRepository.cs" />
<Compile Include="TransferProviders\old\RemotePathMappingService.cs" />
<Compile Include="MediaFiles\TorrentInfo\TorrentFileInfoReader.cs" /> <Compile Include="MediaFiles\TorrentInfo\TorrentFileInfoReader.cs" />
<Compile Include="Notifications\DownloadMessage.cs" /> <Compile Include="Notifications\DownloadMessage.cs" />
<Compile Include="Notifications\Email\Email.cs"> <Compile Include="Notifications\Email\Email.cs">

2
src/NzbDrone.Core/TransferProviders/Providers/DefaultTransfer.cs
View File

@ -73,7 +73,7 @@ namespace NzbDrone.Core.TransferProviders.Providers
protected string ResolvePath(DownloadClientPath path) protected string ResolvePath(DownloadClientPath path)
{ {
return path.Path; return path.Path.FullPath;
} }
} }
} }

1
src/NzbDrone.Core/TransferProviders/Providers/EmptyVirtualDiskProvider.cs
View File

@ -8,7 +8,6 @@ namespace NzbDrone.Core.TransferProviders.Providers
{ {
public bool SupportStreaming => true; public bool SupportStreaming => true;
public string[] GetFiles() public string[] GetFiles()
{ {
return new string[0]; return new string[0];

16
src/NzbDrone.Core/TransferProviders/Providers/MountTransfer.cs
View File

@ -11,7 +11,6 @@ using NzbDrone.Core.Validation;
namespace NzbDrone.Core.TransferProviders.Providers namespace NzbDrone.Core.TransferProviders.Providers
{ {
// Indicates that the remote path is mounted locally, and thus should honor the DownloadItem isReadonly flag and may transfer slowly. // Indicates that the remote path is mounted locally, and thus should honor the DownloadItem isReadonly flag and may transfer slowly.
public class MountSettings : IProviderConfig public class MountSettings : IProviderConfig
{ {
public string DownloadClientPath { get; set; } public string DownloadClientPath { get; set; }
@ -48,6 +47,10 @@ namespace NzbDrone.Core.TransferProviders.Providers
if (item == null) return false; if (item == null) return false;
var path = ResolvePath(item); var path = ResolvePath(item);
if (path == null)
{
return false;
}
return _diskProvider.FolderExists(path) || _diskProvider.FileExists(path); return _diskProvider.FolderExists(path) || _diskProvider.FileExists(path);
} }
@ -69,8 +72,15 @@ namespace NzbDrone.Core.TransferProviders.Providers
protected string ResolvePath(DownloadClientPath path) protected string ResolvePath(DownloadClientPath path)
{ {
// Same logic as RemotePathMapping service. var remotePath = path.Path;
throw new NotImplementedException(); if (new OsPath(Settings.DownloadClientPath).Contains(remotePath))
{
var localPath = new OsPath(Settings.MountPath) + (remotePath - new OsPath(Settings.DownloadClientPath));
return localPath.FullPath;
}
return null;
} }
} }
} }

8
src/NzbDrone.Core/TransferProviders/TransferProviderBase.cs
View File

@ -10,20 +10,16 @@ namespace NzbDrone.Core.TransferProviders
public abstract class TransferProviderBase<TSettings> : ITransferProvider where TSettings : IProviderConfig, new() public abstract class TransferProviderBase<TSettings> : ITransferProvider where TSettings : IProviderConfig, new()
{ {
public abstract string Name { get; } public abstract string Name { get; }
public Type ConfigContract => typeof(TSettings); public Type ConfigContract => typeof(TSettings);
public virtual ProviderMessage Message => null; public virtual ProviderMessage Message => null;
public virtual IEnumerable<ProviderDefinition> DefaultDefinitions => new List<ProviderDefinition>(); public virtual IEnumerable<ProviderDefinition> DefaultDefinitions => new List<ProviderDefinition>();
public ProviderDefinition Definition { get; set; } public ProviderDefinition Definition { get; set; }
public abstract ValidationResult Test(); public abstract ValidationResult Test();
public virtual object RequestAction(string action, IDictionary<string, string> query) { return null; } public virtual object RequestAction(string action, IDictionary<string, string> query) { return null; }
public abstract bool IsAvailable(DownloadClientPath item); protected TSettings Settings => (TSettings)Definition.Settings;
public abstract bool IsAvailable(DownloadClientPath item);
public abstract IVirtualDiskProvider GetFileSystemWrapper(DownloadClientPath item, string tempPath = null); public abstract IVirtualDiskProvider GetFileSystemWrapper(DownloadClientPath item, string tempPath = null);
} }
} }

12
src/NzbDrone.Core/TransferProviders/old/RemotePathMapping.cs
View File

@ -1,12 +0,0 @@
using NzbDrone.Core.Datastore;
namespace NzbDrone.Core.RemotePathMappings
{
public class RemotePathMapping : ModelBase
{
public string Host { get; set; }
public string RemotePath { get; set; }
public string LocalPath { get; set; }
}
}

21
src/NzbDrone.Core/TransferProviders/old/RemotePathMappingRepository.cs
View File

@ -1,21 +0,0 @@
using NzbDrone.Core.Datastore;
using NzbDrone.Core.Messaging.Events;
namespace NzbDrone.Core.RemotePathMappings
{
public interface IRemotePathMappingRepository : IBasicRepository<RemotePathMapping>
{
}
public class RemotePathMappingRepository : BasicRepository<RemotePathMapping>, IRemotePathMappingRepository
{
public RemotePathMappingRepository(IMainDatabase database, IEventAggregator eventAggregator)
: base(database, eventAggregator)
{
}
protected override bool PublishModelEvents => true;
}
}

163
src/NzbDrone.Core/TransferProviders/old/RemotePathMappingService.cs
View File

@ -1,163 +0,0 @@
using System.Linq;
using System;
using System.Collections.Generic;
using System.IO;
using NLog;
using NzbDrone.Common.Disk;
using NzbDrone.Common.Extensions;
using NzbDrone.Common.Cache;
using NzbDrone.Core.Download;
namespace NzbDrone.Core.RemotePathMappings
{
public interface IRemotePathMappingService
{
List<RemotePathMapping> All();
RemotePathMapping Add(RemotePathMapping mapping);
void Remove(int id);
RemotePathMapping Get(int id);
RemotePathMapping Update(RemotePathMapping mapping);
OsPath RemapRemoteToLocal(string host, OsPath remotePath);
OsPath RemapLocalToRemote(string host, OsPath localPath);
}
public class RemotePathMappingService : IRemotePathMappingService
{
private readonly IRemotePathMappingRepository _remotePathMappingRepository;
private readonly IDiskProvider _diskProvider;
private readonly Logger _logger;
private readonly ICached<List<RemotePathMapping>> _cache;
public RemotePathMappingService(IDownloadClientRepository downloadClientRepository,
IRemotePathMappingRepository remotePathMappingRepository,
IDiskProvider diskProvider,
ICacheManager cacheManager,
Logger logger)
{
_remotePathMappingRepository = remotePathMappingRepository;
_diskProvider = diskProvider;
_logger = logger;
_cache = cacheManager.GetCache<List<RemotePathMapping>>(GetType());
}
public List<RemotePathMapping> All()
{
return _cache.Get("all", () => _remotePathMappingRepository.All().ToList(), TimeSpan.FromSeconds(10));
}
public RemotePathMapping Add(RemotePathMapping mapping)
{
mapping.LocalPath = new OsPath(mapping.LocalPath).AsDirectory().FullPath;
mapping.RemotePath = new OsPath(mapping.RemotePath).AsDirectory().FullPath;
var all = All();
ValidateMapping(all, mapping);
var result = _remotePathMappingRepository.Insert(mapping);
_cache.Clear();
return result;
}
public void Remove(int id)
{
_remotePathMappingRepository.Delete(id);
_cache.Clear();
}
public RemotePathMapping Get(int id)
{
return _remotePathMappingRepository.Get(id);
}
public RemotePathMapping Update(RemotePathMapping mapping)
{
var existing = All().Where(v => v.Id != mapping.Id).ToList();
ValidateMapping(existing, mapping);
var result = _remotePathMappingRepository.Update(mapping);
_cache.Clear();
return result;
}
private void ValidateMapping(List<RemotePathMapping> existing, RemotePathMapping mapping)
{
if (mapping.Host.IsNullOrWhiteSpace())
{
throw new ArgumentException("Invalid Host");
}
var remotePath = new OsPath(mapping.RemotePath);
var localPath = new OsPath(mapping.LocalPath);
if (remotePath.IsEmpty)
{
throw new ArgumentException("Invalid RemotePath");
}
if (localPath.IsEmpty || !localPath.IsRooted)
{
throw new ArgumentException("Invalid LocalPath");
}
if (!_diskProvider.FolderExists(localPath.FullPath))
{
throw new DirectoryNotFoundException("Can't add mount point directory that doesn't exist.");
}
if (existing.Exists(r => r.Host == mapping.Host && r.RemotePath == mapping.RemotePath))
{
throw new InvalidOperationException("RemotePath already mounted.");
}
}
public OsPath RemapRemoteToLocal(string host, OsPath remotePath)
{
if (remotePath.IsEmpty)
{
return remotePath;
}
foreach (var mapping in All())
{
if (host == mapping.Host && new OsPath(mapping.RemotePath).Contains(remotePath))
{
var localPath = new OsPath(mapping.LocalPath) + (remotePath - new OsPath(mapping.RemotePath));
return localPath;
}
}
return remotePath;
}
public OsPath RemapLocalToRemote(string host, OsPath localPath)
{
if (localPath.IsEmpty)
{
return localPath;
}
foreach (var mapping in All())
{
if (host == mapping.Host && new OsPath(mapping.LocalPath).Contains(localPath))
{
var remotePath = new OsPath(mapping.RemotePath) + (localPath - new OsPath(mapping.LocalPath));
return remotePath;
}
}
return localPath;
}
}
}