Browse Source

Merge pull request #5141 from glassez/recheck

Fix torrent adding with existing data
adaptive-webui-19844
sledgehammer999 9 years ago
parent
commit
4ebb12e06b
  1. 133
      src/base/bittorrent/session.cpp
  2. 3
      src/base/bittorrent/session.h
  3. 43
      src/base/bittorrent/torrenthandle.cpp
  4. 2
      src/base/bittorrent/torrenthandle.h
  5. 3
      src/gui/gui.pri
  6. 7
      src/gui/mainwindow.cpp
  7. 1
      src/gui/mainwindow.h
  8. 11
      src/gui/mainwindow.ui
  9. 270
      src/gui/torrentimportdlg.cpp
  10. 86
      src/gui/torrentimportdlg.h
  11. 139
      src/gui/torrentimportdlg.ui

133
src/base/bittorrent/session.cpp

@ -28,63 +28,63 @@ @@ -28,63 +28,63 @@
* exception statement from your version.
*/
#include "session.h"
#include <QCoreApplication>
#include <QDateTime>
#include <QDebug>
#include <QDir>
#include <QDateTime>
#include <QString>
#include <QStringList>
#include <QNetworkInterface>
#include <QDirIterator>
#include <QHostAddress>
#include <QNetworkAddressEntry>
#include <QTimer>
#include <QNetworkInterface>
#include <QProcess>
#include <QCoreApplication>
#include <QThread>
#include <QRegExp>
#include <QString>
#include <QStringList>
#include <QThread>
#include <QTimer>
#include <queue>
#include <vector>
#include <boost/bind.hpp>
#include <libtorrent/session.hpp>
#include <libtorrent/lazy_entry.hpp>
#include <libtorrent/alert_types.hpp>
#include <libtorrent/bencode.hpp>
#include <libtorrent/error_code.hpp>
#include <libtorrent/identify_client.hpp>
#include <libtorrent/alert_types.hpp>
#include <libtorrent/torrent_info.hpp>
#include <libtorrent/ip_filter.hpp>
#include <libtorrent/magnet_uri.hpp>
#include <libtorrent/extensions/ut_metadata.hpp>
#include <libtorrent/extensions/lt_trackers.hpp>
#include <libtorrent/extensions/ut_pex.hpp>
#include <libtorrent/extensions/smart_ban.hpp>
//#include <libtorrent/extensions/metadata_transfer.hpp>
#include <libtorrent/identify_client.hpp>
#include <libtorrent/ip_filter.hpp>
#include <libtorrent/lazy_entry.hpp>
#include <libtorrent/magnet_uri.hpp>
#include <libtorrent/session.hpp>
#include <libtorrent/torrent_info.hpp>
#include "base/utils/misc.h"
#include "base/utils/fs.h"
#include "base/utils/string.h"
#include "base/unicodestrings.h"
#include "base/logger.h"
#include "base/settingsstorage.h"
#include "base/preferences.h"
#include "base/torrentfilter.h"
#include "base/net/downloadmanager.h"
#include "base/net/downloadhandler.h"
#include "base/net/downloadmanager.h"
#include "base/net/portforwarder.h"
#include "base/preferences.h"
#include "base/settingsstorage.h"
#include "base/torrentfilter.h"
#include "base/unicodestrings.h"
#include "base/utils/misc.h"
#include "base/utils/fs.h"
#include "base/utils/string.h"
#include "cachestatus.h"
#include "magneturi.h"
#include "private/filterparserthread.h"
#include "private/statistics.h"
#include "private/bandwidthscheduler.h"
#include "private/resumedatasavingmanager.h"
#include "trackerentry.h"
#include "tracker.h"
#include "magneturi.h"
#include "cachestatus.h"
#include "sessionstatus.h"
#include "torrenthandle.h"
#include "session.h"
#include "tracker.h"
#include "trackerentry.h"
static const char PEER_ID[] = "qB";
static const char RESUME_FOLDER[] = "BT_backup";
@ -155,6 +155,16 @@ namespace @@ -155,6 +155,16 @@ namespace
return expanded;
}
QStringList findAllFiles(const QString &dirPath)
{
QStringList files;
QDirIterator it(dirPath, QDir::Files, QDirIterator::Subdirectories);
while (it.hasNext())
files << it.next();
return files;
}
}
// Session
@ -1225,7 +1235,7 @@ bool Session::addTorrent(const TorrentInfo &torrentInfo, const AddTorrentParams @@ -1225,7 +1235,7 @@ bool Session::addTorrent(const TorrentInfo &torrentInfo, const AddTorrentParams
// Add a torrent to the BitTorrent session
bool Session::addTorrent_impl(AddTorrentData addData, const MagnetUri &magnetUri,
const TorrentInfo &torrentInfo, const QByteArray &fastresumeData)
TorrentInfo torrentInfo, const QByteArray &fastresumeData)
{
addData.savePath = normalizeSavePath(
addData.savePath,
@ -1243,6 +1253,12 @@ bool Session::addTorrent_impl(AddTorrentData addData, const MagnetUri &magnetUri @@ -1243,6 +1253,12 @@ bool Session::addTorrent_impl(AddTorrentData addData, const MagnetUri &magnetUri
std::vector<char> buf(fastresumeData.constData(), fastresumeData.constData() + fastresumeData.size());
std::vector<boost::uint8_t> filePriorities;
QString savePath;
if (addData.savePath.isEmpty()) // using Advanced mode
savePath = categorySavePath(addData.category);
else // using Simple mode
savePath = addData.savePath;
bool fromMagnetUri = magnetUri.isValid();
if (fromMagnetUri) {
hash = magnetUri.hash();
@ -1271,6 +1287,8 @@ bool Session::addTorrent_impl(AddTorrentData addData, const MagnetUri &magnetUri @@ -1271,6 +1287,8 @@ bool Session::addTorrent_impl(AddTorrentData addData, const MagnetUri &magnetUri
}
else if (torrentInfo.isValid()) {
// Metadata
if (!addData.resumed && !addData.hasSeedStatus)
findIncompleteFiles(torrentInfo, savePath);
p.ti = torrentInfo.nativeInfo();
hash = torrentInfo.hash();
}
@ -1329,16 +1347,6 @@ bool Session::addTorrent_impl(AddTorrentData addData, const MagnetUri &magnetUri @@ -1329,16 +1347,6 @@ bool Session::addTorrent_impl(AddTorrentData addData, const MagnetUri &magnetUri
Preferences *const pref = Preferences::instance();
p.max_connections = pref->getMaxConnecsPerTorrent();
p.max_uploads = pref->getMaxUploadsPerTorrent();
QString savePath;
// Set actual save path (e.g. temporary folder)
if (isTempPathEnabled() && !addData.disableTempPath && !addData.hasSeedStatus)
savePath = m_tempPath;
else if (addData.savePath.isEmpty()) // using Advanced mode
savePath = categorySavePath(addData.category);
else // using Simple mode
savePath = addData.savePath;
p.save_path = Utils::String::toStdString(Utils::Fs::toNativePath(savePath));
// Check if save path exists, creating it otherwise
if (!QDir(savePath).exists())
@ -1350,6 +1358,53 @@ bool Session::addTorrent_impl(AddTorrentData addData, const MagnetUri &magnetUri @@ -1350,6 +1358,53 @@ bool Session::addTorrent_impl(AddTorrentData addData, const MagnetUri &magnetUri
return true;
}
bool Session::findIncompleteFiles(TorrentInfo &torrentInfo, QString &savePath) const
{
auto findInDir = [](const QString &dirPath, TorrentInfo &torrentInfo) -> bool
{
bool found = false;
if (torrentInfo.filesCount() == 1) {
const QString filePath = dirPath + torrentInfo.filePath(0);
if (QFile(filePath).exists()) {
found = true;
}
else if (QFile(filePath + QB_EXT).exists()) {
found = true;
torrentInfo.renameFile(0, torrentInfo.filePath(0) + QB_EXT);
}
}
else {
QSet<QString> allFiles;
int dirPathSize = dirPath.size();
foreach (const QString &file, findAllFiles(dirPath + torrentInfo.name()))
allFiles << file.mid(dirPathSize);
for (int i = 0; i < torrentInfo.filesCount(); ++i) {
QString filePath = torrentInfo.filePath(i);
if (allFiles.contains(filePath)) {
found = true;
}
else {
filePath += QB_EXT;
if (allFiles.contains(filePath)) {
found = true;
torrentInfo.renameFile(i, filePath);
}
}
}
}
return found;
};
bool found = findInDir(savePath, torrentInfo);
if (!found && isTempPathEnabled()) {
savePath = m_tempPath;
found = findInDir(savePath, torrentInfo);
}
return found;
}
// Add a torrent to the BitTorrent session in hidden mode
// and force it to load its metadata
bool Session::loadMetadata(const MagnetUri &magnetUri)

3
src/base/bittorrent/session.h

@ -356,8 +356,9 @@ namespace BitTorrent @@ -356,8 +356,9 @@ namespace BitTorrent
void startUpTorrents();
bool addTorrent_impl(AddTorrentData addData, const MagnetUri &magnetUri,
const TorrentInfo &torrentInfo = TorrentInfo(),
TorrentInfo torrentInfo = TorrentInfo(),
const QByteArray &fastresumeData = QByteArray());
bool findIncompleteFiles(TorrentInfo &torrentInfo, QString &savePath) const;
void updateRatioTimer();
void exportTorrentFile(TorrentHandle *const torrent, TorrentExportFolder folder = TorrentExportFolder::Regular);

43
src/base/bittorrent/torrenthandle.cpp

@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
#include "trackerentry.h"
#include "torrenthandle.h"
static const char QB_EXT[] = ".!qB";
const QString QB_EXT {".!qB"};
namespace libt = libtorrent;
using namespace BitTorrent;
@ -215,15 +215,9 @@ TorrentHandle::TorrentHandle(Session *session, const libtorrent::torrent_handle @@ -215,15 +215,9 @@ TorrentHandle::TorrentHandle(Session *session, const libtorrent::torrent_handle
updateStatus();
m_hash = InfoHash(m_nativeStatus.info_hash);
adjustActualSavePath();
if (!data.resumed) {
if (!data.resumed)
setSequentialDownload(data.sequential);
if (hasMetadata()) {
if (m_session->isAppendExtensionEnabled())
appendExtensionsToIncompleteFiles();
}
}
}
TorrentHandle::~TorrentHandle() {}
@ -1475,6 +1469,7 @@ void TorrentHandle::handleTorrentCheckedAlert(libtorrent::torrent_checked_alert @@ -1475,6 +1469,7 @@ void TorrentHandle::handleTorrentCheckedAlert(libtorrent::torrent_checked_alert
m_hasSeedStatus = true;
adjustActualSavePath();
appendExtensionsToIncompleteFiles();
if (m_pauseAfterRecheck) {
m_pauseAfterRecheck = false;
@ -1496,13 +1491,19 @@ void TorrentHandle::handleTorrentFinishedAlert(libtorrent::torrent_finished_aler @@ -1496,13 +1491,19 @@ void TorrentHandle::handleTorrentFinishedAlert(libtorrent::torrent_finished_aler
m_hasSeedStatus = true;
adjustActualSavePath();
if (Preferences::instance()->recheckTorrentsOnCompletion())
forceRecheck();
appendExtensionsToIncompleteFiles();
if (isMoveInProgress() || m_renameCount > 0)
const bool recheckTorrentsOnCompletion = Preferences::instance()->recheckTorrentsOnCompletion();
if (isMoveInProgress() || m_renameCount > 0) {
if (recheckTorrentsOnCompletion)
m_moveFinishedTriggers.append(boost::bind(&TorrentHandle::forceRecheck, this));
m_moveFinishedTriggers.append(boost::bind(&Session::handleTorrentFinished, m_session, this));
else
}
else {
if (recheckTorrentsOnCompletion)
forceRecheck();
m_session->handleTorrentFinished(this);
}
}
void TorrentHandle::handleTorrentPausedAlert(libtorrent::torrent_paused_alert *p)
@ -1616,7 +1617,7 @@ void TorrentHandle::handleFileCompletedAlert(libtorrent::file_completed_alert *p @@ -1616,7 +1617,7 @@ void TorrentHandle::handleFileCompletedAlert(libtorrent::file_completed_alert *p
QString name = filePath(p->index);
if (name.endsWith(QB_EXT)) {
const QString oldName = name;
name.chop(QString(QB_EXT).size());
name.chop(QB_EXT.size());
qDebug("Renaming %s to %s", qPrintable(oldName), qPrintable(name));
renameFile(p->index, name);
}
@ -1727,14 +1728,22 @@ void TorrentHandle::appendExtensionsToIncompleteFiles() @@ -1727,14 +1728,22 @@ void TorrentHandle::appendExtensionsToIncompleteFiles()
{
QVector<qreal> fp = filesProgress();
for (int i = 0; i < filesCount(); ++i) {
QString name = filePath(i);
if ((fileSize(i) > 0) && (fp[i] < 1)) {
const QString name = filePath(i);
if (!name.endsWith(QB_EXT)) {
const QString newName = name + QB_EXT;
qDebug("Renaming %s to %s", qPrintable(name), qPrintable(newName));
qDebug() << "Renaming" << name << "to" << newName;
renameFile(i, newName);
}
}
else {
if (name.endsWith(QB_EXT)) {
const QString oldName = name;
name.chop(QB_EXT.size());
qDebug() << "Renaming" << oldName << "to" << name;
renameFile(i, name);
}
}
}
}
@ -1744,7 +1753,7 @@ void TorrentHandle::removeExtensionsFromIncompleteFiles() @@ -1744,7 +1753,7 @@ void TorrentHandle::removeExtensionsFromIncompleteFiles()
QString name = filePath(i);
if (name.endsWith(QB_EXT)) {
const QString oldName = name;
name.chop(QString(QB_EXT).size());
name.chop(QB_EXT.size());
qDebug("Renaming %s to %s", qPrintable(oldName), qPrintable(name));
renameFile(i, name);
}
@ -1770,7 +1779,7 @@ void TorrentHandle::adjustActualSavePath_impl() @@ -1770,7 +1779,7 @@ void TorrentHandle::adjustActualSavePath_impl()
else {
// Moving all downloading torrents to temporary save path
path = m_session->tempPath();
qDebug("Moving torrent to its temp save path: %s", qPrintable(path));
qDebug() << "Moving torrent to its temp save path:" << path;
}
moveStorage(Utils::Fs::toNativePath(path));

2
src/base/bittorrent/torrenthandle.h

@ -54,6 +54,8 @@ class QBitArray; @@ -54,6 +54,8 @@ class QBitArray;
class QStringList;
template<typename T, typename U> struct QPair;
extern const QString QB_EXT;
namespace libtorrent
{
class alert;

3
src/gui/gui.pri

@ -28,7 +28,6 @@ HEADERS += \ @@ -28,7 +28,6 @@ HEADERS += \
$$PWD/downloadfromurldlg.h \
$$PWD/trackerlogin.h \
$$PWD/hidabletabwidget.h \
$$PWD/torrentimportdlg.h \
$$PWD/executionlog.h \
$$PWD/guiiconprovider.h \
$$PWD/updownratiodlg.h \
@ -65,7 +64,6 @@ SOURCES += \ @@ -65,7 +64,6 @@ SOURCES += \
$$PWD/torrentcontentmodelfile.cpp \
$$PWD/torrentcontentfiltermodel.cpp \
$$PWD/torrentcontenttreeview.cpp \
$$PWD/torrentimportdlg.cpp \
$$PWD/executionlog.cpp \
$$PWD/speedlimitdlg.cpp \
$$PWD/previewselect.cpp \
@ -108,7 +106,6 @@ FORMS += \ @@ -108,7 +106,6 @@ FORMS += \
$$PWD/updownratiodlg.ui \
$$PWD/confirmdeletiondlg.ui \
$$PWD/shutdownconfirmdlg.ui \
$$PWD/torrentimportdlg.ui \
$$PWD/executionlog.ui \
$$PWD/addnewtorrentdialog.ui \
$$PWD/autoexpandabledialog.ui \

7
src/gui/mainwindow.cpp

@ -72,7 +72,6 @@ @@ -72,7 +72,6 @@
#include "torrentcreatordlg.h"
#include "downloadfromurldlg.h"
#include "addnewtorrentdialog.h"
#include "torrentimportdlg.h"
#include "statsdialog.h"
#include "cookiesdialog.h"
#include "speedlimitdlg.h"
@ -163,7 +162,6 @@ MainWindow::MainWindow(QWidget *parent) @@ -163,7 +162,6 @@ MainWindow::MainWindow(QWidget *parent)
m_ui->actionPauseAll->setIcon(GuiIconProvider::instance()->getIcon("media-playback-pause"));
m_ui->actionStart->setIcon(GuiIconProvider::instance()->getIcon("media-playback-start"));
m_ui->actionStartAll->setIcon(GuiIconProvider::instance()->getIcon("media-playback-start"));
m_ui->actionImportTorrent->setIcon(GuiIconProvider::instance()->getIcon("document-import"));
m_ui->menuAutoShutdownOnDownloadsCompletion->setIcon(GuiIconProvider::instance()->getIcon("application-exit"));
m_ui->actionManageCookies->setIcon(GuiIconProvider::instance()->getIcon("preferences-web-browser-cookies"));
@ -1512,11 +1510,6 @@ void MainWindow::on_actionSearchWidget_triggered() @@ -1512,11 +1510,6 @@ void MainWindow::on_actionSearchWidget_triggered()
displaySearchTab(m_ui->actionSearchWidget->isChecked());
}
void MainWindow::on_actionImportTorrent_triggered()
{
TorrentImportDlg::importTorrent();
}
/*****************************************************
* *
* HTTP Downloader *

1
src/gui/mainwindow.h

@ -144,7 +144,6 @@ private slots: @@ -144,7 +144,6 @@ private slots:
void on_actionRSSReader_triggered();
void on_actionSpeedInTitleBar_triggered();
void on_actionTopToolBar_triggered();
void on_actionImportTorrent_triggered();
void on_actionDonateMoney_triggered();
void on_actionExecutionLogs_triggered(bool checked);
void on_actionNormalMessages_triggered(bool checked);

11
src/gui/mainwindow.ui

@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
<x>0</x>
<y>0</y>
<width>914</width>
<height>23</height>
<height>21</height>
</rect>
</property>
<widget class="QMenu" name="menuEdit">
@ -88,7 +88,6 @@ @@ -88,7 +88,6 @@
</property>
<addaction name="actionOpen"/>
<addaction name="actionDownloadFromURL"/>
<addaction name="actionImportTorrent"/>
<addaction name="separator"/>
<addaction name="actionExit"/>
</widget>
@ -327,14 +326,6 @@ @@ -327,14 +326,6 @@
<string notr="true">Ctrl+L</string>
</property>
</action>
<action name="actionImportTorrent">
<property name="text">
<string>&amp;Import Existing Torrent...</string>
</property>
<property name="toolTip">
<string>Import Torrent...</string>
</property>
</action>
<action name="actionDonateMoney">
<property name="text">
<string>Do&amp;nate!</string>

270
src/gui/torrentimportdlg.cpp

@ -1,270 +0,0 @@ @@ -1,270 +0,0 @@
/*
* Bittorrent Client using Qt4 and libtorrent.
* Copyright (C) 2010 Christophe Dumez
*
* 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.
*
* Contact : chris@qbittorrent.org
*/
#include <QFileDialog>
#include <QMessageBox>
#include <QDebug>
#include "torrentimportdlg.h"
#include "ui_torrentimportdlg.h"
#include "base/preferences.h"
#include "base/bittorrent/infohash.h"
#include "base/bittorrent/session.h"
#include "guiiconprovider.h"
#include "base/utils/fs.h"
TorrentImportDlg::TorrentImportDlg(QWidget *parent):
QDialog(parent),
ui(new Ui::TorrentImportDlg)
{
ui->setupUi(this);
// Icons
ui->lbl_info->setPixmap(GuiIconProvider::instance()->getIcon("dialog-information").pixmap(ui->lbl_info->height()));
ui->lbl_info->setFixedWidth(ui->lbl_info->height());
ui->importBtn->setIcon(GuiIconProvider::instance()->getIcon("document-import"));
// Libtorrent < 0.15 does not support skipping file checking
loadSettings();
}
TorrentImportDlg::~TorrentImportDlg()
{
delete ui;
}
void TorrentImportDlg::on_browseTorrentBtn_clicked()
{
const QString default_dir = Preferences::instance()->getMainLastDir();
// Ask for a torrent file
m_torrentPath = QFileDialog::getOpenFileName(this, tr("Torrent file to import"), default_dir, tr("Torrent files") + QString(" (*.torrent)"));
if (!m_torrentPath.isEmpty())
loadTorrent(m_torrentPath);
else
ui->lineTorrent->clear();
}
void TorrentImportDlg::on_browseContentBtn_clicked()
{
const QString default_dir = Preferences::instance()->getTorImportLastContentDir();
bool multifile = (m_torrentInfo.filesCount() > 1);
QString filePath = Utils::Fs::fromNativePath(m_torrentInfo.filePath(0));
if (!multifile && (filePath.indexOf('/') != -1))
multifile = true;
if (!multifile) {
// Single file torrent
const QString file_name = Utils::Fs::fileName(filePath);
qDebug("Torrent has only one file: %s", qPrintable(file_name));
QString extension = Utils::Fs::fileExtension(file_name);
qDebug("File extension is : %s", qPrintable(extension));
QString filter;
if (!extension.isEmpty()) {
extension = extension.toUpper();
filter = tr("'%1' Files", "%1 is a file extension (e.g. PDF)").arg(extension) + " (*." + extension + ")";
}
m_contentPath = QFileDialog::getOpenFileName(this, tr("Please provide the location of '%1'", "%1 is a file name").arg(file_name), default_dir, filter);
if (m_contentPath.isEmpty() || !QFile(m_contentPath).exists()) {
m_contentPath = QString::null;
ui->importBtn->setEnabled(false);
ui->checkSkipCheck->setEnabled(false);
return;
}
// Update display
ui->lineContent->setText(Utils::Fs::toNativePath(m_contentPath));
// Check file size
const qint64 file_size = QFile(m_contentPath).size();
if (m_torrentInfo.fileSize(0) == file_size) {
qDebug("The file size matches, allowing fast seeding...");
ui->checkSkipCheck->setEnabled(true);
}
else {
qDebug("The file size does not match, forbidding fast seeding...");
ui->checkSkipCheck->setChecked(false);
ui->checkSkipCheck->setEnabled(false);
}
// Handle file renaming
QStringList parts = m_contentPath.split("/");
QString new_file_name = parts.takeLast();
if (new_file_name != file_name) {
qDebug("The file has been renamed");
QStringList new_parts = m_filesPath.first().split("/");
new_parts.replace(new_parts.count() - 1, new_file_name);
m_filesPath.replace(0, new_parts.join("/"));
}
m_contentPath = parts.join("/");
}
else {
// multiple files torrent
m_contentPath = QFileDialog::getExistingDirectory(this, tr("Please point to the location of the torrent: %1").arg(m_torrentInfo.name()),
default_dir);
if (m_contentPath.isEmpty() || !QDir(m_contentPath).exists()) {
m_contentPath = QString::null;
ui->importBtn->setEnabled(false);
ui->checkSkipCheck->setEnabled(false);
return;
}
// Update the display
ui->lineContent->setText(Utils::Fs::toNativePath(m_contentPath));
bool size_mismatch = false;
QDir content_dir(m_contentPath);
content_dir.cdUp();
// Check file sizes
for (int i = 0; i < m_torrentInfo.filesCount(); ++i) {
const QString rel_path = m_torrentInfo.filePath(i);
if (QFile(Utils::Fs::expandPath(content_dir.absoluteFilePath(rel_path))).size() != m_torrentInfo.fileSize(i)) {
qDebug("%s is %lld",
qPrintable(Utils::Fs::expandPath(content_dir.absoluteFilePath(rel_path))), (long long int) QFile(Utils::Fs::expandPath(content_dir.absoluteFilePath(rel_path))).size());
qDebug("%s is %lld",
qPrintable(rel_path), (long long int)m_torrentInfo.fileSize(i));
size_mismatch = true;
break;
}
}
if (size_mismatch) {
qDebug("The file size does not match, forbidding fast seeding...");
ui->checkSkipCheck->setChecked(false);
ui->checkSkipCheck->setEnabled(false);
}
else {
qDebug("The file size matches, allowing fast seeding...");
ui->checkSkipCheck->setEnabled(true);
}
}
// Enable the import button
ui->importBtn->setEnabled(true);
}
void TorrentImportDlg::on_importBtn_clicked()
{
saveSettings();
// Has to be accept() and not close()
// or the torrent won't be imported
accept();
}
QString TorrentImportDlg::getTorrentPath() const
{
return m_torrentPath;
}
QString TorrentImportDlg::getContentPath() const
{
return m_contentPath;
}
void TorrentImportDlg::importTorrent()
{
qDebug() << Q_FUNC_INFO << "ENTER";
TorrentImportDlg dlg;
if (dlg.exec()) {
BitTorrent::AddTorrentParams params;
qDebug() << "Loading the torrent file...";
BitTorrent::TorrentInfo torrentInfo = dlg.torrent();
if (!torrentInfo.isValid()) return;
QString torrentPath = dlg.getTorrentPath();
QString contentPath = dlg.getContentPath();
if (torrentPath.isEmpty() || contentPath.isEmpty() || !QFile(torrentPath).exists()) {
qWarning() << "Incorrect input, aborting." << torrentPath << contentPath;
return;
}
const QString hash = torrentInfo.hash();
qDebug() << "Torrent hash is" << hash;
params.savePath = contentPath;
params.skipChecking = dlg.skipFileChecking();
params.disableTempPath = true;
qDebug("Adding the torrent to the session...");
BitTorrent::Session::instance()->addTorrent(torrentInfo, params);
// Remember the last opened folder
Preferences* const pref = Preferences::instance();
pref->setMainLastDir(Utils::Fs::fromNativePath(torrentPath));
pref->setTorImportLastContentDir(Utils::Fs::fromNativePath(contentPath));
return;
}
qDebug() << Q_FUNC_INFO << "EXIT";
return;
}
void TorrentImportDlg::loadTorrent(const QString &torrentPath)
{
// Load the torrent file
m_torrentInfo = BitTorrent::TorrentInfo::loadFromFile(torrentPath);
if (!m_torrentInfo.isValid()) {
ui->browseContentBtn->setEnabled(false);
ui->lineTorrent->clear();
QMessageBox::warning(this, tr("Invalid torrent file"), tr("This is not a valid torrent file."));
}
else {
// Update display
ui->lineTorrent->setText(Utils::Fs::toNativePath(torrentPath));
ui->browseContentBtn->setEnabled(true);
// Load the file names
initializeFilesPath();
}
}
void TorrentImportDlg::initializeFilesPath()
{
// Loads files path in the torrent
m_filesPath = m_torrentInfo.filePaths();
}
bool TorrentImportDlg::fileRenamed() const
{
return m_fileRenamed;
}
BitTorrent::TorrentInfo TorrentImportDlg::torrent() const
{
return m_torrentInfo;
}
bool TorrentImportDlg::skipFileChecking() const
{
return ui->checkSkipCheck->isChecked();
}
void TorrentImportDlg::loadSettings()
{
restoreGeometry(Preferences::instance()->getTorImportGeometry());
}
void TorrentImportDlg::saveSettings()
{
Preferences::instance()->setTorImportGeometry(saveGeometry());
}
void TorrentImportDlg::closeEvent(QCloseEvent *event)
{
qDebug() << Q_FUNC_INFO;
saveSettings();
QDialog::closeEvent(event);
}

86
src/gui/torrentimportdlg.h

@ -1,86 +0,0 @@ @@ -1,86 +0,0 @@
/*
* Bittorrent Client using Qt4 and libtorrent.
* Copyright (C) 2010 Christophe Dumez
*
* 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.
*
* Contact : chris@qbittorrent.org
*/
#ifndef TORRENTIMPORTDLG_H
#define TORRENTIMPORTDLG_H
#include <QDialog>
#include <QStringList>
#include "base/bittorrent/torrentinfo.h"
namespace Ui
{
class TorrentImportDlg;
}
class TorrentImportDlg: public QDialog
{
Q_OBJECT
public:
explicit TorrentImportDlg(QWidget *parent = 0);
~TorrentImportDlg();
static void importTorrent();
QString getTorrentPath() const;
QString getContentPath() const;
bool fileRenamed() const;
BitTorrent::TorrentInfo torrent() const;
bool skipFileChecking() const;
protected slots:
void loadTorrent(const QString &torrentPath);
void initializeFilesPath();
private slots:
void on_browseTorrentBtn_clicked();
void on_browseContentBtn_clicked();
void on_importBtn_clicked();
protected:
void closeEvent(QCloseEvent *event);
private:
void loadSettings();
void saveSettings();
private:
Ui::TorrentImportDlg *ui;
BitTorrent::TorrentInfo m_torrentInfo;
// NOTE: Where do we use it?
QStringList m_filesPath;
QString m_contentPath;
QString m_torrentPath;
bool m_fileRenamed;
};
#endif // TORRENTIMPORTDLG_H

139
src/gui/torrentimportdlg.ui

@ -1,139 +0,0 @@ @@ -1,139 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>TorrentImportDlg</class>
<widget class="QDialog" name="TorrentImportDlg">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>464</width>
<height>236</height>
</rect>
</property>
<property name="windowTitle">
<string>Torrent Import</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="lbl_info">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>32</horstretch>
<verstretch>32</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>38</width>
<height>38</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>38</width>
<height>38</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_4">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>This assistant will help you share with qBittorrent a torrent that you have already downloaded.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Torrent file to import:</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLineEdit" name="lineTorrent">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="browseTorrentBtn">
<property name="text">
<string notr="true">...</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Content location:</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLineEdit" name="lineContent">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="browseContentBtn">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>...</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="checkSkipCheck">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Skip the data checking stage and start seeding immediately</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="importBtn">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Import</string>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>
Loading…
Cancel
Save