Add the "private" flag to the GUI

+Changes from code review

src/gui/properties/propertieswidget.cpp

@@ -210,6 +210,7 @@ void PropertiesWidget::clear()
     m_ui->labelSavePathVal->clear();
     m_ui->labelCreatedOnVal->clear();
     m_ui->labelTotalPiecesVal->clear();
+    m_ui->labelPrivateVal->clear();
     m_ui->labelInfohash1Val->clear();
     m_ui->labelInfohash2Val->clear();
     m_ui->labelCommentVal->clear();
@@ -335,7 +336,14 @@ void PropertiesWidget::loadTorrentInfos(BitTorrent::Torrent *const torrent)
         m_ui->labelCommentVal->setText(Utils::Misc::parseHtmlLinks(m_torrent->comment().toHtmlEscaped()));
 
         m_ui->labelCreatedByVal->setText(m_torrent->creator());
+
+        m_ui->labelPrivateVal->setText(m_torrent->isPrivate() ? tr("Yes") : tr("No"));
     }
+    else
+    {
+        m_ui->labelPrivateVal->setText(tr("N/A"));
+    }
+
     // Load dynamic data
     loadDynamicData();
 }

src/gui/properties/propertieswidget.ui

@@ -823,39 +823,55 @@
                </widget>
               </item>
               <item row="2" column="0">
-               <widget class="QLabel" name="labelInfohash1">
+               <widget class="QLabel" name="labelPrivate">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
                   <horstretch>0</horstretch>
                   <verstretch>0</verstretch>
                  </sizepolicy>
                 </property>
                 <property name="text">
-                 <string>Info Hash v1:</string>
+                 <string>Private:</string>
                 </property>
                 <property name="alignment">
                  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                 </property>
                </widget>
               </item>
+              <item row="2" column="1" colspan="5">
+               <widget class="QLabel" name="labelPrivateVal">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="textFormat">
+                 <enum>Qt::PlainText</enum>
+                </property>
+                <property name="textInteractionFlags">
+                 <set>Qt::TextSelectableByMouse</set>
+                </property>
+               </widget>
+              </item>
               <item row="3" column="0">
-               <widget class="QLabel" name="labelInfohash2">
+               <widget class="QLabel" name="labelInfohash1">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
                   <horstretch>0</horstretch>
                   <verstretch>0</verstretch>
                  </sizepolicy>
                 </property>
                 <property name="text">
-                 <string>Info Hash v2:</string>
+                 <string>Info Hash v1:</string>
                 </property>
                 <property name="alignment">
                  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                 </property>
                </widget>
               </item>
               <item row="3" column="1" colspan="5">
-               <widget class="QLabel" name="labelInfohash2Val">
+               <widget class="QLabel" name="labelInfohash1Val">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
                   <horstretch>0</horstretch>
@@ -871,39 +887,55 @@
                </widget>
               </item>
               <item row="4" column="0">
-               <widget class="QLabel" name="labelSavePath">
+               <widget class="QLabel" name="labelInfohash2">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
                   <horstretch>0</horstretch>
                   <verstretch>0</verstretch>
                  </sizepolicy>
                 </property>
                 <property name="text">
-                 <string>Save Path:</string>
+                 <string>Info Hash v2:</string>
                 </property>
                 <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
+                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                </property>
+               </widget>
+              </item>
+              <item row="4" column="1" colspan="5">
+               <widget class="QLabel" name="labelInfohash2Val">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="textFormat">
+                 <enum>Qt::PlainText</enum>
+                </property>
+                <property name="textInteractionFlags">
+                 <set>Qt::TextSelectableByMouse</set>
                 </property>
                </widget>
               </item>
               <item row="5" column="0">
-               <widget class="QLabel" name="labelComment">
+               <widget class="QLabel" name="labelSavePath">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
                   <horstretch>0</horstretch>
                   <verstretch>0</verstretch>
                  </sizepolicy>
                 </property>
                 <property name="text">
-                 <string>Comment:</string>
+                 <string>Save Path:</string>
                 </property>
                 <property name="alignment">
                  <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
                 </property>
                </widget>
               </item>
-              <item row="2" column="1" colspan="5">
-               <widget class="QLabel" name="labelInfohash1Val">
+              <item row="5" column="1" colspan="5">
+               <widget class="QLabel" name="labelSavePathVal">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
                   <horstretch>0</horstretch>
@@ -913,31 +945,31 @@
                 <property name="textFormat">
                  <enum>Qt::PlainText</enum>
                 </property>
+                <property name="wordWrap">
+                 <bool>true</bool>
+                </property>
                 <property name="textInteractionFlags">
                  <set>Qt::TextSelectableByMouse</set>
                 </property>
                </widget>
               </item>
-              <item row="4" column="1" colspan="5">
-               <widget class="QLabel" name="labelSavePathVal">
+              <item row="6" column="0">
+               <widget class="QLabel" name="labelComment">
                 <property name="sizePolicy">
-                 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+                 <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
                   <horstretch>0</horstretch>
                   <verstretch>0</verstretch>
                  </sizepolicy>
                 </property>
-                <property name="textFormat">
-                 <enum>Qt::PlainText</enum>
-                </property>
-                <property name="wordWrap">
-                 <bool>true</bool>
+                <property name="text">
+                 <string>Comment:</string>
                 </property>
-                <property name="textInteractionFlags">
-                 <set>Qt::TextSelectableByMouse</set>
+                <property name="alignment">
+                 <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
                 </property>
                </widget>
               </item>
-              <item row="5" column="1" colspan="5">
+              <item row="6" column="1" colspan="5">
                <widget class="QLabel" name="labelCommentVal">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Expanding" vsizetype="Expanding">

src/gui/transferlistmodel.cpp

@@ -193,6 +193,7 @@ QVariant TransferListModel::headerData(const int section, const Qt::Orientation
             case TR_INFOHASH_V1: return tr("Info Hash v1", "i.e: torrent info hash v1");
             case TR_INFOHASH_V2: return tr("Info Hash v2", "i.e: torrent info hash v2");
             case TR_REANNOUNCE: return tr("Reannounce In", "Indicates the time until next trackers reannounce");
+            case TR_PRIVATE: return tr("Private", "Flags private torrents");
             default: return {};
             }
         }
@@ -357,6 +358,15 @@ QString TransferListModel::displayValue(const BitTorrent::Torrent *torrent, cons
         return Utils::Misc::userFriendlyDuration(time);
     };
 
+    const auto privateString = [hideValues](const bool isPrivate, const bool hasMetadata) -> QString
+    {
+        if (hideValues && !isPrivate)
+            return {};
+        if (hasMetadata)
+            return isPrivate ? tr("Yes") : tr("No");
+        return tr("N/A");
+    };
+
     switch (column)
     {
     case TR_NAME:
@@ -431,6 +441,8 @@ QString TransferListModel::displayValue(const BitTorrent::Torrent *torrent, cons
         return hashString(torrent->infoHash().v2());
     case TR_REANNOUNCE:
         return reannounceString(torrent->nextAnnounce());
+    case TR_PRIVATE:
+        return privateString(torrent->isPrivate(), torrent->hasMetadata());
     }
 
     return {};
@@ -512,6 +524,8 @@ QVariant TransferListModel::internalValue(const BitTorrent::Torrent *torrent, co
         return QVariant::fromValue(torrent->infoHash().v2());
     case TR_REANNOUNCE:
         return torrent->nextAnnounce();
+    case TR_PRIVATE:
+        return (torrent->hasMetadata() ? torrent->isPrivate() : QVariant());
     }
 
     return {};

src/gui/transferlistmodel.h

@@ -86,6 +86,7 @@ class TransferListModel final : public QAbstractListModel
         TR_INFOHASH_V1,
         TR_INFOHASH_V2,
         TR_REANNOUNCE,
+        TR_PRIVATE,
 
         NB_COLUMNS
     };

src/gui/transferlistsortmodel.cpp

@@ -199,6 +199,7 @@ int TransferListSortModel::compare(const QModelIndex &left, const QModelIndex &r
     case TransferListModel::TR_POPULARITY:
         return customCompare(leftValue.toReal(), rightValue.toReal());
 
+    case TransferListModel::TR_PRIVATE:
     case TransferListModel::TR_STATUS:
         return threeWayCompare(leftValue.toInt(), rightValue.toInt());
 

src/gui/transferlistwidget.cpp

@@ -183,6 +183,7 @@ TransferListWidget::TransferListWidget(QWidget *parent, MainWindow *mainWindow)
         setColumnHidden(TransferListModel::TR_LAST_ACTIVITY, true);
         setColumnHidden(TransferListModel::TR_TOTAL_SIZE, true);
         setColumnHidden(TransferListModel::TR_REANNOUNCE, true);
+        setColumnHidden(TransferListModel::TR_PRIVATE, true);
     }
 
     //Ensure that at least one column is visible at all times

src/webui/api/serialize/serialize_torrent.cpp

@@ -163,7 +163,8 @@ QVariantMap serialize(const BitTorrent::Torrent &torrent)
         {KEY_TORRENT_AVAILABILITY, torrent.distributedCopies()},
         {KEY_TORRENT_REANNOUNCE, torrent.nextAnnounce()},
         {KEY_TORRENT_COMMENT, torrent.comment()},
-        {KEY_TORRENT_PRIVATE, torrent.isPrivate()},
-        {KEY_TORRENT_TOTAL_SIZE, torrent.totalSize()}
+        {KEY_TORRENT_PRIVATE, (torrent.hasMetadata() ? torrent.isPrivate() : QVariant())},
+        {KEY_TORRENT_TOTAL_SIZE, torrent.totalSize()},
+        {KEY_TORRENT_HAS_METADATA, torrent.hasMetadata()}
     };
 }

src/webui/api/serialize/serialize_torrent.h

@@ -94,5 +94,6 @@ inline const QString KEY_TORRENT_AVAILABILITY = u"availability"_s;
 inline const QString KEY_TORRENT_REANNOUNCE = u"reannounce"_s;
 inline const QString KEY_TORRENT_COMMENT = u"comment"_s;
 inline const QString KEY_TORRENT_PRIVATE = u"private"_s;
+inline const QString KEY_TORRENT_HAS_METADATA = u"has_metadata"_s;
 
 QVariantMap serialize(const BitTorrent::Torrent &torrent);

src/webui/api/torrentscontroller.cpp

@@ -116,6 +116,8 @@ const QString KEY_PROP_PRIVATE = u"private"_s;
 const QString KEY_PROP_SSL_CERTIFICATE = u"ssl_certificate"_s;
 const QString KEY_PROP_SSL_PRIVATEKEY = u"ssl_private_key"_s;
 const QString KEY_PROP_SSL_DHPARAMS = u"ssl_dh_params"_s;
+const QString KEY_PROP_HAS_METADATA = u"has_metadata"_s;
+
 
 // File keys
 const QString KEY_FILE_INDEX = u"index"_s;
@@ -438,6 +440,8 @@ void TorrentsController::propertiesAction()
     const int uploadLimit = torrent->uploadLimit();
     const qreal ratio = torrent->realRatio();
     const qreal popularity = torrent->popularity();
+    const bool hasMetadata = torrent->hasMetadata();
+    const bool isPrivate = torrent->isPrivate();
 
     const QJsonObject ret
     {
@@ -474,14 +478,15 @@ void TorrentsController::propertiesAction()
         {KEY_PROP_PIECES_HAVE, torrent->piecesHave()},
         {KEY_PROP_CREATED_BY, torrent->creator()},
         {KEY_PROP_IS_PRIVATE, torrent->isPrivate()}, // used for maintaining backward compatibility
-        {KEY_PROP_PRIVATE, torrent->isPrivate()},
+        {KEY_PROP_PRIVATE, (hasMetadata ? isPrivate : QJsonValue())},
         {KEY_PROP_ADDITION_DATE, Utils::DateTime::toSecsSinceEpoch(torrent->addedTime())},
         {KEY_PROP_LAST_SEEN, Utils::DateTime::toSecsSinceEpoch(torrent->lastSeenComplete())},
         {KEY_PROP_COMPLETION_DATE, Utils::DateTime::toSecsSinceEpoch(torrent->completedTime())},
         {KEY_PROP_CREATION_DATE, Utils::DateTime::toSecsSinceEpoch(torrent->creationDate())},
         {KEY_PROP_SAVE_PATH, torrent->savePath().toString()},
         {KEY_PROP_DOWNLOAD_PATH, torrent->downloadPath().toString()},
-        {KEY_PROP_COMMENT, torrent->comment()}
+        {KEY_PROP_COMMENT, torrent->comment()},
+        {KEY_PROP_HAS_METADATA, torrent->hasMetadata()}
     };
 
     setResult(ret);

src/webui/webapplication.h

@@ -54,7 +54,7 @@
 #include "base/utils/version.h"
 #include "api/isessionmanager.h"
 
-inline const Utils::Version<3, 2> API_VERSION {2, 11, 1};
+inline const Utils::Version<3, 2> API_VERSION {2, 11, 2};
 
 class QTimer;
 

src/webui/www/private/scripts/dynamicTable.js

@@ -948,6 +948,7 @@ window.qBittorrent.DynamicTable = (function() {
             this.newColumn("last_activity", "", "QBT_TR(Last Activity)QBT_TR[CONTEXT=TransferListModel]", 100, false);
             this.newColumn("availability", "", "QBT_TR(Availability)QBT_TR[CONTEXT=TransferListModel]", 100, false);
             this.newColumn("reannounce", "", "QBT_TR(Reannounce In)QBT_TR[CONTEXT=TransferListModel]", 100, false);
+            this.newColumn("private", "", "QBT_TR(Private)QBT_TR[CONTEXT=TransferListModel]", 100, false);
 
             this.columns["state_icon"].onclick = "";
             this.columns["state_icon"].dataProperties[0] = "state";
@@ -1331,6 +1332,19 @@ window.qBittorrent.DynamicTable = (function() {
                 td.set("text", time);
                 td.set("title", time);
             };
+
+            // private
+            this.columns["private"].updateTd = function(td, row) {
+                const hasMetadata = row["full_data"].has_metadata;
+                const isPrivate = this.getRowValue(row);
+                const string = hasMetadata
+                    ? (isPrivate
+                        ? "QBT_TR(Yes)QBT_TR[CONTEXT=PropertiesWidget]"
+                        : "QBT_TR(No)QBT_TR[CONTEXT=PropertiesWidget]")
+                    : "QBT_TR(N/A)QBT_TR[CONTEXT=PropertiesWidget]";
+                td.set("text", string);
+                td.set("title", string);
+            };
         },
 
         applyFilter: function(row, filterName, categoryHash, tagHash, trackerHash, filterTerms) {

src/webui/www/private/scripts/prop-general.js

@@ -70,6 +70,7 @@ window.qBittorrent.PropGeneral = (function() {
         $("torrent_hash_v2").set("html", "");
         $("save_path").set("html", "");
         $("comment").set("html", "");
+        $("private").set("html", "");
         piecesBar.clear();
     };
 
@@ -210,6 +211,15 @@ window.qBittorrent.PropGeneral = (function() {
                     $("save_path").set("html", data.save_path);
 
                     $("comment").set("html", window.qBittorrent.Misc.parseHtmlLinks(window.qBittorrent.Misc.escapeHtml(data.comment)));
+
+                    if (data.has_metadata) {
+                        $("private").set("text", (data.private
+                            ? "QBT_TR(Yes)QBT_TR[CONTEXT=PropertiesWidget]"
+                            : "QBT_TR(No)QBT_TR[CONTEXT=PropertiesWidget]"));
+                    }
+                    else {
+                        $("private").set("text", "QBT_TR(N/A)QBT_TR[CONTEXT=PropertiesWidget]");
+                    }
                 }
                 else {
                     clearData();

src/webui/www/private/views/properties.html

@@ -74,6 +74,10 @@
                 <td class="generalLabel">QBT_TR(Created On:)QBT_TR[CONTEXT=PropertiesWidget]</td>
                 <td id="creation_date"></td>
             </tr>
+            <tr>
+                <td class="generalLabel">QBT_TR(Private:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                <td id="private"></td>
+            </tr>
             <tr>
                 <td class="generalLabel">QBT_TR(Info Hash v1:)QBT_TR[CONTEXT=PropertiesWidget]</td>
                 <td colspan="5" id="torrent_hash_v1"></td>