d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-25 22:14:32 +00:00
Code Issues Projects Releases Wiki Activity

Rename function

Browse Source
This commit is contained in:
Chocobo1 2018-06-28 16:13:52 +08:00
parent 5c50c5b24d
commit f951bf678d
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/base/search/searchpluginmanager.cpp
View File

@ -54,10 +54,10 @@
namespace namespace
{ {
inline void removePythonScriptIfExists(const QString &scriptPath) void removePythonScript(const QString &path)
{ {
Utils::Fs::forceRemove(scriptPath); Utils::Fs::forceRemove(path);
Utils::Fs::forceRemove(scriptPath + "c"); Utils::Fs::forceRemove(path + 'c'); // python2 pyc files
} }
} }
@ -209,8 +209,7 @@ void SearchPluginManager::installPlugin_impl(const QString &name, const QString
if (QFile::exists(destPath)) { if (QFile::exists(destPath)) {
// Backup in case install fails // Backup in case install fails
QFile::copy(destPath, destPath + ".bak"); QFile::copy(destPath, destPath + ".bak");
Utils::Fs::forceRemove(destPath); removePythonScript(destPath);
Utils::Fs::forceRemove(destPath + "c");
updated = true; updated = true;
} }
// Copy the plugin // Copy the plugin
@ -389,13 +388,13 @@ void SearchPluginManager::updateNova()
// Copy search plugin files (if necessary) // Copy search plugin files (if necessary)
QString filePath = searchDir.absoluteFilePath("nova2.py"); QString filePath = searchDir.absoluteFilePath("nova2.py");
if (getPluginVersion(":/" + novaFolder + "/nova2.py") > getPluginVersion(filePath)) { if (getPluginVersion(":/" + novaFolder + "/nova2.py") > getPluginVersion(filePath)) {
removePythonScriptIfExists(filePath); removePythonScript(filePath);
QFile::copy(":/" + novaFolder + "/nova2.py", filePath); QFile::copy(":/" + novaFolder + "/nova2.py", filePath);
} }
filePath = searchDir.absoluteFilePath("nova2dl.py"); filePath = searchDir.absoluteFilePath("nova2dl.py");
if (getPluginVersion(":/" + novaFolder + "/nova2dl.py") > getPluginVersion(filePath)) { if (getPluginVersion(":/" + novaFolder + "/nova2dl.py") > getPluginVersion(filePath)) {
removePythonScriptIfExists(filePath); removePythonScript(filePath);
QFile::copy(":/" + novaFolder + "/nova2dl.py", filePath); QFile::copy(":/" + novaFolder + "/nova2dl.py", filePath);
} }
@ -404,28 +403,28 @@ void SearchPluginManager::updateNova()
filePath = searchDir.absoluteFilePath("novaprinter.py"); filePath = searchDir.absoluteFilePath("novaprinter.py");
if (getPluginVersion(":/" + novaFolder + "/novaprinter.py") > getPluginVersion(filePath)) { if (getPluginVersion(":/" + novaFolder + "/novaprinter.py") > getPluginVersion(filePath)) {
removePythonScriptIfExists(filePath); removePythonScript(filePath);
QFile::copy(":/" + novaFolder + "/novaprinter.py", filePath); QFile::copy(":/" + novaFolder + "/novaprinter.py", filePath);
} }
filePath = searchDir.absoluteFilePath("helpers.py"); filePath = searchDir.absoluteFilePath("helpers.py");
if (getPluginVersion(":/" + novaFolder + "/helpers.py") > getPluginVersion(filePath)) { if (getPluginVersion(":/" + novaFolder + "/helpers.py") > getPluginVersion(filePath)) {
removePythonScriptIfExists(filePath); removePythonScript(filePath);
QFile::copy(":/" + novaFolder + "/helpers.py", filePath); QFile::copy(":/" + novaFolder + "/helpers.py", filePath);
} }
filePath = searchDir.absoluteFilePath("socks.py"); filePath = searchDir.absoluteFilePath("socks.py");
removePythonScriptIfExists(filePath); removePythonScript(filePath);
QFile::copy(":/" + novaFolder + "/socks.py", filePath); QFile::copy(":/" + novaFolder + "/socks.py", filePath);
if (novaFolder.endsWith("nova")) { if (novaFolder.endsWith("nova")) {
filePath = searchDir.absoluteFilePath("fix_encoding.py"); filePath = searchDir.absoluteFilePath("fix_encoding.py");
removePythonScriptIfExists(filePath); removePythonScript(filePath);
QFile::copy(":/" + novaFolder + "/fix_encoding.py", filePath); QFile::copy(":/" + novaFolder + "/fix_encoding.py", filePath);
} }
else if (novaFolder.endsWith("nova3")) { else if (novaFolder.endsWith("nova3")) {
filePath = searchDir.absoluteFilePath("sgmllib3.py"); filePath = searchDir.absoluteFilePath("sgmllib3.py");
removePythonScriptIfExists(filePath); removePythonScript(filePath);
QFile::copy(":/" + novaFolder + "/sgmllib3.py", filePath); QFile::copy(":/" + novaFolder + "/sgmllib3.py", filePath);
} }