Merge pull request #10464 from thalieht/torrent-size-limit

Increase the download request size limit from 10 to 100 MiB

src/base/bittorrent/session.cpp

@@ -1809,7 +1809,7 @@ bool Session::addTorrent(const QString &source, const AddTorrentParams &params)
     if (Net::DownloadManager::hasSupportedScheme(source)) {
         LogMsg(tr("Downloading '%1', please wait...", "e.g: Downloading 'xxx.torrent', please wait...").arg(source));
         // Launch downloader
-        Net::DownloadManager::instance()->download(Net::DownloadRequest(source).limit(10485760 /* 10MB */)
+        Net::DownloadManager::instance()->download(Net::DownloadRequest(source).limit(MAX_TORRENT_SIZE)
                                                    , this, &Session::handleDownloadFinished);
         m_downloadedTorrents[source] = params;
         return true;

src/base/bittorrent/torrentinfo.cpp

@@ -39,7 +39,9 @@
 #include <QStringList>
 #include <QUrl>
 
+#include "base/global.h"
 #include "base/utils/fs.h"
+#include "base/utils/misc.h"
 #include "infohash.h"
 #include "trackerentry.h"
 
@@ -116,10 +118,9 @@ TorrentInfo TorrentInfo::loadFromFile(const QString &path, QString *error) noexc
         return TorrentInfo();
     }
 
-    const qint64 fileSizeLimit = 100 * 1024 * 1024;  // 100 MB
+    if (file.size() > MAX_TORRENT_SIZE) {
-    if (file.size() > fileSizeLimit) {
         if (error)
-            *error = tr("File size exceeds max limit %1").arg(fileSizeLimit);
+            *error = tr("File size exceeds max limit %1").arg(Utils::Misc::friendlyUnit(MAX_TORRENT_SIZE));
         return TorrentInfo();
     }
 

src/base/global.h

@@ -36,6 +36,7 @@
 #endif
 
 const char C_TORRENT_FILE_EXTENSION[] = ".torrent";
+const int MAX_TORRENT_SIZE = 100 * 1024 * 1024; // 100 MiB
 
 template <typename T>
 constexpr typename std::add_const<T>::type &asConst(T &t) noexcept { return t; }

src/gui/addnewtorrentdialog.cpp

@@ -238,7 +238,7 @@ void AddNewTorrentDialog::show(const QString &source, const BitTorrent::AddTorre
     if (Net::DownloadManager::hasSupportedScheme(source)) {
         // Launch downloader
         Net::DownloadManager::instance()->download(
-                    Net::DownloadRequest(source).limit(10485760 /* 10MB */)
+                    Net::DownloadRequest(source).limit(MAX_TORRENT_SIZE)
                     , dlg, &AddNewTorrentDialog::handleDownloadFinished);
         return;
     }