Backup_Repos/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr synced 2026-05-08 19:50:25 +02:00
Code Issues Projects Releases Wiki Activity

Update TorrentFreeboxDownload.cs

Browse source 
Proposed fix for issue 9938. 
A folder is created for each downloaded movie. 
Radarr can now correctly map the movie to transfer it to the folder.
This commit is contained in:
Foireatout 2026-04-13 12:19:18 +02:00 committed by GitHub
parent 4b85fab05b
commit 231299c883
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 43 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
src/NzbDrone.Core/Download/Clients/FreeboxDownload/TorrentFreeboxDownload.cs
View file

@ -127,27 +127,25 @@ public override IEnumerable<DownloadClientItem> GetItems()
return queueItems;
}
protected override string AddFromMagnetLink(RemoteMovie remoteMovie, string hash, string magnetLink)
{
return _proxy.AddTaskFromUrl(magnetLink,
GetDownloadDirectory().EncodeBase64(),
ToBePaused(),
ToBeQueuedFirst(remoteMovie),
GetSeedRatio(remoteMovie),
Settings);
}
protected override string AddFromTorrentFile(RemoteMovie remoteMovie, string hash, string filename, byte[] fileContent)
{
return _proxy.AddTaskFromFile(filename,
fileContent,
GetDownloadDirectory().EncodeBase64(),
ToBePaused(),
ToBeQueuedFirst(remoteMovie),
GetSeedRatio(remoteMovie),
Settings);
}
protected override string AddFromMagnetLink(RemoteMovie remoteMovie, string hash, string magnetLink)
{
return _proxy.AddTaskFromUrl(magnetLink,
GetDownloadDirectory(remoteMovie).EncodeBase64(),
ToBePaused(),
ToBeQueuedFirst(remoteMovie),
GetSeedRatio(remoteMovie),
Settings);
}
protected override string AddFromTorrentFile(RemoteMovie remoteMovie, string hash, string filename, byte[] fileContent)
{
return _proxy.AddTaskFromFile(filename,
fileContent,
GetDownloadDirectory(remoteMovie).EncodeBase64(),
ToBePaused(),
ToBeQueuedFirst(remoteMovie),
GetSeedRatio(remoteMovie),
Settings);
}
public override void RemoveItem(DownloadClientItem item, bool deleteData)
{
_proxy.DeleteTask(item.DownloadId, deleteData, Settings);
@ -186,22 +184,33 @@ protected override void Test(List<ValidationFailure> failures)
}
}
private string GetDownloadDirectory()
{
if (Settings.DestinationDirectory.IsNotNullOrWhiteSpace())
{
return Settings.DestinationDirectory.TrimEnd('/');
}
private string GetDownloadDirectory(RemoteMovie remoteMovie = null)
{
string destDir;
var destDir = _proxy.GetDownloadConfiguration(Settings).DecodedDownloadDirectory.TrimEnd('/');
if (Settings.DestinationDirectory.IsNotNullOrWhiteSpace())
{
destDir = Settings.DestinationDirectory.TrimEnd('/');
}
else
{
destDir = _proxy.GetDownloadConfiguration(Settings).DecodedDownloadDirectory.TrimEnd('/');
}
if (Settings.Category.IsNotNullOrWhiteSpace())
{
destDir = $"{destDir}/{Settings.Category}";
}
if (Settings.Category.IsNotNullOrWhiteSpace())
{
destDir = $"{destDir}/{Settings.Category}";
}
return destDir;
}
// Ajout du sous-dossier spécifique au film si un film est fourni
if (remoteMovie != null)
{
var folderName = remoteMovie.Release.Title.Replace("/", "-").Replace("\\", "-");
destDir = $"{destDir}/{folderName}";
}
return destDir;
}
private bool ToBePaused()
{