Show torrent availability column (#528)

Closes #451
picotorrent · Mar 2, 2018 · ea15aa7 · ea15aa7
1 parent 2b172c2
commit ea15aa7
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 0 deletions.
diff --git a/lang/1033.json b/lang/1033.json
@@ -205,6 +205,7 @@
         "fails": "Fails",
         "verified": "Verified",
         "force_recheck": "Force recheck",
+        "availability": "Availability",
         "total_active": "Total active",
         "active_downloads": "Active downloads",
         "active_seeds": "Active seeds"

diff --git a/src/picotorrent/torrentlistview.cpp b/src/picotorrent/torrentlistview.cpp
@@ -70,6 +70,14 @@ TorrentListView::TorrentListView(wxWindow* parent, wxWindowID id, std::shared_pt
         wxALIGN_RIGHT,
         wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE);
 
+    AppendTextColumn(
+        i18n(tr, "availability"),
+        TorrentListViewModel::Columns::Availability,
+        wxDATAVIEW_CELL_INERT,
+        80,
+        wxALIGN_RIGHT,
+        wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE);
+
     AppendTextColumn(
         i18n(tr, "ratio"),
         TorrentListViewModel::Columns::Ratio,

diff --git a/src/picotorrent/torrentlistviewmodel.cpp b/src/picotorrent/torrentlistviewmodel.cpp
@@ -121,6 +121,16 @@ void TorrentListViewModel::Sort(int columnId, bool ascending)
 
         break;
     }
+    case Columns::Availability:
+    {
+        sorter = [this, ascending](lt::torrent_status const& ts1, lt::torrent_status const& ts2)
+        {
+            if (ascending) { return ts1.distributed_copies < ts2.distributed_copies; }
+            return ts1.distributed_copies > ts2.distributed_copies;
+        };
+
+        break;
+    }
     case Columns::Ratio:
     {
         sorter = [this, ascending](lt::torrent_status const& ts1, lt::torrent_status const& ts2)
@@ -257,6 +267,18 @@ void TorrentListViewModel::GetValueByRow(wxVariant &variant, unsigned int row, u
         }
         break;
     }
+    case Columns::Availability:
+    {
+        if (ts.distributed_copies < 0)
+        {
+            variant = "-";
+        }
+        else
+        {
+            variant = wxString::Format("%.3f", ts.distributed_copies);
+        }
+        break;
+    }
     case Columns::Ratio:
     {
         float ratio = GetRatio(ts);

diff --git a/src/picotorrent/torrentlistviewmodel.hpp b/src/picotorrent/torrentlistviewmodel.hpp
@@ -35,6 +35,7 @@ namespace pt
             ETA,
             DownloadSpeed,
             UploadSpeed,
+            Availability,
             Ratio,
             Seeds,
             Peers,