Fix ETA for match-all share limits

Author: TurboTheTurtle

src/base/bittorrent/sharelimits.h

@@ -29,8 +29,12 @@
 
 #pragma once
 
+#include <algorithm>
+
 #include <QMetaEnum>
 
+#include "base/types.h"
+
 namespace BitTorrent
 {
     inline const qreal DEFAULT_RATIO_LIMIT = -2;
@@ -83,4 +87,28 @@ namespace BitTorrent
 
         friend bool operator==(const ShareLimits &lhs, const ShareLimits &rhs) = default;
     };
+
+    inline qlonglong shareLimitsEta(const ShareLimits &shareLimits, const qlonglong ratioEta
+            , const qlonglong seedingTimeEta, const qlonglong inactiveSeedingTimeEta)
+    {
+        const bool matchAll = (shareLimits.mode == ShareLimitsMode::MatchAll);
+        qlonglong result = (matchAll ? 0 : MAX_ETA);
+        bool hasLimit = false;
+
+        const auto applyEta = [&](const bool enabled, const qlonglong eta)
+        {
+            if (!enabled)
+                return;
+
+            hasLimit = true;
+            const qlonglong normalizedEta = std::max<qlonglong>(eta, 0);
+            result = (matchAll ? std::max(result, normalizedEta) : std::min(result, normalizedEta));
+        };
+
+        applyEta((shareLimits.ratioLimit >= 0), ratioEta);
+        applyEta((shareLimits.seedingTimeLimit >= 0), seedingTimeEta);
+        applyEta((shareLimits.inactiveSeedingTimeLimit >= 0), inactiveSeedingTimeEta);
+
+        return (hasLimit ? result : MAX_ETA);
+    }
 }

src/base/bittorrent/torrentimpl.cpp

@@ -1422,7 +1422,7 @@ qlonglong TorrentImpl::eta() const
             inactiveSeedingTimeEta = std::max<qlonglong>(inactiveSeedingTimeEta, 0);
         }
 
-        return std::min({ratioEta, seedingTimeEta, inactiveSeedingTimeEta});
+        return shareLimitsEta(shareLimits, ratioEta, seedingTimeEta, inactiveSeedingTimeEta);
     }
 
     if (!speedAverage.download) return MAX_ETA;

test/CMakeLists.txt

@@ -8,6 +8,7 @@ include_directories("../src")
 set(testFiles
     testalgorithm.cpp
     testbittorrentpeeraddress.cpp
+    testbittorrentsharelimits.cpp
     testbittorrenttrackerentry.cpp
     testconceptsexplicitlyconvertibleto.cpp
     testconceptsstringable.cpp

test/testbittorrentsharelimits.cpp

@@ -0,0 +1,76 @@
+/*
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2026  Andy Ye
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ */
+
+#include <QObject>
+#include <QTest>
+
+#include "base/bittorrent/sharelimits.h"
+#include "base/types.h"
+
+class TestBittorrentShareLimits final : public QObject
+{
+    Q_OBJECT
+    Q_DISABLE_COPY_MOVE(TestBittorrentShareLimits)
+
+public:
+    TestBittorrentShareLimits() = default;
+
+private slots:
+    void testShareLimitsEta() const
+    {
+        BitTorrent::ShareLimits shareLimits
+        {
+            .ratioLimit = 1.0,
+            .seedingTimeLimit = 100,
+            .inactiveSeedingTimeLimit = 200,
+            .mode = BitTorrent::ShareLimitsMode::MatchAny
+        };
+
+        QCOMPARE(BitTorrent::shareLimitsEta(shareLimits, 120, 300, 600), 120);
+
+        shareLimits.mode = BitTorrent::ShareLimitsMode::MatchAll;
+        QCOMPARE(BitTorrent::shareLimitsEta(shareLimits, 120, 300, 600), 600);
+
+        shareLimits.ratioLimit = BitTorrent::NO_RATIO_LIMIT;
+        QCOMPARE(BitTorrent::shareLimitsEta(shareLimits, 120, 300, 600), 600);
+
+        shareLimits.mode = BitTorrent::ShareLimitsMode::MatchAny;
+        QCOMPARE(BitTorrent::shareLimitsEta(shareLimits, 120, 300, 600), 300);
+
+        shareLimits.ratioLimit = 1.0;
+        QCOMPARE(BitTorrent::shareLimitsEta(shareLimits, -20, 300, 600), 0);
+
+        shareLimits.ratioLimit = BitTorrent::NO_RATIO_LIMIT;
+        shareLimits.seedingTimeLimit = BitTorrent::NO_SEEDING_TIME_LIMIT;
+        shareLimits.inactiveSeedingTimeLimit = BitTorrent::NO_SEEDING_TIME_LIMIT;
+        QCOMPARE(BitTorrent::shareLimitsEta(shareLimits, 120, 300, 600), MAX_ETA);
+    }
+};
+
+QTEST_APPLESS_MAIN(TestBittorrentShareLimits)
+#include "testbittorrentsharelimits.moc"