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

Fixed: Completed downloads in Qbit missing import path

This commit is contained in:
Mark McDowall 2023-09-27 12:06:30 -07:00
parent 583eb52ddc
commit 35365665cf
3 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/NzbDrone.Core.Test/Download/DownloadClientTests/QBittorrentTests/QBittorrentFixture.cs
View File

@ -137,7 +137,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
{ {
Mocker.GetMock<IQBittorrentProxy>() Mocker.GetMock<IQBittorrentProxy>()
.Setup(s => s.GetTorrentProperties(torrent.Hash.ToLower(), It.IsAny<QBittorrentSettings>())) .Setup(s => s.GetTorrentProperties(torrent.Hash.ToLower(), It.IsAny<QBittorrentSettings>()))
.Returns(new QBittorrentTorrentProperties { ContentPath = torrent.ContentPath, SavePath = torrent.SavePath }); .Returns(new QBittorrentTorrentProperties { SavePath = torrent.SavePath });
Mocker.GetMock<IQBittorrentProxy>() Mocker.GetMock<IQBittorrentProxy>()
.Setup(s => s.GetTorrentFiles(torrent.Hash.ToLower(), It.IsAny<QBittorrentSettings>())) .Setup(s => s.GetTorrentFiles(torrent.Hash.ToLower(), It.IsAny<QBittorrentSettings>()))

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

@ -302,6 +302,19 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
break; break;
} }
if (version >= new Version("2.6.1") && item.Status == DownloadItemStatus.Completed)
{
if (torrent.ContentPath != torrent.SavePath)
{
item.OutputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(torrent.ContentPath));
}
else
{
item.Status = DownloadItemStatus.Warning;
item.Message = "Unable to Import. Path matches client base download directory, it's possible 'Keep top-level folder' is disabled for this torrent or 'Torrent Content Layout' is NOT set to 'Original' or 'Create Subfolder'?";
}
}
queueItems.Add(item); queueItems.Add(item);
} }
@ -315,22 +328,9 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
public override DownloadClientItem GetImportItem(DownloadClientItem item, DownloadClientItem previousImportAttempt) public override DownloadClientItem GetImportItem(DownloadClientItem item, DownloadClientItem previousImportAttempt)
{ {
var properties = Proxy.GetTorrentProperties(item.DownloadId.ToLower(), Settings); // On API version >= 2.6.1 this is already set correctly
var savePath = new OsPath(properties.SavePath); if (!item.OutputPath.IsEmpty)
var version = Proxy.GetApiVersion(Settings);
if (version >= new Version("2.6.1"))
{ {
if (properties.ContentPath != savePath.ToString())
{
item.OutputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(properties.ContentPath));
}
else
{
item.Status = DownloadItemStatus.Warning;
item.Message = "Unable to Import. Path matches client base download directory, it's possible 'Keep top-level folder' is disabled for this torrent or 'Torrent Content Layout' is NOT set to 'Original' or 'Create Subfolder'?";
}
return item; return item;
} }
@ -341,6 +341,11 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
return item; return item;
} }
var properties = Proxy.GetTorrentProperties(item.DownloadId.ToLower(), Settings);
var savePath = new OsPath(properties.SavePath);
var result = item.Clone();
// get the first subdirectory - QBittorrent returns `/` path separators even on windows... // get the first subdirectory - QBittorrent returns `/` path separators even on windows...
var relativePath = new OsPath(files[0].Name); var relativePath = new OsPath(files[0].Name);
while (!relativePath.Directory.IsEmpty) while (!relativePath.Directory.IsEmpty)
@ -349,9 +354,10 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
} }
var outputPath = savePath + relativePath.FileName; var outputPath = savePath + relativePath.FileName;
item.OutputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, outputPath);
return item; result.OutputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, outputPath);
return result;
} }
public override DownloadClientInfo GetStatus() public override DownloadClientInfo GetStatus()

3
src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentTorrent.cs
View File

@ -48,9 +48,6 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
[JsonProperty(PropertyName = "seeding_time")] [JsonProperty(PropertyName = "seeding_time")]
public long SeedingTime { get; set; } // Torrent seeding time (in seconds) public long SeedingTime { get; set; } // Torrent seeding time (in seconds)
[JsonProperty(PropertyName = "content_path")]
public string ContentPath { get; set; } // Torrent save path
} }
public class QBittorrentTorrentFile public class QBittorrentTorrentFile