Browse Source

Improve folder removal behavior

adaptive-webui-19844
Christophe Dumez 14 years ago
parent
commit
15d3b07f34
  1. 10
      src/misc.cpp
  2. 2
      src/misc.h
  3. 19
      src/qtlibtorrent/qbtsession.cpp

10
src/misc.cpp

@ -799,3 +799,13 @@ QString misc::fileName(QString file_path) @@ -799,3 +799,13 @@ QString misc::fileName(QString file_path)
return file_path;
return file_path.mid(slash_index+1);
}
bool misc::removeEmptyFolder(const QString &dirpath)
{
QDir savedir(dirpath);
const QString dirname = savedir.dirName();
if(savedir.exists() && savedir.cdUp()) {
return savedir.rmdir(dirname);
}
return false;
}

2
src/misc.h

@ -123,6 +123,8 @@ public: @@ -123,6 +123,8 @@ public:
return MyFile.remove();
}
static bool removeEmptyFolder(const QString &dirpath);
static quint64 computePathSize(QString path);
static QString truncateRootFolder(boost::intrusive_ptr<libtorrent::torrent_info> t);

19
src/qtlibtorrent/qbtsession.cpp

@ -2176,22 +2176,21 @@ void QBtSession::readAlerts() { @@ -2176,22 +2176,21 @@ void QBtSession::readAlerts() {
#endif
if(!hash.isEmpty()) {
if(savePathsToRemove.contains(hash)) {
QDir().rmpath(savePathsToRemove.take(hash));
const QString dirpath = savePathsToRemove.take(hash);
qDebug() << "Removing save path: " << dirpath << "...";
bool ok = misc::removeEmptyFolder(dirpath);
Q_UNUSED(ok);
qDebug() << "Folder was removed: " << ok;
}
} else {
// XXX: Fallback
QStringList hashes_deleted;
// Fallback
qDebug() << "hash is empty, use fallback to remove save path";
foreach(const QString& key, savePathsToRemove.keys()) {
// Attempt to delete
QDir().rmpath(savePathsToRemove[key]);
if(!QDir(savePathsToRemove[key]).exists()) {
hashes_deleted << key;
if(misc::removeEmptyFolder(savePathsToRemove[key])) {
savePathsToRemove.remove(key);
}
}
// Clean up
foreach(const QString& key, hashes_deleted) {
savePathsToRemove.remove(key);
}
}
}
else if (storage_moved_alert* p = dynamic_cast<storage_moved_alert*>(a.get())) {

Loading…
Cancel
Save