From af1dfd41abcfb33eeb78eceb86a852e1a43cb7d5 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Tue, 22 Feb 2011 18:02:15 +0000 Subject: [PATCH] Disable OS cache for aligned files to reduce memory consumption Code cleanup --- src/qtlibtorrent/qbtsession.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/qtlibtorrent/qbtsession.cpp b/src/qtlibtorrent/qbtsession.cpp index 3b1cc40b8..68e28ea88 100644 --- a/src/qtlibtorrent/qbtsession.cpp +++ b/src/qtlibtorrent/qbtsession.cpp @@ -388,6 +388,9 @@ void QBtSession::configureSession() { #endif sessionSettings.cache_size = pref.diskCacheSize()*64; qDebug() << "Using a disk cache size of" << pref.diskCacheSize() << "MiB"; + // Disable OS cache to avoid memory problems (uTorrent behavior) + sessionSettings.disk_io_write_mode = session_settings::disable_os_cache_for_aligned_files; + sessionSettings.disk_io_read_mode = session_settings::disable_os_cache_for_aligned_files; // Queueing System if(pref.isQueueingSystemEnabled()) { sessionSettings.active_downloads = pref.getMaxActiveDownloads(); @@ -2422,11 +2425,6 @@ QString QBtSession::getSavePath(QString hash, bool fromScanDir, QString filePath savePath = defaultSavePath; append_root_folder = true; } - } else { - QIniSettings settings("qBittorrent", "qBittorrent"); - if(!settings.value("ported_to_new_savepath_system", false).toBool()) { - append_root_folder = true; - } } if(!fromScanDir && appendLabelToSavePath) { const QString label = TorrentPersistentData::getLabel(hash); @@ -2437,9 +2435,7 @@ QString QBtSession::getSavePath(QString hash, bool fromScanDir, QString filePath } if(append_root_folder && !root_folder.isEmpty()) { // Append torrent root folder to the save path - if(!savePath.endsWith(QDir::separator())) - savePath += QDir::separator(); - savePath += root_folder; + savePath = QDir(savePath).absoluteFilePath(root_folder); qDebug("Torrent root folder is %s", qPrintable(root_folder)); TorrentPersistentData::saveSavePath(hash, savePath); }