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

Fixed download progress reporting to the qBittorrent API.

Browse source
This commit is contained in:
Roger Far 2024-09-02 21:07:46 -06:00
parent fae983237a
commit cc52f5f7f5
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -194,7 +194,7 @@ public class QBittorrent(ILogger<QBittorrent> logger, Settings settings, Authent
var prio = 0;
Decimal downloadProgress = 0;
Double downloadProgress = 0;
foreach (var torrent in allTorrents)
{
@ -214,12 +214,12 @@ public class QBittorrent(ILogger<QBittorrent> logger, Settings settings, Authent
Int64 bytesDone = 0;
Int64 bytesTotal = 0;
Int64 speed = 0;
Int64 rdProgress = 0;
Double rdProgress = 0;
try
{
rdProgress = (Int64) ((torrent.RdProgress ?? 0) / 100.0m);
rdProgress = (torrent.RdProgress ?? 0.0) / 100.0;
bytesTotal = torrent.RdSize ?? 1;
bytesDone = bytesTotal * rdProgress;
bytesDone = (Int64) (bytesTotal * rdProgress);
speed = torrent.RdSpeed ?? 0;
}
catch (Exception ex)
@ -237,10 +237,10 @@ public class QBittorrent(ILogger<QBittorrent> logger, Settings settings, Authent
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 ? (Decimal) bytesDone / bytesTotal : 0;
downloadProgress = bytesTotal > 0 ? (Double) bytesDone / bytesTotal : 0;
}
var progress = (Int64) ((rdProgress + downloadProgress) / 2m);
var progress = (rdProgress + downloadProgress) / 2.0;
var result = new TorrentInfo
{

2
server/RdtClient.Web/Controllers/QBittorrentController.cs
View file

@ -123,7 +123,7 @@ public class QBittorrentController(ILogger<QBittorrentController> logger, QBitto
[HttpPost]
public ActionResult<AppPreferences> AppDefaultSavePath()
{
var result = Service.Services.Settings.AppDefaultSavePath;
var result = Settings.AppDefaultSavePath;
return Ok(result);
}