Change meaning of "seeders" and "leechers" columns (#245)

"Seeders" and "leechers" now refer to total number of seeders and leechers reported by trackers, while number of peers that we are currently downloading from / uploading to is displayed in separate columns.
equeim · Feb 4, 2023 · fded441 · fded441
1 parent 46daab6
commit fded441
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 9 deletions.
diff --git a/src/libtremotesf b/src/libtremotesf
diff --git a/src/tremotesf/ui/screens/mainwindow/torrentsmodel.cpp b/src/tremotesf/ui/screens/mainwindow/torrentsmodel.cpp
@@ -118,9 +118,13 @@ namespace tremotesf {
             case Column::QueuePosition:
                 return torrent->data().queuePosition;
             case Column::Seeders:
-                return torrent->data().activeSeedersCount;
+                return torrent->data().totalSeedersFromTrackersCount;
             case Column::Leechers:
-                return torrent->data().activeLeechersCount;
+                return torrent->data().totalLeechersFromTrackersCount;
+            case Column::PeersSendingToUs:
+                return torrent->data().peersSendingToUsCount;
+            case Column::PeersGettingFromUs:
+                return torrent->data().peersGettingFromUsCount;
             case Column::DownloadSpeed:
                 return Utils::formatByteSpeed(torrent->data().downloadSpeed);
             case Column::UploadSpeed:
@@ -260,6 +264,10 @@ namespace tremotesf {
             return qApp->translate("tremotesf", "Seeders");
         case Column::Leechers:
             return qApp->translate("tremotesf", "Leechers");
+        case Column::PeersSendingToUs:
+            return qApp->translate("tremotesf", "Downloading to peers");
+        case Column::PeersGettingFromUs:
+            return qApp->translate("tremotesf", "Uploading to peers");
         case Column::DownloadSpeed:
             return qApp->translate("tremotesf", "Down Speed");
         case Column::UploadSpeed:

diff --git a/src/tremotesf/ui/screens/mainwindow/torrentsmodel.h b/src/tremotesf/ui/screens/mainwindow/torrentsmodel.h
@@ -31,6 +31,8 @@ namespace tremotesf {
             QueuePosition,
             Seeders,
             Leechers,
+            PeersSendingToUs,
+            PeersGettingFromUs,
             DownloadSpeed,
             UploadSpeed,
             Eta,

diff --git a/src/tremotesf/ui/screens/torrentproperties/torrentpropertiesdialog.cpp b/src/tremotesf/ui/screens/torrentproperties/torrentpropertiesdialog.cpp
@@ -136,10 +136,23 @@ namespace tremotesf {
         activityGroupBoxLayout->addRow(qApp->translate("tremotesf", "ETA:"), etaLabel);
         auto seedersLabel = new QLabel(this);
         activityGroupBoxLayout->addRow(qApp->translate("tremotesf", "Seeders:"), seedersLabel);
-        auto activeWebSeedersLabel = new QLabel(this);
-        activityGroupBoxLayout->addRow(qApp->translate("tremotesf", "Active web seeders:"), activeWebSeedersLabel);
         auto leechersLabel = new QLabel(this);
         activityGroupBoxLayout->addRow(qApp->translate("tremotesf", "Leechers:"), leechersLabel);
+        auto peersSendingToUsLabel = new QLabel(this);
+        activityGroupBoxLayout->addRow(
+            qApp->translate("tremotesf", "Peers we are downloading from:"),
+            peersSendingToUsLabel
+        );
+        auto webSeedersSendingToUsLabel = new QLabel(this);
+        activityGroupBoxLayout->addRow(
+            qApp->translate("tremotesf", "Web seeders we are downloading from:"),
+            webSeedersSendingToUsLabel
+        );
+        auto peersGettingFromUsLabel = new QLabel(this);
+        activityGroupBoxLayout->addRow(
+            qApp->translate("tremotesf", "Peers we are uploading to:"),
+            peersGettingFromUsLabel
+        );
         auto lastActivityLabel = new QLabel(this);
         activityGroupBoxLayout->addRow(qApp->translate("tremotesf", "Last activity:"), lastActivityLabel);
         detailsTabLayout->addWidget(activityGroupBox);
@@ -184,10 +197,12 @@ namespace tremotesf {
             uploadSpeedLabel->setText(Utils::formatByteSpeed(mTorrent->data().uploadSpeed));
             etaLabel->setText(Utils::formatEta(mTorrent->data().eta));
 
-            const QLocale locale;
-            seedersLabel->setText(locale.toString(mTorrent->data().activeSeedersCount));
-            activeWebSeedersLabel->setText(locale.toString(mTorrent->data().activeWebSeedersCount));
-            leechersLabel->setText(locale.toString(mTorrent->data().activeLeechersCount));
+            const QLocale locale{};
+            seedersLabel->setText(locale.toString(mTorrent->data().totalSeedersFromTrackersCount));
+            leechersLabel->setText(locale.toString(mTorrent->data().totalLeechersFromTrackersCount));
+            peersSendingToUsLabel->setText(locale.toString(mTorrent->data().peersSendingToUsCount));
+            webSeedersSendingToUsLabel->setText(locale.toString(mTorrent->data().webSeedersSendingToUsCount));
+            peersGettingFromUsLabel->setText(locale.toString(mTorrent->data().peersGettingFromUsCount));
 
             lastActivityLabel->setText(mTorrent->data().activityDate.toLocalTime().toString());
+21 −11		.github/workflows/main.yml
+16 −15		stdutils.h
+13 −13		torrent.cpp
+5 −5		torrent.h
+1 −1		vcpkg-configuration.json
+4 −4		vcpkg.json