mirror of
https://github.com/qbittorrent/qBittorrent
synced 2025-07-15 01:33:07 -07:00
BUGFIX: Fixed deletion from hard drive (failed for non-empty folders)
This commit is contained in:
parent
e8e1c7f91f
commit
9f075f5087
4 changed files with 32 additions and 4 deletions
|
@ -1092,9 +1092,9 @@ void GUI::deletePermanently(){
|
|||
torrentBackup.remove(fileName+".savepath");
|
||||
// Remove from Hard drive TODO
|
||||
qDebug("Removing this on hard drive: %s", qPrintable(savePath+QDir::separator()+fileName));
|
||||
QDir downloadedDir(savePath+QDir::separator()+fileName);
|
||||
downloadedDir.rmpath(savePath+QDir::separator()+fileName);
|
||||
QFile::remove(savePath+QDir::separator()+fileName);
|
||||
if(!misc::removePath(savePath+QDir::separator()+fileName)){
|
||||
qDebug("Couldn't remove the download on the hard drive");
|
||||
}
|
||||
// Update info bar
|
||||
setInfoBar("'" + fileName +"' "+tr("removed.", "<file> removed."));
|
||||
--nbTorrents;
|
||||
|
@ -1261,6 +1261,7 @@ void GUI::addTorrent(const QString& path, bool fromScanDir, const QString& from_
|
|||
h = s->add_torrent(t, fs::path((const char*)savePath.toUtf8()), resume_data, true);
|
||||
qDebug("Compact allocation mode");
|
||||
}
|
||||
// Is this really useful and appropriate ?
|
||||
//h.set_max_connections(60);
|
||||
h.set_max_uploads(-1);
|
||||
// Load filtered files
|
||||
|
|
27
src/misc.h
27
src/misc.h
|
@ -101,6 +101,33 @@ class misc : public QObject{
|
|||
return qBtPath;
|
||||
}
|
||||
|
||||
static bool removePath(QString path){
|
||||
if(!QFile::remove(path)){
|
||||
// Probably a folder
|
||||
QDir current_dir(path);
|
||||
if(current_dir.exists()){
|
||||
//Remove sub items
|
||||
QStringList subItems = current_dir.entryList();
|
||||
QString item;
|
||||
foreach(item, subItems){
|
||||
if(item != "." && item != ".."){
|
||||
qDebug("-> Removing "+(path+QDir::separator()+item).toUtf8());
|
||||
removePath(path+QDir::separator()+item);
|
||||
}
|
||||
}
|
||||
// Remove empty folder
|
||||
if(current_dir.rmpath(path)){
|
||||
return true;
|
||||
}else{
|
||||
return false;
|
||||
}
|
||||
}else{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
// Function called by curl to write the data to the file
|
||||
static int my_fwrite(void *buffer, size_t size, size_t nmemb, void *stream){
|
||||
return fwrite(buffer, size, nmemb, (FILE*)stream);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue