d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-11 07:18:08 +00:00
Code Issues Projects Releases Wiki Activity

Fix scan directories saving (closes #694768)

Browse Source
This commit is contained in:
Christophe Dumez 2010-12-27 19:26:21 +00:00
parent f772e28bf9
commit be32669baf
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/preferences/options_imp.cpp
View File

@ -351,7 +351,7 @@ void options_imp::saveOptions(){
pref.preAllocateAllFiles(preAllocateAllFiles()); pref.preAllocateAllFiles(preAllocateAllFiles());
pref.useAdditionDialog(useAdditionDialog()); pref.useAdditionDialog(useAdditionDialog());
pref.addTorrentsInPause(addTorrentsInPause()); pref.addTorrentsInPause(addTorrentsInPause());
ScanFoldersModel::instance()->makePersistent(pref); ScanFoldersModel::instance()->makePersistent();
addedScanDirs.clear(); addedScanDirs.clear();
QString export_dir = getExportDir(); QString export_dir = getExportDir();
#if defined(Q_WS_WIN) || defined(Q_OS_OS2) #if defined(Q_WS_WIN) || defined(Q_OS_OS2)

3
src/qtlibtorrent/qbtsession.cpp
View File

@ -280,7 +280,8 @@ void QBtSession::configureSession() {
} }
int i = 0; int i = 0;
foreach (const QString &dir, scan_dirs) { foreach (const QString &dir, scan_dirs) {
m_scanFolders->addPath(dir, downloadInDirList.at(i)); qDebug() << "Adding scan dir" << dir << downloadInDirList.at(i);
ScanFoldersModel::PathStatus ret = m_scanFolders->addPath(dir, downloadInDirList.at(i));
++i; ++i;
} }
// * Export Dir // * Export Dir

9
src/scannedfoldersmodel.cpp
View File

@ -29,7 +29,7 @@
*/ */
#include "scannedfoldersmodel.h" #include "scannedfoldersmodel.h"
#include "preferences.h"
#include "filesystemwatcher.h" #include "filesystemwatcher.h"
#include <QDir> #include <QDir>
@ -189,15 +189,16 @@ int ScanFoldersModel::findPathData(const QString &path) const {
return -1; return -1;
} }
void ScanFoldersModel::makePersistent(QIniSettings &settings) { void ScanFoldersModel::makePersistent() {
Preferences pref;
QStringList paths; QStringList paths;
QList<bool> downloadInFolderInfo; QList<bool> downloadInFolderInfo;
foreach (const PathData* pathData, m_pathList) { foreach (const PathData* pathData, m_pathList) {
paths << pathData->path; paths << pathData->path;
downloadInFolderInfo << pathData->downloadAtPath; downloadInFolderInfo << pathData->downloadAtPath;
} }
settings.setValue(QString::fromUtf8("ScanDirs"), paths); pref.setScanDirs(paths);
settings.setValue(QString::fromUtf8("DownloadInScanDirs"), misc::toStringList(downloadInFolderInfo)); pref.setDownloadInScanDirs(downloadInFolderInfo);
} }
ScanFoldersModel *ScanFoldersModel::m_instance = 0; ScanFoldersModel *ScanFoldersModel::m_instance = 0;

2
src/scannedfoldersmodel.h
View File

@ -61,7 +61,7 @@ public:
PathStatus setDownloadAtPath(int row, bool downloadAtPath); PathStatus setDownloadAtPath(int row, bool downloadAtPath);
bool downloadInTorrentFolder(const QString &filePath) const; bool downloadInTorrentFolder(const QString &filePath) const;
void makePersistent(QIniSettings &settings); void makePersistent();
signals: signals:
// The absolute paths of new torrent files in the scanned directories. // The absolute paths of new torrent files in the scanned directories.