github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-21 05:43:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Properly normalize version string before parsing it

Browse source 
This allows python scripts to be formatted in PEP 8 style.
This commit is contained in:
hannsen 2018-06-12 21:32:42 +02:00 • committed by sledgehammer999
commit 4707d34fad
No known key found for this signature in database
GPG key ID: 6E4A2D025B7CC9A2
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/base/search/searchpluginmanager.cpp
View file

@ -554,19 +554,17 @@ PluginVersion SearchPluginManager::getPluginVersion(QString filePath)
PluginVersion version; PluginVersion version;
while (!plugin.atEnd()) { while (!plugin.atEnd()) {
QByteArray line = plugin.readLine(); const QString line = QString(plugin.readLine()).remove(' ');
if (line.startsWith("#VERSION: ")) { if (!line.startsWith("#VERSION:", Qt::CaseInsensitive)) continue;
line = line.split(' ').last().trimmed();
version = PluginVersion::tryParse(line, invalidVersion); const QString versionStr = line.mid(9);
if (version == invalidVersion) { version = PluginVersion::tryParse(versionStr, invalidVersion);
LogMsg(tr("Search plugin '%1' contains invalid version string ('%2')") if (version == invalidVersion) {
.arg(Utils::Fs::fileName(filePath), QString::fromUtf8(line)), Log::MsgType::WARNING); LogMsg(tr("Search plugin '%1' contains invalid version string ('%2')")
} .arg(Utils::Fs::fileName(filePath), line), Log::MsgType::WARNING);
else {
qDebug() << "plugin" << filePath << "version: " << version;
}
break;
} }
break;
} }
return version; return version;
} }