mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-27 19:57:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

Improvement to last commit

Browse source
This commit is contained in:
Christophe Dumez 2010-07-24 19:34:51 +00:00
parent 5c891724c4
commit 4d977a8d46
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/misc.cpp
View file

@ -273,7 +273,7 @@ void misc::copyDir(QString src_path, QString dst_path) {
// Copy the file from src to dest // Copy the file from src to dest
QFile::copy(src_child_path, dest_child_path); QFile::copy(src_child_path, dest_child_path);
// Remove source file // Remove source file
QFile::remove(src_child_path); safeRemove(src_child_path);
} }
// Remove source folder // Remove source folder
const QString dir_name = sourceDir.dirName(); const QString dir_name = sourceDir.dirName();
@ -312,26 +312,26 @@ QString misc::updateLabelInSavePath(const QString& defaultSavePath, QString save
} }
void misc::moveToXDGFolders() { void misc::moveToXDGFolders() {
const QString old_qBtPath = QDir::homePath()+QDir::separator()+QString::fromUtf8(".qbittorrent") + QDir::separator(); QDir old_qBtPath(QDir::homePath().replace("\\","/")+"/"+".qbittorrent");
if(QDir(old_qBtPath).exists()) { if(old_qBtPath.exists()) {
// Copy BT_backup folder // Copy BT_backup folder
const QString old_BTBackupPath = old_qBtPath + "BT_backup"; const QString old_BTBackupPath = old_qBtPath.absoluteFilePath("BT_backup");
if(QDir(old_BTBackupPath).exists()) { if(QDir(old_BTBackupPath).exists()) {
copyDir(old_BTBackupPath, BTBackupLocation()); copyDir(old_BTBackupPath, BTBackupLocation());
} }
// Copy search engine folder // Copy search engine folder
const QString old_searchPath = old_qBtPath + "search_engine"; const QString old_searchPath = old_qBtPath.absoluteFilePath("search_engine");
if(QDir(old_searchPath).exists()) { if(QDir(old_searchPath).exists()) {
copyDir(old_searchPath, searchEngineLocation()); copyDir(old_searchPath, searchEngineLocation());
} }
// Copy *_state files // Copy *_state files
if(QFile::exists(old_qBtPath+"dht_state")) { if(QFile::exists(old_qBtPath.absoluteFilePath("dht_state"))) {
QFile::copy(old_qBtPath+"dht_state", cacheLocation()+QDir::separator()+"dht_state"); QFile::copy(old_qBtPath.absoluteFilePath("dht_state"), QDir(cacheLocation()).absoluteFilePath("dht_state"));
QFile::remove(old_qBtPath+"dht_state"); safeRemove(old_qBtPath.absoluteFilePath("dht_state"));
} }
if(QFile::exists(old_qBtPath+"ses_state")) { if(QFile::exists(old_qBtPath.absoluteFilePath("ses_state"))) {
QFile::copy(old_qBtPath+"ses_state", cacheLocation()+QDir::separator()+"ses_state"); QFile::copy(old_qBtPath.absoluteFilePath("ses_state"), QDir(cacheLocation()).absoluteFilePath("ses_state"));
QFile::remove(old_qBtPath+"ses_state"); safeRemove(old_qBtPath.absoluteFilePath("ses_state"));
} }
// Remove .qbittorrent folder if empty // Remove .qbittorrent folder if empty
QDir::home().rmdir(".qbittorrent"); QDir::home().rmdir(".qbittorrent");