From 4a1e3de06dad423d60232cfd5840b38df0a2ae36 Mon Sep 17 00:00:00 2001 From: "Vladimir Golovnev (Glassez)" Date: Mon, 27 Apr 2020 11:26:45 +0300 Subject: [PATCH 1/2] Find complete files when checking torrent --- src/base/CMakeLists.txt | 2 + src/base/base.pri | 2 + src/base/bittorrent/customstorage.cpp | 94 +++++++++++++++++++++++++++ src/base/bittorrent/customstorage.h | 55 ++++++++++++++++ src/base/bittorrent/session.cpp | 19 ++++-- 5 files changed, 165 insertions(+), 7 deletions(-) create mode 100644 src/base/bittorrent/customstorage.cpp create mode 100644 src/base/bittorrent/customstorage.h diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt index ee304d4de..2bf4aa368 100644 --- a/src/base/CMakeLists.txt +++ b/src/base/CMakeLists.txt @@ -7,6 +7,7 @@ add_library(qbt_base STATIC bittorrent/addtorrentparams.h bittorrent/bandwidthscheduler.h bittorrent/cachestatus.h + bittorrent/customstorage.h bittorrent/downloadpriority.h bittorrent/filterparserthread.h bittorrent/infohash.h @@ -87,6 +88,7 @@ add_library(qbt_base STATIC # sources asyncfilestorage.cpp bittorrent/bandwidthscheduler.cpp + bittorrent/customstorage.cpp bittorrent/downloadpriority.cpp bittorrent/filterparserthread.cpp bittorrent/infohash.cpp diff --git a/src/base/base.pri b/src/base/base.pri index 65667a70a..90b07a537 100644 --- a/src/base/base.pri +++ b/src/base/base.pri @@ -4,6 +4,7 @@ HEADERS += \ $$PWD/bittorrent/addtorrentparams.h \ $$PWD/bittorrent/bandwidthscheduler.h \ $$PWD/bittorrent/cachestatus.h \ + $$PWD/bittorrent/customstorage.h \ $$PWD/bittorrent/downloadpriority.h \ $$PWD/bittorrent/filterparserthread.h \ $$PWD/bittorrent/infohash.h \ @@ -85,6 +86,7 @@ HEADERS += \ SOURCES += \ $$PWD/asyncfilestorage.cpp \ $$PWD/bittorrent/bandwidthscheduler.cpp \ + $$PWD/bittorrent/customstorage.cpp \ $$PWD/bittorrent/downloadpriority.cpp \ $$PWD/bittorrent/filterparserthread.cpp \ $$PWD/bittorrent/infohash.cpp \ diff --git a/src/base/bittorrent/customstorage.cpp b/src/base/bittorrent/customstorage.cpp new file mode 100644 index 000000000..60766e629 --- /dev/null +++ b/src/base/bittorrent/customstorage.cpp @@ -0,0 +1,94 @@ +/* + * Bittorrent Client using Qt and libtorrent. + * Copyright (C) 2020 Vladimir Golovnev + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * In addition, as a special exception, the copyright holders give permission to + * link this program with the OpenSSL project's "OpenSSL" library (or with + * modified versions of it that use the same license as the "OpenSSL" library), + * and distribute the linked executables. You must obey the GNU General Public + * License in all respects for all of the code used other than "OpenSSL". If you + * modify file(s), you may extend this exception to your version of the file(s), + * but you are not obligated to do so. If you do not wish to do so, delete this + * exception statement from your version. + */ + +#include "customstorage.h" + +#if (LIBTORRENT_VERSION_NUM >= 10200) +#include + +#include + +#include "base/utils/fs.h" + +extern const QString QB_EXT {QStringLiteral(".!qB")}; + +lt::storage_interface *customStorageConstructor(const lt::storage_params ¶ms, lt::file_pool &pool) +{ + return new CustomStorage {params, pool}; +} + +CustomStorage::CustomStorage(const lt::storage_params ¶ms, lt::file_pool &filePool) + : lt::default_storage {params, filePool} +{ + m_savePath = Utils::Fs::expandPathAbs(QString::fromStdString(params.path)); +} + +bool CustomStorage::verify_resume_data(const lt::add_torrent_params &rd, const lt::aux::vector &links, lt::storage_error &ec) +{ + const QDir saveDir {m_savePath}; + + const lt::file_storage &fileStorage = files(); + for (const lt::file_index_t fileIndex : fileStorage.file_range()) { + // ignore files that have priority 0 + if ((m_filePriorities.end_index() > fileIndex) && (m_filePriorities[fileIndex] == lt::dont_download)) + continue; + + // ignore pad files + if (fileStorage.pad_file_at(fileIndex)) continue; + + const QString filePath = QString::fromStdString(fileStorage.file_path(fileIndex)); + if (filePath.endsWith(QB_EXT)) { + const QString completeFilePath = filePath.left(filePath.size() - QB_EXT.size()); + QFile completeFile {saveDir.absoluteFilePath(completeFilePath)}; + if (completeFile.exists()) { + QFile currentFile {saveDir.absoluteFilePath(filePath)}; + if (currentFile.exists()) + currentFile.remove(); + completeFile.rename(currentFile.fileName()); + } + } + } + + return lt::default_storage::verify_resume_data(rd, links, ec); +} + +void CustomStorage::set_file_priority(lt::aux::vector &priorities, lt::storage_error &ec) +{ + m_filePriorities = priorities; + lt::default_storage::set_file_priority(priorities, ec); +} + +lt::status_t CustomStorage::move_storage(const std::string &savePath, lt::move_flags_t flags, lt::storage_error &ec) +{ + const lt::status_t ret = lt::default_storage::move_storage(savePath, flags, ec); + if (ret != lt::status_t::fatal_disk_error) + m_savePath = Utils::Fs::expandPathAbs(QString::fromStdString(savePath)); + + return ret; +} +#endif diff --git a/src/base/bittorrent/customstorage.h b/src/base/bittorrent/customstorage.h new file mode 100644 index 000000000..fa8767348 --- /dev/null +++ b/src/base/bittorrent/customstorage.h @@ -0,0 +1,55 @@ +/* + * Bittorrent Client using Qt and libtorrent. + * Copyright (C) 2020 Vladimir Golovnev + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * In addition, as a special exception, the copyright holders give permission to + * link this program with the OpenSSL project's "OpenSSL" library (or with + * modified versions of it that use the same license as the "OpenSSL" library), + * and distribute the linked executables. You must obey the GNU General Public + * License in all respects for all of the code used other than "OpenSSL". If you + * modify file(s), you may extend this exception to your version of the file(s), + * but you are not obligated to do so. If you do not wish to do so, delete this + * exception statement from your version. + */ + +#pragma once + +#include + +#if (LIBTORRENT_VERSION_NUM >= 10200) +#include +#include +#include + +#include + +lt::storage_interface *customStorageConstructor(const lt::storage_params ¶ms, lt::file_pool &pool); + +class CustomStorage final : public lt::default_storage +{ +public: + explicit CustomStorage(const lt::storage_params ¶ms, lt::file_pool &filePool); + + bool verify_resume_data(const lt::add_torrent_params &rd, const lt::aux::vector &links, lt::storage_error &ec) override; + void set_file_priority(lt::aux::vector &priorities, lt::storage_error &ec) override; + lt::status_t move_storage(const std::string &savePath, lt::move_flags_t flags, lt::storage_error &ec) override; + +private: + lt::aux::vector m_filePriorities; + QString m_savePath; +}; +#endif diff --git a/src/base/bittorrent/session.cpp b/src/base/bittorrent/session.cpp index d18bf7c51..8db43787c 100644 --- a/src/base/bittorrent/session.cpp +++ b/src/base/bittorrent/session.cpp @@ -94,6 +94,7 @@ #include "base/utils/net.h" #include "base/utils/random.h" #include "bandwidthscheduler.h" +#include "customstorage.h" #include "filterparserthread.h" #include "ltunderlyingtype.h" #include "magneturi.h" @@ -2456,6 +2457,8 @@ bool Session::addTorrent_impl(CreateTorrentParams params, const MagnetUri &magne p.max_connections = maxConnectionsPerTorrent(); p.max_uploads = maxUploadsPerTorrent(); + p.storage = customStorageConstructor; + m_addingTorrents.insert(hash, params); // Adding torrent to BitTorrent session m_nativeSession->async_add_torrent(p); @@ -2528,21 +2531,23 @@ bool Session::loadMetadata(const MagnetUri &magnetUri) const QString savePath = Utils::Fs::tempPath() + static_cast(hash); p.save_path = Utils::Fs::toNativePath(savePath).toStdString(); - // Forced start #if (LIBTORRENT_VERSION_NUM < 10200) + // Forced start p.flags &= ~lt::add_torrent_params::flag_paused; p.flags &= ~lt::add_torrent_params::flag_auto_managed; -#else - p.flags &= ~lt::torrent_flags::paused; - p.flags &= ~lt::torrent_flags::auto_managed; -#endif // Solution to avoid accidental file writes -#if (LIBTORRENT_VERSION_NUM < 10200) p.flags |= lt::add_torrent_params::flag_upload_mode; #else + // Forced start + p.flags &= ~lt::torrent_flags::paused; + p.flags &= ~lt::torrent_flags::auto_managed; + + // Solution to avoid accidental file writes p.flags |= lt::torrent_flags::upload_mode; -#endif + + p.storage = customStorageConstructor; +#endif // Adding torrent to BitTorrent session lt::error_code ec; From f4efa530dc834ebc1e7a288d06e5dc681c723b89 Mon Sep 17 00:00:00 2001 From: "Vladimir Golovnev (Glassez)" Date: Mon, 25 May 2020 10:40:46 +0300 Subject: [PATCH 2/2] Create header for common BitTorrent declarations --- src/base/CMakeLists.txt | 1 + src/base/base.pri | 3 +- src/base/bittorrent/common.h | 34 +++++++++++++++++++++++ src/base/bittorrent/customstorage.cpp | 3 +- src/base/bittorrent/session.cpp | 1 + src/base/bittorrent/torrenthandle.cpp | 2 -- src/base/bittorrent/torrenthandle.h | 2 -- src/base/bittorrent/torrenthandleimpl.cpp | 3 ++ src/base/utils/fs.cpp | 2 +- src/gui/previewselectdialog.cpp | 1 + src/gui/torrentcontentmodelfile.cpp | 2 +- src/gui/torrentcontentmodelfolder.cpp | 2 +- src/gui/torrentcontenttreeview.cpp | 1 + src/webui/api/torrentscontroller.cpp | 1 + 14 files changed, 48 insertions(+), 10 deletions(-) create mode 100644 src/base/bittorrent/common.h diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt index 2bf4aa368..67f653dc7 100644 --- a/src/base/CMakeLists.txt +++ b/src/base/CMakeLists.txt @@ -7,6 +7,7 @@ add_library(qbt_base STATIC bittorrent/addtorrentparams.h bittorrent/bandwidthscheduler.h bittorrent/cachestatus.h + bittorrent/common.h bittorrent/customstorage.h bittorrent/downloadpriority.h bittorrent/filterparserthread.h diff --git a/src/base/base.pri b/src/base/base.pri index 90b07a537..f2f17d2fc 100644 --- a/src/base/base.pri +++ b/src/base/base.pri @@ -1,9 +1,10 @@ HEADERS += \ $$PWD/algorithm.h \ $$PWD/asyncfilestorage.h \ - $$PWD/bittorrent/addtorrentparams.h \ + $$PWD/bittorrent/addtorrentparams.h \ $$PWD/bittorrent/bandwidthscheduler.h \ $$PWD/bittorrent/cachestatus.h \ + $$PWD/bittorrent/common.h \ $$PWD/bittorrent/customstorage.h \ $$PWD/bittorrent/downloadpriority.h \ $$PWD/bittorrent/filterparserthread.h \ diff --git a/src/base/bittorrent/common.h b/src/base/bittorrent/common.h new file mode 100644 index 000000000..6a12cfd92 --- /dev/null +++ b/src/base/bittorrent/common.h @@ -0,0 +1,34 @@ +/* + * Bittorrent Client using Qt and libtorrent. + * Copyright (C) 2020 Vladimir Golovnev + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * In addition, as a special exception, the copyright holders give permission to + * link this program with the OpenSSL project's "OpenSSL" library (or with + * modified versions of it that use the same license as the "OpenSSL" library), + * and distribute the linked executables. You must obey the GNU General Public + * License in all respects for all of the code used other than "OpenSSL". If you + * modify file(s), you may extend this exception to your version of the file(s), + * but you are not obligated to do so. If you do not wish to do so, delete this + * exception statement from your version. + */ + +#pragma once + +#include + +// TODO: Make it inline in C++17 +extern const QString QB_EXT; diff --git a/src/base/bittorrent/customstorage.cpp b/src/base/bittorrent/customstorage.cpp index 60766e629..e411f2d10 100644 --- a/src/base/bittorrent/customstorage.cpp +++ b/src/base/bittorrent/customstorage.cpp @@ -34,8 +34,7 @@ #include #include "base/utils/fs.h" - -extern const QString QB_EXT {QStringLiteral(".!qB")}; +#include "common.h" lt::storage_interface *customStorageConstructor(const lt::storage_params ¶ms, lt::file_pool &pool) { diff --git a/src/base/bittorrent/session.cpp b/src/base/bittorrent/session.cpp index 8db43787c..9ed97f146 100644 --- a/src/base/bittorrent/session.cpp +++ b/src/base/bittorrent/session.cpp @@ -94,6 +94,7 @@ #include "base/utils/net.h" #include "base/utils/random.h" #include "bandwidthscheduler.h" +#include "common.h" #include "customstorage.h" #include "filterparserthread.h" #include "ltunderlyingtype.h" diff --git a/src/base/bittorrent/torrenthandle.cpp b/src/base/bittorrent/torrenthandle.cpp index cd4e11d80..5b34808e5 100644 --- a/src/base/bittorrent/torrenthandle.cpp +++ b/src/base/bittorrent/torrenthandle.cpp @@ -31,8 +31,6 @@ #include -const QString QB_EXT {QStringLiteral(".!qB")}; - namespace BitTorrent { uint qHash(const BitTorrent::TorrentState key, const uint seed) diff --git a/src/base/bittorrent/torrenthandle.h b/src/base/bittorrent/torrenthandle.h index 1960a8b3d..5b180d690 100644 --- a/src/base/bittorrent/torrenthandle.h +++ b/src/base/bittorrent/torrenthandle.h @@ -40,8 +40,6 @@ class QDateTime; class QStringList; class QUrl; -extern const QString QB_EXT; - namespace BitTorrent { enum class DownloadPriority; diff --git a/src/base/bittorrent/torrenthandleimpl.cpp b/src/base/bittorrent/torrenthandleimpl.cpp index d2d20c65e..e5c83a450 100644 --- a/src/base/bittorrent/torrenthandleimpl.cpp +++ b/src/base/bittorrent/torrenthandleimpl.cpp @@ -65,6 +65,7 @@ #include "base/tristatebool.h" #include "base/utils/fs.h" #include "base/utils/string.h" +#include "common.h" #include "downloadpriority.h" #include "ltunderlyingtype.h" #include "peeraddress.h" @@ -72,6 +73,8 @@ #include "session.h" #include "trackerentry.h" +const QString QB_EXT {QStringLiteral(".!qB")}; + using namespace BitTorrent; #if (LIBTORRENT_VERSION_NUM >= 10200) diff --git a/src/base/utils/fs.cpp b/src/base/utils/fs.cpp index cfec9b96b..079dd418c 100644 --- a/src/base/utils/fs.cpp +++ b/src/base/utils/fs.cpp @@ -58,7 +58,7 @@ #include #include -#include "base/bittorrent/torrenthandle.h" +#include "base/bittorrent/common.h" #include "base/global.h" QString Utils::Fs::toNativePath(const QString &path) diff --git a/src/gui/previewselectdialog.cpp b/src/gui/previewselectdialog.cpp index 89708c785..1b458d334 100644 --- a/src/gui/previewselectdialog.cpp +++ b/src/gui/previewselectdialog.cpp @@ -36,6 +36,7 @@ #include #include +#include "base/bittorrent/common.h" #include "base/bittorrent/torrenthandle.h" #include "base/preferences.h" #include "base/utils/fs.h" diff --git a/src/gui/torrentcontentmodelfile.cpp b/src/gui/torrentcontentmodelfile.cpp index d14d9cc6e..4d9e12271 100644 --- a/src/gui/torrentcontentmodelfile.cpp +++ b/src/gui/torrentcontentmodelfile.cpp @@ -28,7 +28,7 @@ #include "torrentcontentmodelfile.h" -#include "base/bittorrent/torrenthandle.h" +#include "base/bittorrent/common.h" #include "torrentcontentmodelfolder.h" TorrentContentModelFile::TorrentContentModelFile(const QString &fileName, qulonglong fileSize, diff --git a/src/gui/torrentcontentmodelfolder.cpp b/src/gui/torrentcontentmodelfolder.cpp index 55310b25e..5e0627a43 100644 --- a/src/gui/torrentcontentmodelfolder.cpp +++ b/src/gui/torrentcontentmodelfolder.cpp @@ -30,7 +30,7 @@ #include -#include "base/bittorrent/torrenthandle.h" +#include "base/bittorrent/common.h" #include "base/global.h" TorrentContentModelFolder::TorrentContentModelFolder(const QString &name, TorrentContentModelFolder *parent) diff --git a/src/gui/torrentcontenttreeview.cpp b/src/gui/torrentcontenttreeview.cpp index aaf30f57f..adf22046e 100644 --- a/src/gui/torrentcontenttreeview.cpp +++ b/src/gui/torrentcontenttreeview.cpp @@ -37,6 +37,7 @@ #include #include +#include "base/bittorrent/common.h" #include "base/bittorrent/session.h" #include "base/bittorrent/torrenthandle.h" #include "base/bittorrent/torrentinfo.h" diff --git a/src/webui/api/torrentscontroller.cpp b/src/webui/api/torrentscontroller.cpp index 787c071a4..ab163afbc 100644 --- a/src/webui/api/torrentscontroller.cpp +++ b/src/webui/api/torrentscontroller.cpp @@ -39,6 +39,7 @@ #include #include +#include "base/bittorrent/common.h" #include "base/bittorrent/downloadpriority.h" #include "base/bittorrent/infohash.h" #include "base/bittorrent/peeraddress.h"