squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-20 15:37:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

- Fix crash when scanned directory does not exist (closes #438001)

Browse Source
This commit is contained in:
Christophe Dumez
2009-09-30 18:40:13 +00:00
parent f26bcec56f
commit 9772fccde3
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@@ -1,6 +1,8 @@
* Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.5.3 * Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.5.3
- BUGFIX: Fix a possible crash when pausing then deleting a torrent quickly - BUGFIX: Fix a possible crash when pausing then deleting a torrent quickly
- BUGFIX: Fix a race condition in folder scanning and torrent downloader
- BUGFIX: Hide download url column in search results - BUGFIX: Hide download url column in search results
- BUGFIX: Fix a crash when scanned directory does not exist
* Sun Sep 20 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.5.2 * Sun Sep 20 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.5.2
- BUGFIX: Some torrents were pausing for no reason - BUGFIX: Some torrents were pausing for no reason

21
src/bittorrent.cpp
View File

@@ -987,11 +987,12 @@ void bittorrent::scanDirectory(QString scan_dir) {
foreach(const QString &file, files) { foreach(const QString &file, files) {
QString fullPath = dir.path()+QDir::separator()+file; QString fullPath = dir.path()+QDir::separator()+file;
QFile torrent(fullPath); QFile torrent(fullPath);
if(torrent.size() != 0) { qDebug("Adding for scan_dir: %s", fullPath.toLocal8Bit().data());
qDebug("Adding for scan_dir: %s", fullPath.toLocal8Bit().data()); try {
torrent_info t(fullPath.toLocal8Bit().data());
addTorrent(fullPath, true); addTorrent(fullPath, true);
} else { } catch(std::exception&) {
qDebug("Ignoring empty file: %s", fullPath.toLocal8Bit().data()); qDebug("Ignoring incomplete torrent file: %s", fullPath.toLocal8Bit().data());
} }
} }
FSMutex->unlock(); FSMutex->unlock();
@@ -1043,6 +1044,11 @@ void bittorrent::saveTrackerFile(QString hash) {
// Enable directory scanning // Enable directory scanning
void bittorrent::enableDirectoryScanning(QString scan_dir) { void bittorrent::enableDirectoryScanning(QString scan_dir) {
if(!scan_dir.isEmpty()) { if(!scan_dir.isEmpty()) {
QDir newDir(scan_dir);
if(!newDir.exists()) {
qDebug("Scan dir %s does not exist, create it", scan_dir.toUtf8().data());
newDir.mkpath(scan_dir);
}
if(FSWatcher == 0) { if(FSWatcher == 0) {
FSMutex = new QMutex(); FSMutex = new QMutex();
FSWatcher = new QFileSystemWatcher(QStringList(scan_dir), this); FSWatcher = new QFileSystemWatcher(QStringList(scan_dir), this);
@@ -1050,9 +1056,12 @@ void bittorrent::enableDirectoryScanning(QString scan_dir) {
// Initial scan // Initial scan
scanDirectory(scan_dir); scanDirectory(scan_dir);
} else { } else {
QString old_scan_dir = FSWatcher->directories().first(); QString old_scan_dir = "";
if(!FSWatcher->directories().empty())
old_scan_dir = FSWatcher->directories().first();
if(old_scan_dir != scan_dir) { if(old_scan_dir != scan_dir) {
FSWatcher->removePath(old_scan_dir); if(!old_scan_dir.isEmpty())
FSWatcher->removePath(old_scan_dir);
FSWatcher->addPath(scan_dir); FSWatcher->addPath(scan_dir);
// Initial scan // Initial scan
scanDirectory(scan_dir); scanDirectory(scan_dir);