danvics/rdt-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[TB] fix: extract folder move logic

Browse source
This commit is contained in:
Sam Heinz 2025-03-17 00:28:19 +10:00
parent 7d1aeed85c
commit 7a822bef5c
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
server/RdtClient.Service/Services/TorrentClients/TorBoxTorrentClient.cs
View file

@ -362,24 +362,32 @@ public class TorBoxTorrentClient(ILogger<TorBoxTorrentClient> logger, IHttpClien
{
var innerFolder = Directory.GetDirectories(hashDir)[0];
if (!Path.GetFileName(innerFolder).Equals(_torrent.Hash, StringComparison.CurrentCultureIgnoreCase))
var moveDir = extractPath;
if (!extractPath.Contains(_torrent.RdName!))
{
innerFolder = hashDir;
moveDir = hashDir;
}
foreach (var file in Directory.GetFiles(innerFolder))
{
var destFile = Path.Combine(extractPath, Path.GetFileName(file));
var destFile = Path.Combine(moveDir, Path.GetFileName(file));
File.Move(file, destFile);
}
foreach (var dir in Directory.GetDirectories(innerFolder))
{
var destDir = Path.Combine(extractPath, Path.GetFileName(dir));
var destDir = Path.Combine(moveDir, Path.GetFileName(dir));
Directory.Move(dir, destDir);
}
Directory.Delete(hashDir, true);
if (!extractPath.Contains(_torrent.RdName!))
{
Directory.Delete(innerFolder, true);
}
else
{
Directory.Delete(hashDir, true);
}
}
}

1
server/RdtClient.Service/Services/TorrentRunner.cs
View file

@ -8,7 +8,6 @@ using RdtClient.Service.Services.Downloaders;
using System.Collections.Concurrent;
using System.Diagnostics;
using System.Text.Json;
using System.Web;
namespace RdtClient.Service.Services;