squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2026-01-06 23:52:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2624 from pmzqla/python

Browse Source 
Prefer python3 over python2
This commit is contained in:
sledgehammer999
2015-07-21 01:55:14 +03:00
parent 6668018b45 6609d3e89f
commit d6af4683bb
6 changed files with 54 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/searchengine/searchengine.cpp
View File

@@ -182,6 +182,11 @@ void SearchEngine::giveFocusToSearchInput() {
// Function called when we click on search button
void SearchEngine::on_search_button_clicked() {
if (Utils::Misc::pythonVersion() < 0) {
mp_mainWindow->showNotificationBaloon(tr("Search Engine"), tr("Please install Python to use the Search Engine."));
return;
}
if (searchProcess->state() != QProcess::NotRunning) {
#ifdef Q_OS_WIN
searchProcess->kill();
@@ -236,7 +241,7 @@ void SearchEngine::on_search_button_clicked() {
// Changing the text of the current label
currentSearchTab->getCurrentLabel()->setText(tr("Results")+" <i>(0)</i>:");
// Launch search
searchProcess->start("python", params, QIODevice::ReadOnly);
searchProcess->start(Utils::Misc::pythonExecutable(), params, QIODevice::ReadOnly);
searchTimeout->start(180000); // 3min
}
@@ -276,7 +281,7 @@ void SearchEngine::downloadTorrent(QString engine_url, QString torrent_url) {
params << engine_url;
params << torrent_url;
// Launch search
downloadProcess->start("python", params, QIODevice::ReadOnly);
downloadProcess->start(Utils::Misc::pythonExecutable(), params, QIODevice::ReadOnly);
}
}

3
src/searchengine/supportedengines.h
View File

@@ -42,6 +42,7 @@
#include <QDebug>
#include "core/utils/fs.h"
#include "core/utils/misc.h"
#include "core/preferences.h"
class SearchCategories: public QObject, public QHash<QString, QString> {
@@ -150,7 +151,7 @@ public slots:
QStringList params;
params << Utils::Fs::toNativePath(Utils::Fs::searchEngineLocation()+"/nova2.py");
params << "--capabilities";
nova.start("python", params, QIODevice::ReadOnly);
nova.start(Utils::Misc::pythonExecutable(), params, QIODevice::ReadOnly);
nova.waitForStarted();
nova.waitForFinished();
QString capabilities = QString(nova.readAll());