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

[search engine] Remove python3 cache during updateNova()

Browse Source
This commit is contained in:
DoumanAsh 2015-06-11 20:43:41 +03:00
parent 8897001567
commit 1222dab6f8
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/utils/fs.cpp
View File

@ -178,6 +178,27 @@ bool Utils::Fs::forceRemove(const QString& file_path)
return f.remove(); return f.remove();
} }
/**
* Removes directory and its content recursively.
*
*/
void Utils::Fs::removeDirRecursive(const QString& dirName) {
QDir dir(dirName);
if (!dir.exists()) return;
Q_FOREACH(QFileInfo info, dir.entryInfoList(QDir::NoDotAndDotDot |
QDir::System |
QDir::Hidden |
QDir::AllDirs |
QDir::Files, QDir::DirsFirst)) {
if (info.isDir()) removeDirRecursive(info.absoluteFilePath());
else forceRemove(info.absoluteFilePath());
}
dir.rmdir(dirName);
}
/** /**
* Returns the size of a file. * Returns the size of a file.
* If the file is a folder, it will compute its size based on its content. * If the file is a folder, it will compute its size based on its content.

1
src/core/utils/fs.h
View File

@ -57,6 +57,7 @@ namespace Utils
QString expandPathAbs(const QString& path); QString expandPathAbs(const QString& path);
bool smartRemoveEmptyFolderTree(const QString& dir_path); bool smartRemoveEmptyFolderTree(const QString& dir_path);
bool forceRemove(const QString& file_path); bool forceRemove(const QString& file_path);
void removeDirRecursive(const QString& dirName);
/* Ported from Qt4 to drop dependency on QtGui */ /* Ported from Qt4 to drop dependency on QtGui */
QString QDesktopServicesDataLocation(); QString QDesktopServicesDataLocation();

8
src/searchengine/searchengine.cpp
View File

@ -321,7 +321,7 @@ void SearchEngine::downloadFinished(int exitcode, QProcess::ExitStatus) {
delete downloadProcess; delete downloadProcess;
} }
static void removePythonScriptIfExists(const QString& script_path) static inline void removePythonScriptIfExists(const QString& script_path)
{ {
Utils::Fs::forceRemove(script_path); Utils::Fs::forceRemove(script_path);
Utils::Fs::forceRemove(script_path + "c"); Utils::Fs::forceRemove(script_path + "c");
@ -339,6 +339,8 @@ void SearchEngine::updateNova() {
if (!search_dir.exists("engines")) { if (!search_dir.exists("engines")) {
search_dir.mkdir("engines"); search_dir.mkdir("engines");
} }
Utils::Fs::removeDirRecursive(search_dir.absoluteFilePath("__pycache__"));
QFile package_file2(search_dir.absolutePath() + "/engines/__init__.py"); QFile package_file2(search_dir.absolutePath() + "/engines/__init__.py");
package_file2.open(QIODevice::WriteOnly | QIODevice::Text); package_file2.open(QIODevice::WriteOnly | QIODevice::Text);
package_file2.close(); package_file2.close();
@ -376,13 +378,13 @@ void SearchEngine::updateNova() {
removePythonScriptIfExists(filePath); removePythonScriptIfExists(filePath);
QFile::copy(":/"+nova_folder+"/fix_encoding.py", filePath); QFile::copy(":/"+nova_folder+"/fix_encoding.py", filePath);
} }
else if (nova_folder == "nova3") {
if (nova_folder == "nova3") {
filePath = search_dir.absoluteFilePath("sgmllib3.py"); filePath = search_dir.absoluteFilePath("sgmllib3.py");
removePythonScriptIfExists(filePath); removePythonScriptIfExists(filePath);
QFile::copy(":/"+nova_folder+"/sgmllib3.py", filePath); QFile::copy(":/"+nova_folder+"/sgmllib3.py", filePath);
} }
QDir destDir(QDir(Utils::Fs::searchEngineLocation()).absoluteFilePath("engines")); QDir destDir(QDir(Utils::Fs::searchEngineLocation()).absoluteFilePath("engines"));
Utils::Fs::removeDirRecursive(destDir.absoluteFilePath("__pycache__"));
QDir shipped_subDir(":/"+nova_folder+"/engines/"); QDir shipped_subDir(":/"+nova_folder+"/engines/");
QStringList files = shipped_subDir.entryList(); QStringList files = shipped_subDir.entryList();
foreach (const QString &file, files) { foreach (const QString &file, files) {