WebAPI: require complete stats object

Author: jabloink

src/base/bittorrent/addtorrentparams.h

@@ -50,16 +50,16 @@ namespace BitTorrent
     // Optional lifetime stats to seed on torrent add
     struct InitialTorrentStats
     {
-        std::optional<qint64> totalUploaded;
-        std::optional<qint64> totalDownloaded;
-        std::optional<qint64> addedTime;          // posix seconds
-        std::optional<qint64> completedTime;      // posix seconds
-        std::optional<qint64> lastSeenComplete;   // posix seconds
-        std::optional<qint64> lastUpload;         // posix seconds
-        std::optional<qint64> lastDownload;       // posix seconds
-        std::optional<int> activeTime;            // seconds
-        std::optional<int> finishedTime;          // seconds
-        std::optional<int> seedingTime;           // seconds
+        qint64 totalUploaded = 0;
+        qint64 totalDownloaded = 0;
+        qint64 addedTime = 0;          // posix seconds
+        qint64 completedTime = 0;      // posix seconds
+        qint64 lastSeenComplete = 0;   // posix seconds
+        qint64 lastUpload = 0;         // posix seconds
+        qint64 lastDownload = 0;       // posix seconds
+        int activeTime = 0;            // seconds
+        int finishedTime = 0;          // seconds
+        int seedingTime = 0;           // seconds
 
         friend bool operator==(const InitialTorrentStats &lhs, const InitialTorrentStats &rhs) = default;
     };

src/base/bittorrent/sessionimpl.cpp

@@ -2957,26 +2957,16 @@ bool SessionImpl::addTorrent_impl(const TorrentDescriptor &source, const AddTorr
     if (addTorrentParams.initialStats)
     {
         const InitialTorrentStats &s = *addTorrentParams.initialStats;
-        if (s.totalUploaded)
-            p.total_uploaded = *s.totalUploaded;
-        if (s.totalDownloaded)
-            p.total_downloaded = *s.totalDownloaded;
-        if (s.addedTime)
-            p.added_time = static_cast<std::time_t>(*s.addedTime);
-        if (s.completedTime)
-            p.completed_time = static_cast<std::time_t>(*s.completedTime);
-        if (s.lastSeenComplete)
-            p.last_seen_complete = static_cast<std::time_t>(*s.lastSeenComplete);
-        if (s.lastUpload)
-            p.last_upload = static_cast<std::time_t>(*s.lastUpload);
-        if (s.lastDownload)
-            p.last_download = static_cast<std::time_t>(*s.lastDownload);
-        if (s.activeTime)
-            p.active_time = *s.activeTime;
-        if (s.finishedTime)
-            p.finished_time = *s.finishedTime;
-        if (s.seedingTime)
-            p.seeding_time = *s.seedingTime;
+        p.total_uploaded = s.totalUploaded;
+        p.total_downloaded = s.totalDownloaded;
+        p.added_time = static_cast<std::time_t>(s.addedTime);
+        p.completed_time = static_cast<std::time_t>(s.completedTime);
+        p.last_seen_complete = static_cast<std::time_t>(s.lastSeenComplete);
+        p.last_upload = static_cast<std::time_t>(s.lastUpload);
+        p.last_download = static_cast<std::time_t>(s.lastDownload);
+        p.active_time = s.activeTime;
+        p.finished_time = s.finishedTime;
+        p.seeding_time = s.seedingTime;
     }
 
     // Limits

src/webui/api/torrentscontroller.cpp

@@ -1095,23 +1095,23 @@ namespace
             throw APIError(APIErrorType::BadParams, u"`stats` must be a JSON object"_s);
 
         const QJsonObject obj = doc.object();
-        BitTorrent::InitialTorrentStats stats;
 
-        const auto readInt64 = [&obj](const QString &key) -> std::optional<qint64>
+        const auto readInt64 = [&obj](const QString &key) -> qint64
         {
             const QJsonValue v = obj.value(key);
             if (v.isUndefined() || v.isNull())
-                return std::nullopt;
+                throw APIError(APIErrorType::BadParams, u"`stats.%1` is required"_s.arg(key));
             return v.toVariant().toLongLong();
         };
-        const auto readInt = [&obj](const QString &key) -> std::optional<int>
+        const auto readInt = [&obj](const QString &key) -> int
         {
             const QJsonValue v = obj.value(key);
             if (v.isUndefined() || v.isNull())
-                return std::nullopt;
+                throw APIError(APIErrorType::BadParams, u"`stats.%1` is required"_s.arg(key));
             return v.toVariant().toInt();
         };
 
+        BitTorrent::InitialTorrentStats stats;
         stats.totalUploaded = readInt64(u"total_uploaded"_s);
         stats.totalDownloaded = readInt64(u"total_downloaded"_s);
         stats.addedTime = readInt64(u"added_time"_s);