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

all changes

Browse source
This commit is contained in:
Ivan Sanz Carasa 2024-03-28 18:59:09 +01:00
parent 99a29ca6a8
commit 2ef0ddc0b7
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -224,8 +224,10 @@ public class QBittorrent
torrentPath = Path.Combine(downloadPath, torrent.RdName) + Path.DirectorySeparatorChar; torrentPath = Path.Combine(downloadPath, torrent.RdName) + Path.DirectorySeparatorChar;
} }
var bytesDone = torrent.RdProgress; Decimal? rdProgress = torrent.RdProgress / 100.0m;
Decimal? downloadProgress = 0;
var bytesTotal = torrent.RdSize; var bytesTotal = torrent.RdSize;
var bytesDone = (long?)(torrent.RdSize * rdProgress);
var speed = torrent.RdSpeed ?? 0; var speed = torrent.RdSpeed ?? 0;
if (torrent.Downloads.Count > 0) if (torrent.Downloads.Count > 0)
@ -233,14 +235,10 @@ public class QBittorrent
bytesDone = torrent.Downloads.Sum(m => m.BytesDone); bytesDone = torrent.Downloads.Sum(m => m.BytesDone);
bytesTotal = torrent.Downloads.Sum(m => m.BytesTotal); bytesTotal = torrent.Downloads.Sum(m => m.BytesTotal);
speed = (Int32) torrent.Downloads.Average(m => m.Speed); speed = (Int32) torrent.Downloads.Average(m => m.Speed);
downloadProgress = bytesTotal > 0 ? (Decimal?)bytesDone / bytesTotal : 0;
} }
var progress = (bytesDone / (Single?)bytesTotal); Decimal? progress = (rdProgress + downloadProgress) / 2m;
if (progress == null || !Single.IsNormal(progress.Value))
{
progress = 0;
}
var result = new TorrentInfo var result = new TorrentInfo
{ {
@ -267,10 +265,10 @@ public class QBittorrent
Name = torrent.RdName, Name = torrent.RdName,
NumComplete = 10, NumComplete = 10,
NumIncomplete = 0, NumIncomplete = 0,
NumLeechs = 100, NumLeechs = 1,
NumSeeds = 100, NumSeeds = torrent.RdSeeders ?? 1,
Priority = ++prio, Priority = ++prio,
Progress = (Single) progress, Progress = (float)(progress ?? 0),
Ratio = 1, Ratio = 1,
RatioLimit = 1, RatioLimit = 1,
SavePath = downloadPath, SavePath = downloadPath,
@ -298,6 +296,10 @@ public class QBittorrent
{ {
result.State = "pausedUP"; result.State = "pausedUP";
} }
else if (torrent.RdStatus == TorrentStatus.Downloading && torrent.RdSeeders < 1)
{
result.State = "stalledDL";
}
results.Add(result); results.Add(result);
} }