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

Properly create "clean path" for watched folder (#15179)

Browse Source
This commit is contained in:
Vladimir Golovnev 2021-07-12 11:44:52 +03:00 committed by GitHub
parent abd6eb2ff3
commit 699b91ab8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/base/torrentfileswatcher.cpp
View File

@ -268,11 +268,10 @@ QString TorrentFilesWatcher::makeCleanPath(const QString &path)
if (path.isEmpty()) if (path.isEmpty())
throw InvalidArgument(tr("Watched folder path cannot be empty.")); throw InvalidArgument(tr("Watched folder path cannot be empty."));
const QDir dir {path}; if (QDir::isRelativePath(path))
if (dir.isRelative())
throw InvalidArgument(tr("Watched folder path cannot be relative.")); throw InvalidArgument(tr("Watched folder path cannot be relative."));
return dir.canonicalPath(); return QDir::cleanPath(path);
} }
void TorrentFilesWatcher::load() void TorrentFilesWatcher::load()

16
src/gui/watchedfoldersmodel.cpp
View File

@ -102,23 +102,21 @@ bool WatchedFoldersModel::removeRows(const int row, const int count, const QMode
void WatchedFoldersModel::addFolder(const QString &path, const TorrentFilesWatcher::WatchedFolderOptions &options) void WatchedFoldersModel::addFolder(const QString &path, const TorrentFilesWatcher::WatchedFolderOptions &options)
{ {
if (path.isEmpty()) const QString cleanWatchPath = m_fsWatcher->makeCleanPath(path);
throw InvalidArgument(tr("Watched folder path cannot be empty.")); if (m_watchedFoldersOptions.contains(cleanWatchPath))
const QDir watchDir {path};
const QString canonicalWatchPath = watchDir.canonicalPath();
if (m_watchedFoldersOptions.contains(canonicalWatchPath))
throw RuntimeError(tr("Folder '%1' is already in watch list.").arg(path)); throw RuntimeError(tr("Folder '%1' is already in watch list.").arg(path));
const QDir watchDir {cleanWatchPath};
if (!watchDir.exists()) if (!watchDir.exists())
throw RuntimeError(tr("Folder '%1' doesn't exist.").arg(path)); throw RuntimeError(tr("Folder '%1' doesn't exist.").arg(path));
if (!watchDir.isReadable()) if (!watchDir.isReadable())
throw RuntimeError(tr("Folder '%1' isn't readable.").arg(path)); throw RuntimeError(tr("Folder '%1' isn't readable.").arg(path));
m_deletedFolders.remove(canonicalWatchPath); m_deletedFolders.remove(cleanWatchPath);
beginInsertRows(QModelIndex(), rowCount(), rowCount()); beginInsertRows(QModelIndex(), rowCount(), rowCount());
m_watchedFolders.append(canonicalWatchPath); m_watchedFolders.append(cleanWatchPath);
m_watchedFoldersOptions[canonicalWatchPath] = options; m_watchedFoldersOptions[cleanWatchPath] = options;
endInsertRows(); endInsertRows();
} }