mirror of
https://github.com/qbittorrent/qBittorrent
synced 2025-08-14 02:27:09 -07:00
Improve folder removal behavior
This commit is contained in:
parent
feeecbf395
commit
15d3b07f34
3 changed files with 21 additions and 10 deletions
|
@ -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…
Add table
Add a link
Reference in a new issue