d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-08-26 05:32:05 +00:00
Code Issues Projects Releases Wiki Activity

Fix filename validation on non-Windows OS

Browse Source 
Closes #11191.
This commit is contained in:
Chocobo1 2019-09-05 02:00:10 +08:00
parent ef8b37f7fa
commit 9dc3b18178
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/base/utils/fs.cpp
View File

@ -230,7 +230,19 @@ bool Utils::Fs::isValidFileSystemName(const QString &name, const bool allowSepar
{ {
if (name.isEmpty()) return false; if (name.isEmpty()) return false;
const QRegularExpression regex(allowSeparators ? "[:?\"*<>|]" : "[\\\\/:?\"*<>|]"); #if defined(Q_OS_WIN)
const QRegularExpression regex {allowSeparators
? QLatin1String("[:?\"*<>|]")
: QLatin1String("[\\\\/:?\"*<>|]")};
#elif defined(Q_OS_MACOS)
const QRegularExpression regex {allowSeparators
? QLatin1String("[\\0:]")
: QLatin1String("[\\0/:]")};
#else
const QRegularExpression regex {allowSeparators
? QLatin1String("[\\0]")
: QLatin1String("[\\0/]")};
#endif
return !name.contains(regex); return !name.contains(regex);
} }

4
src/gui/torrentcontenttreeview.cpp
View File

@ -108,7 +108,7 @@ void TorrentContentTreeView::renameSelectedFile(BitTorrent::TorrentHandle *torre
, modelIndex.data().toString(), &ok, isFile).trimmed(); , modelIndex.data().toString(), &ok, isFile).trimmed();
if (!ok) return; if (!ok) return;
if (newName.isEmpty() || !Utils::Fs::isValidFileSystemName(newName)) { if (!Utils::Fs::isValidFileSystemName(newName)) {
RaisedMessageBox::warning(this, tr("Rename error"), RaisedMessageBox::warning(this, tr("Rename error"),
tr("The name is empty or contains forbidden characters, please choose a different one."), tr("The name is empty or contains forbidden characters, please choose a different one."),
QMessageBox::Ok); QMessageBox::Ok);
@ -227,7 +227,7 @@ void TorrentContentTreeView::renameSelectedFile(BitTorrent::TorrentInfo &torrent
, modelIndex.data().toString(), &ok, isFile).trimmed(); , modelIndex.data().toString(), &ok, isFile).trimmed();
if (!ok) return; if (!ok) return;
if (newName.isEmpty() || !Utils::Fs::isValidFileSystemName(newName)) { if (!Utils::Fs::isValidFileSystemName(newName)) {
RaisedMessageBox::warning(this, tr("Rename error"), RaisedMessageBox::warning(this, tr("Rename error"),
tr("The name is empty or contains forbidden characters, please choose a different one."), tr("The name is empty or contains forbidden characters, please choose a different one."),
QMessageBox::Ok); QMessageBox::Ok);