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

Remove code that expects bundled search plugins.

Browse Source
This commit is contained in:
sledgehammer999 2017-06-02 02:03:11 +03:00
parent de74f9298f
commit 793ed7148f
No known key found for this signature in database
GPG Key ID: 6E4A2D025B7CC9A2
1 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/base/searchengine.cpp
View File

@ -226,10 +226,6 @@ void SearchEngine::installPlugin_impl(const QString &name, const QString &path)
bool SearchEngine::uninstallPlugin(const QString &name) bool SearchEngine::uninstallPlugin(const QString &name)
{ {
if (QFile::exists(":/nova/engines/" + name + ".py"))
return false;
// Proceed with uninstall
// remove it from hard drive // remove it from hard drive
QDir pluginsFolder(pluginsLocation()); QDir pluginsFolder(pluginsLocation());
QStringList filters; QStringList filters;
@ -457,27 +453,6 @@ void SearchEngine::updateNova()
QDir destDir(pluginsLocation()); QDir destDir(pluginsLocation());
Utils::Fs::removeDirRecursive(destDir.absoluteFilePath("__pycache__")); Utils::Fs::removeDirRecursive(destDir.absoluteFilePath("__pycache__"));
QDir shippedSubdir(":/" + novaFolder + "/engines/");
QStringList files = shippedSubdir.entryList();
foreach (const QString &file, files) {
QString shippedFile = shippedSubdir.absoluteFilePath(file);
// Copy python classes
if (file.endsWith(".py")) {
const QString destFile = destDir.absoluteFilePath(file);
if (getPluginVersion(shippedFile) > getPluginVersion(destFile) ) {
qDebug("shipped %s is more recent then local plugin, updating...", qPrintable(file));
removePythonScriptIfExists(destFile);
qDebug("%s copied to %s", qPrintable(shippedFile), qPrintable(destFile));
QFile::copy(shippedFile, destFile);
}
}
else {
// Copy icons
if (file.endsWith(".png"))
if (!QFile::exists(destDir.absoluteFilePath(file)))
QFile::copy(shippedFile, destDir.absoluteFilePath(file));
}
}
} }
void SearchEngine::onTimeout() void SearchEngine::onTimeout()