From a162550d7f15917e84bbf5a6436e0470ebe3f0e8 Mon Sep 17 00:00:00 2001 From: hannsen Date: Tue, 12 Jun 2018 21:32:42 +0200 Subject: [PATCH] Properly normalize version string before parsing it This allows python scripts to be formatted in PEP 8 style. --- src/base/search/searchpluginmanager.cpp | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/base/search/searchpluginmanager.cpp b/src/base/search/searchpluginmanager.cpp index b1f23bd3e..de0a4b577 100644 --- a/src/base/search/searchpluginmanager.cpp +++ b/src/base/search/searchpluginmanager.cpp @@ -554,19 +554,17 @@ PluginVersion SearchPluginManager::getPluginVersion(QString filePath) PluginVersion version; while (!plugin.atEnd()) { - QByteArray line = plugin.readLine(); - if (line.startsWith("#VERSION: ")) { - line = line.split(' ').last().trimmed(); - version = PluginVersion::tryParse(line, invalidVersion); - if (version == invalidVersion) { - LogMsg(tr("Search plugin '%1' contains invalid version string ('%2')") - .arg(Utils::Fs::fileName(filePath), QString::fromUtf8(line)), Log::MsgType::WARNING); - } - else { - qDebug() << "plugin" << filePath << "version: " << version; - } - break; + const QString line = QString(plugin.readLine()).remove(' '); + if (!line.startsWith("#VERSION:", Qt::CaseInsensitive)) continue; + + const QString versionStr = line.mid(9); + version = PluginVersion::tryParse(versionStr, invalidVersion); + if (version == invalidVersion) { + LogMsg(tr("Search plugin '%1' contains invalid version string ('%2')") + .arg(Utils::Fs::fileName(filePath), line), Log::MsgType::WARNING); } + + break; } return version; }