Browse Source

Properly normalize version string before parsing it

This allows python scripts to be formatted in PEP 8 style.
adaptive-webui-19844
hannsen 7 years ago committed by Chocobo1
parent
commit
a162550d7f
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
  1. 16
      src/base/search/searchpluginmanager.cpp

16
src/base/search/searchpluginmanager.cpp

@ -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);
version = PluginVersion::tryParse(versionStr, invalidVersion);
if (version == invalidVersion) { if (version == invalidVersion) {
LogMsg(tr("Search plugin '%1' contains invalid version string ('%2')") LogMsg(tr("Search plugin '%1' contains invalid version string ('%2')")
.arg(Utils::Fs::fileName(filePath), QString::fromUtf8(line)), Log::MsgType::WARNING); .arg(Utils::Fs::fileName(filePath), line), Log::MsgType::WARNING);
}
else {
qDebug() << "plugin" << filePath << "version: " << version;
} }
break; break;
} }
}
return version; return version;
} }

Loading…
Cancel
Save