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

Merge branch 'main' of https://github.com/rogerfar/rdt-client

Browse source
This commit is contained in:
Roger Far 2026-02-11 20:02:41 -07:00
commit 871802ad34
1 changed files with 22 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
server/RdtClient.Service/Services/QBittorrent.cs
View file

@ -194,8 +194,6 @@ public class QBittorrent(ILogger<QBittorrent> logger, Settings settings, Authent
var prio = 0; var prio = 0;
Double downloadProgress = 0;
foreach (var torrent in allTorrents) foreach (var torrent in allTorrents)
{ {
var downloadPath = savePath; var downloadPath = savePath;
@ -220,38 +218,32 @@ public class QBittorrent(ILogger<QBittorrent> logger, Settings settings, Authent
} }
} }
Int64 bytesDone = 0; var rdProgress = Math.Clamp(torrent.RdProgress ?? 0.0, 0.0, 100.0) / 100.0;
Int64 bytesTotal = 0; var bytesTotal = torrent.RdSize ?? 0;
Int64 speed = 0; var speed = torrent.RdSpeed ?? 0;
Double rdProgress = 0; var bytesDone = (Int64) (bytesTotal * rdProgress);
try Double downloadProgress = 0;
if (torrent.Downloads is { Count: > 0 })
{ {
rdProgress = (torrent.RdProgress ?? 0.0) / 100.0; var dlBytesDone = torrent.Downloads.Sum(m => m.BytesDone);
bytesTotal = torrent.RdSize ?? 1; var dlBytesTotal = torrent.Downloads.Sum(m => m.BytesTotal);
bytesDone = (Int64)(bytesTotal * rdProgress); speed = (Int32) torrent.Downloads.Average(m => m.Speed);
speed = torrent.RdSpeed ?? 0; downloadProgress = bytesTotal > 0 ? Math.Clamp((Double) dlBytesDone / dlBytesTotal, 0.0, 1.0) : 0;
}
catch (Exception ex)
{
logger.LogError(ex,
$"""
Error calculating progress:
RdProgress: {torrent.RdProgress}
RdSize: {torrent.RdSize}
RdSpeed: {torrent.RdSpeed}
""");
}
if (torrent.Downloads.Count > 0)
{
bytesDone = torrent.Downloads.Sum(m => m.BytesDone);
bytesTotal = torrent.Downloads.Sum(m => m.BytesTotal);
speed = (Int32)torrent.Downloads.Average(m => m.Speed);
downloadProgress = bytesTotal > 0 ? (Double)bytesDone / bytesTotal : 0;
} }
var progress = (rdProgress + downloadProgress) / 2.0; var progress = (rdProgress + downloadProgress) / 2.0;
var remaining = TimeSpan.Zero;
var bytesRemaining = bytesTotal - bytesDone;
if (speed > 0 && bytesRemaining > 0)
{
remaining = TimeSpan.FromSeconds(bytesRemaining / (Double)speed);
// In case there is clock skew
if (remaining < TimeSpan.Zero)
{
remaining = TimeSpan.Zero;
}
}
var result = new TorrentInfo var result = new TorrentInfo
{ {
@ -267,7 +259,7 @@ public class QBittorrent(ILogger<QBittorrent> logger, Settings settings, Authent
Dlspeed = speed, Dlspeed = speed,
Downloaded = bytesDone, Downloaded = bytesDone,
DownloadedSession = bytesDone, DownloadedSession = bytesDone,
Eta = 0, Eta = (Int64)remaining.TotalSeconds,
FlPiecePrio = false, FlPiecePrio = false,
ForceStart = false, ForceStart = false,
Hash = torrent.Hash, Hash = torrent.Hash,