Browse Source

- BUGFIX: Fixed deletion of subfolders when deleting torrents from hard drive

adaptive-webui-19844
Christophe Dumez 17 years ago
parent
commit
a5f6663e65
  1. 1
      TODO
  2. 21
      src/bittorrent.cpp
  3. 2
      src/bittorrent.h

1
TODO

@ -62,4 +62,5 @@ rc5->rc6 changelog: @@ -62,4 +62,5 @@ rc5->rc6 changelog:
- BUGFIX: configure doesn't require paths with a terminal "/" anymore
- BUGFIX: Fixed minimize to tray feature
- BUGFIX: Fixed folders progress calculation in torrent properties
- BUGFIX: Fixed deletion of subfolders when deleting torrents from hard drive
- I18N: Fixed swedish, French, Spanish translations

21
src/bittorrent.cpp

@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
#include "bittorrent.h"
#include "misc.h"
#include "downloadThread.h"
#include "deleteThread.h"
#include <libtorrent/extensions/metadata_transfer.hpp>
#include <libtorrent/extensions/ut_pex.hpp>
@ -61,6 +62,8 @@ bittorrent::bittorrent() : timerScan(0), DHTEnabled(false), preAllocateAll(false @@ -61,6 +62,8 @@ bittorrent::bittorrent() : timerScan(0), DHTEnabled(false), preAllocateAll(false
downloader = new downloadThread(this);
connect(downloader, SIGNAL(downloadFinished(QString, QString)), this, SLOT(processDownloadedFile(QString, QString)));
connect(downloader, SIGNAL(downloadFailure(QString, QString)), this, SLOT(handleDownloadFailure(QString, QString)));
// File deleter (thread)
deleter = new deleteThread(this);
qDebug("* BTSession constructed");
}
@ -69,6 +72,7 @@ bittorrent::~bittorrent() { @@ -69,6 +72,7 @@ bittorrent::~bittorrent() {
// Disable directory scanning
disableDirectoryScanning();
// Delete our objects
delete deleter;
delete timerAlerts;
delete ETARefresher;
delete downloader;
@ -206,13 +210,12 @@ void bittorrent::deleteTorrent(QString hash, bool permanent) { @@ -206,13 +210,12 @@ void bittorrent::deleteTorrent(QString hash, bool permanent) {
}
QString savePath = h.save_path();
QString fileName = h.name();
// Remove it from session
if(permanent) {
qDebug("Removing this on hard drive: %s", qPrintable(savePath+QDir::separator()+fileName));
s->remove_torrent(h.get_torrent_handle(), session::delete_files);
} else {
s->remove_torrent(h.get_torrent_handle());
arborescence *files_arb = 0;
if(permanent){
files_arb = new arborescence(h.get_torrent_info());
}
// Remove it from session
s->remove_torrent(h.get_torrent_handle());
// Remove it from torrent backup directory
QDir torrentBackup(misc::qBittorrentPath() + "BT_backup");
QStringList filters;
@ -244,6 +247,12 @@ void bittorrent::deleteTorrent(QString hash, bool permanent) { @@ -244,6 +247,12 @@ void bittorrent::deleteTorrent(QString hash, bool permanent) {
std::cerr << "Error: Torrent " << hash.toStdString() << " is neither in finished or unfinished list\n";
}
}
if(permanent && files_arb != 0) {
// Remove from Hard drive
qDebug("Removing this on hard drive: %s", qPrintable(savePath+QDir::separator()+fileName));
// Deleting in a thread to avoid GUI freeze
deleter->deleteTorrent(savePath, files_arb);
}
}
// Return a list of hashes for the finished torrents

2
src/bittorrent.h

@ -33,6 +33,7 @@ @@ -33,6 +33,7 @@
using namespace libtorrent;
class downloadThread;
class deleteThread;
class QTimer;
class bittorrent : public QObject{
@ -53,6 +54,7 @@ class bittorrent : public QObject{ @@ -53,6 +54,7 @@ class bittorrent : public QObject{
QHash<QString, QPair<size_type,size_type> > ratioData;
QTimer *ETARefresher;
QHash<QString, QList<QPair<QString, QString> > > trackersErrors;
deleteThread *deleter;
QStringList waitingForPause;
QStringList finishedTorrents;
QStringList unfinishedTorrents;

Loading…
Cancel
Save