From a2bde5e01688fd1c7cd5e91a320d4148add7136d Mon Sep 17 00:00:00 2001 From: Bogdan Date: Fri, 8 Sep 2023 03:12:20 +0300 Subject: [PATCH] Fixed: Calculating seed time for qBittorrent (cherry picked from commit 1b3ff64cc521396f9f1623617052c497649325a8) --- .../QBittorrentTests/QBittorrentFixture.cs | 2 +- src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrent.cs | 4 ++-- .../Download/Clients/QBittorrent/QBittorrentTorrent.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/QBittorrentTests/QBittorrentFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/QBittorrentTests/QBittorrentFixture.cs index 2f85b5e2b..972844318 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/QBittorrentTests/QBittorrentFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/QBittorrentTests/QBittorrentFixture.cs @@ -633,7 +633,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests .Returns(new QBittorrentTorrentProperties { Hash = "HASH", - SeedingTime = seedingTime + SeedingTime = seedingTime * 60 }); return torrent; diff --git a/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrent.cs b/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrent.cs index e084cd26c..18368118f 100644 --- a/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrent.cs +++ b/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrent.cs @@ -626,11 +626,11 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent if (torrent.SeedingTimeLimit >= 0) { - seedingTimeLimit = torrent.SeedingTimeLimit; + seedingTimeLimit = torrent.SeedingTimeLimit * 60; } else if (torrent.SeedingTimeLimit == -2 && config.MaxSeedingTimeEnabled) { - seedingTimeLimit = config.MaxSeedingTime; + seedingTimeLimit = config.MaxSeedingTime * 60; } else { diff --git a/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentTorrent.cs b/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentTorrent.cs index dbfceb0c3..92e6c7e02 100644 --- a/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentTorrent.cs +++ b/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentTorrent.cs @@ -33,7 +33,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent public float RatioLimit { get; set; } = -2; [JsonProperty(PropertyName = "seeding_time")] - public long? SeedingTime { get; set; } // Torrent seeding time (not provided by the list api) + public long? SeedingTime { get; set; } // Torrent seeding time (in seconds, not provided by the list api) [JsonProperty(PropertyName = "seeding_time_limit")] // Per torrent seeding time limit (-2 = use global, -1 = unlimited) public long SeedingTimeLimit { get; set; } = -2; @@ -47,7 +47,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent public string SavePath { get; set; } [JsonProperty(PropertyName = "seeding_time")] - public long SeedingTime { get; set; } // Torrent seeding time + public long SeedingTime { get; set; } // Torrent seeding time (in seconds) } public class QBittorrentTorrentFile