Follow project coding style. Issue #2192.

This commit is contained in:
sledgehammer999
2014-11-25 23:10:32 +02:00
parent 060d3fc5b9
commit cbbf14b0f8
4 changed files with 664 additions and 657 deletions

View File

@@ -42,175 +42,177 @@
using namespace libtorrent;
TorrentImportDlg::TorrentImportDlg(QWidget *parent) :
QDialog(parent),
ui(new Ui::TorrentImportDlg)
TorrentImportDlg::TorrentImportDlg(QWidget *parent):
QDialog(parent),
ui(new Ui::TorrentImportDlg)
{
ui->setupUi(this);
// Icons
ui->lbl_info->setPixmap(IconProvider::instance()->getIcon("dialog-information").pixmap(ui->lbl_info->height()));
ui->lbl_info->setFixedWidth(ui->lbl_info->height());
ui->importBtn->setIcon(IconProvider::instance()->getIcon("document-import"));
// Libtorrent < 0.15 does not support skipping file checking
loadSettings();
ui->setupUi(this);
// Icons
ui->lbl_info->setPixmap(IconProvider::instance()->getIcon("dialog-information").pixmap(ui->lbl_info->height()));
ui->lbl_info->setFixedWidth(ui->lbl_info->height());
ui->importBtn->setIcon(IconProvider::instance()->getIcon("document-import"));
// Libtorrent < 0.15 does not support skipping file checking
loadSettings();
}
TorrentImportDlg::~TorrentImportDlg()
{
delete ui;
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();
}
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();
// Test for multi-file taken from libtorrent/create_torrent.hpp -> create_torrent::create_torrent
bool multifile = t->num_files() > 1;
const QString default_dir = Preferences::instance()->getTorImportLastContentDir();
// Test for multi-file taken from libtorrent/create_torrent.hpp -> create_torrent::create_torrent
bool multifile = t->num_files() > 1;
#if LIBTORRENT_VERSION_NUM >= 1600
if (!multifile && has_parent_path(t->files().file_path(*(t->files().begin()))))
multifile = true;
if (!multifile && has_parent_path(t->files().file_path(*(t->files().begin()))))
multifile = true;
#else
if (!multifile && t->file_at(0).path.has_parent_path())
multifile = true;
if (!multifile && t->file_at(0).path.has_parent_path())
multifile = true;
#endif
if (!multifile) {
// Single file torrent
const QString file_name = fsutils::fileName(misc::toQStringU(t->file_at(0).path));
qDebug("Torrent has only one file: %s", qPrintable(file_name));
QString extension = fsutils::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+")";
if (!multifile) {
// Single file torrent
const QString file_name = fsutils::fileName(misc::toQStringU(t->file_at(0).path));
qDebug("Torrent has only one file: %s", qPrintable(file_name));
QString extension = fsutils::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(fsutils::toNativePath(m_contentPath));
// Check file size
const qint64 file_size = QFile(m_contentPath).size();
if (t->file_at(0).size == 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("/");
}
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;
else {
// multiple files torrent
m_contentPath = QFileDialog::getExistingDirectory(this, tr("Please point to the location of the torrent: %1").arg(misc::toQStringU(t->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(fsutils::toNativePath(m_contentPath));
bool size_mismatch = false;
QDir content_dir(m_contentPath);
content_dir.cdUp();
// Check file sizes
for (int i = 0; i<t->num_files(); ++i) {
const QString rel_path = misc::toQStringU(t->file_at(i).path);
if (QFile(fsutils::expandPath(content_dir.absoluteFilePath(rel_path))).size() != t->file_at(i).size) {
qDebug("%s is %lld",
qPrintable(fsutils::expandPath(content_dir.absoluteFilePath(rel_path))), (long long int) QFile(fsutils::expandPath(content_dir.absoluteFilePath(rel_path))).size());
qDebug("%s is %lld",
qPrintable(rel_path), (long long int)t->file_at(i).size);
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);
}
}
// Update display
ui->lineContent->setText(fsutils::toNativePath(m_contentPath));
// Check file size
const qint64 file_size = QFile(m_contentPath).size();
if (t->file_at(0).size == 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(misc::toQStringU(t->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(fsutils::toNativePath(m_contentPath));
bool size_mismatch = false;
QDir content_dir(m_contentPath);
content_dir.cdUp();
// Check file sizes
for (int i=0; i<t->num_files(); ++i) {
const QString rel_path = misc::toQStringU(t->file_at(i).path);
if (QFile(fsutils::expandPath(content_dir.absoluteFilePath(rel_path))).size() != t->file_at(i).size) {
qDebug("%s is %lld",
qPrintable(fsutils::expandPath(content_dir.absoluteFilePath(rel_path))), (long long int) QFile(fsutils::expandPath(content_dir.absoluteFilePath(rel_path))).size());
qDebug("%s is %lld",
qPrintable(rel_path), (long long int)t->file_at(i).size);
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);
// 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();
saveSettings();
// Has to be accept() and not close()
// or the torrent won't be imported
accept();
}
QString TorrentImportDlg::getTorrentPath() const
{
return m_torrentPath;
return m_torrentPath;
}
QString TorrentImportDlg::getContentPath() const
{
return m_contentPath;
return m_contentPath;
}
void TorrentImportDlg::importTorrent()
{
qDebug() << Q_FUNC_INFO << "ENTER";
TorrentImportDlg dlg;
if (dlg.exec()) {
qDebug() << "Loading the torrent file...";
boost::intrusive_ptr<libtorrent::torrent_info> t = dlg.torrent();
if (!t->is_valid())
return;
QString torrent_path = dlg.getTorrentPath();
QString content_path = dlg.getContentPath();
if (torrent_path.isEmpty() || content_path.isEmpty() || !QFile(torrent_path).exists()) {
qWarning() << "Incorrect input, aborting." << torrent_path << content_path;
return;
qDebug() << Q_FUNC_INFO << "ENTER";
TorrentImportDlg dlg;
if (dlg.exec()) {
qDebug() << "Loading the torrent file...";
boost::intrusive_ptr<libtorrent::torrent_info> t = dlg.torrent();
if (!t->is_valid())
return;
QString torrent_path = dlg.getTorrentPath();
QString content_path = dlg.getContentPath();
if (torrent_path.isEmpty() || content_path.isEmpty() || !QFile(torrent_path).exists()) {
qWarning() << "Incorrect input, aborting." << torrent_path << content_path;
return;
}
const QString hash = misc::toQString(t->info_hash());
qDebug() << "Torrent hash is" << hash;
TorrentTempData::setSavePath(hash, content_path);
TorrentTempData::setSeedingMode(hash, dlg.skipFileChecking());
qDebug("Adding the torrent to the session...");
QBtSession::instance()->addTorrent(torrent_path, false, QString(), false, true);
// Remember the last opened folder
Preferences* const pref = Preferences::instance();
pref->setMainLastDir(fsutils::fromNativePath(torrent_path));
pref->setTorImportLastContentDir(fsutils::fromNativePath(content_path));
return;
}
const QString hash = misc::toQString(t->info_hash());
qDebug() << "Torrent hash is" << hash;
TorrentTempData::setSavePath(hash, content_path);
TorrentTempData::setSeedingMode(hash, dlg.skipFileChecking());
qDebug("Adding the torrent to the session...");
QBtSession::instance()->addTorrent(torrent_path, false, QString(), false, true);
// Remember the last opened folder
Preferences* const pref = Preferences::instance();
pref->setMainLastDir(fsutils::fromNativePath(torrent_path));
pref->setTorImportLastContentDir(fsutils::fromNativePath(content_path));
qDebug() << Q_FUNC_INFO << "EXIT";
return;
}
qDebug() << Q_FUNC_INFO << "EXIT";
return;
}
void TorrentImportDlg::loadTorrent(const QString &torrent_path)
@@ -240,42 +242,41 @@ void TorrentImportDlg::loadTorrent(const QString &torrent_path)
void TorrentImportDlg::initializeFilesPath()
{
m_filesPath.clear();
// Loads files path in the torrent
for (int i=0; i<t->num_files(); ++i) {
m_filesPath << fsutils::fromNativePath(misc::toQStringU(t->file_at(i).path));
}
m_filesPath.clear();
// Loads files path in the torrent
for (int i = 0; i<t->num_files(); ++i)
m_filesPath << fsutils::fromNativePath(misc::toQStringU(t->file_at(i).path));
}
bool TorrentImportDlg::fileRenamed() const
{
return m_fileRenamed;
return m_fileRenamed;
}
boost::intrusive_ptr<libtorrent::torrent_info> TorrentImportDlg::torrent() const
{
return t;
return t;
}
bool TorrentImportDlg::skipFileChecking() const
{
return ui->checkSkipCheck->isChecked();
return ui->checkSkipCheck->isChecked();
}
void TorrentImportDlg::loadSettings()
{
restoreGeometry(Preferences::instance()->getTorImportGeometry());
restoreGeometry(Preferences::instance()->getTorImportGeometry());
}
void TorrentImportDlg::saveSettings()
{
Preferences::instance()->setTorImportGeometry(saveGeometry());
Preferences::instance()->setTorImportGeometry(saveGeometry());
}
void TorrentImportDlg::closeEvent(QCloseEvent *event)
{
qDebug() << Q_FUNC_INFO;
saveSettings();
QDialog::closeEvent(event);
qDebug() << Q_FUNC_INFO;
saveSettings();
QDialog::closeEvent(event);
}