squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-31 20:58:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

BUGFIX: Fix possible search engine plugin update

Browse Source
This commit is contained in:
Christophe Dumez
2010-10-01 20:19:17 +00:00
parent a3f3287e24
commit cf86a1cecd
5 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog
View File

@@ -1,5 +1,6 @@
* Fri Oct 1 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.4
- BUGFIX: Clean program exit on system shutdown/logout
- BUGFIX: Fix possible search engine plugin update
* Tue Sep 28 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.3
- BUGFIX: Fix encoding issue in command line parameters processing

1
src/engineselectdlg.cpp
View File

@@ -270,6 +270,7 @@ void engineSelectDlg::installPlugin(QString path, QString plugin_name) {
// Backup in case install fails
QFile::copy(dest_path, dest_path+".bak");
misc::safeRemove(dest_path);
misc::safeRemove(dest_path+"c");
update = true;
}
// Copy the plugin

2
src/search_engine/engines/torrentdownloads.py
View File

@@ -1,4 +1,4 @@
#VERSION: 1.05
#VERSION: 1.06
#AUTHORS: Christophe Dumez (chris@qbittorrent.org)
# Redistribution and use in source and binary forms, with or without

2
src/search_engine/engines/versions.txt
View File

@@ -4,4 +4,4 @@ btjunkie: 2.21
mininova: 1.40
piratebay: 1.30
vertor: 1.0
torrentdownloads: 1.05
torrentdownloads: 1.06

8
src/searchengine.cpp
View File

@@ -484,8 +484,10 @@ void SearchEngine::updateNova() {
// Copy search plugin files (if necessary)
QString filePath = search_dir.absoluteFilePath("nova2.py");
if(getPluginVersion(":/search_engine/nova2.py") > getPluginVersion(filePath)) {
if(QFile::exists(filePath))
if(QFile::exists(filePath)) {
misc::safeRemove(filePath);
misc::safeRemove(filePath+"c");
}
QFile::copy(":/search_engine/nova2.py", filePath);
}
@@ -493,6 +495,7 @@ void SearchEngine::updateNova() {
if(getPluginVersion(":/search_engine/nova2dl.py") > getPluginVersion(filePath)) {
if(QFile::exists(filePath)){
misc::safeRemove(filePath);
misc::safeRemove(filePath+"c");
}
QFile::copy(":/search_engine/nova2dl.py", filePath);
}
@@ -501,6 +504,7 @@ void SearchEngine::updateNova() {
if(getPluginVersion(":/search_engine/novaprinter.py") > getPluginVersion(filePath)) {
if(QFile::exists(filePath)){
misc::safeRemove(filePath);
misc::safeRemove(filePath+"c");
}
QFile::copy(":/search_engine/novaprinter.py", filePath);
}
@@ -509,6 +513,7 @@ void SearchEngine::updateNova() {
if(getPluginVersion(":/search_engine/helpers.py") > getPluginVersion(filePath)) {
if(QFile::exists(filePath)){
misc::safeRemove(filePath);
misc::safeRemove(filePath+"c");
}
QFile::copy(":/search_engine/helpers.py", filePath);
}
@@ -530,6 +535,7 @@ void SearchEngine::updateNova() {
if(QFile::exists(dest_file)) {
qDebug("Removing old %s", qPrintable(dest_file));
misc::safeRemove(dest_file);
misc::safeRemove(dest_file+"c");
}
qDebug("%s copied to %s", qPrintable(shipped_file), qPrintable(dest_file));
QFile::copy(shipped_file, dest_file);