mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2024-11-26 03:06:37 +03:00
Follow project coding style. Issue #2192.
This commit is contained in:
parent
438ee23d2c
commit
885eb64df3
1 changed files with 97 additions and 88 deletions
|
@ -62,9 +62,9 @@
|
||||||
|
|
||||||
/*SEARCH ENGINE START*/
|
/*SEARCH ENGINE START*/
|
||||||
SearchEngine::SearchEngine(MainWindow* parent)
|
SearchEngine::SearchEngine(MainWindow* parent)
|
||||||
: QWidget(parent)
|
: QWidget(parent)
|
||||||
, search_pattern(new LineEdit)
|
, search_pattern(new LineEdit)
|
||||||
, mp_mainWindow(parent)
|
, mp_mainWindow(parent)
|
||||||
{
|
{
|
||||||
setupUi(this);
|
setupUi(this);
|
||||||
searchBarLayout->insertWidget(0, search_pattern);
|
searchBarLayout->insertWidget(0, search_pattern);
|
||||||
|
@ -96,20 +96,22 @@ SearchEngine::SearchEngine(MainWindow* parent)
|
||||||
fillEngineComboBox();
|
fillEngineComboBox();
|
||||||
|
|
||||||
connect(search_pattern, SIGNAL(textEdited(QString)), this, SLOT(searchTextEdited(QString)));
|
connect(search_pattern, SIGNAL(textEdited(QString)), this, SLOT(searchTextEdited(QString)));
|
||||||
connect(selectEngine, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(selectMultipleBox(const QString&)));
|
connect(selectEngine, SIGNAL(currentIndexChanged(const QString &)), this, SLOT(selectMultipleBox(const QString &)));
|
||||||
}
|
}
|
||||||
|
|
||||||
void SearchEngine::fillCatCombobox() {
|
void SearchEngine::fillCatCombobox()
|
||||||
|
{
|
||||||
comboCategory->clear();
|
comboCategory->clear();
|
||||||
comboCategory->addItem(full_cat_names["all"], QVariant("all"));
|
comboCategory->addItem(full_cat_names["all"], QVariant("all"));
|
||||||
QStringList supported_cat = supported_engines->supportedCategories();
|
QStringList supported_cat = supported_engines->supportedCategories();
|
||||||
foreach (QString cat, supported_cat) {
|
foreach (QString cat, supported_cat) {
|
||||||
qDebug("Supported category: %s", qPrintable(cat));
|
qDebug("Supported category: %s", qPrintable(cat));
|
||||||
comboCategory->addItem(full_cat_names[cat], QVariant(cat));
|
comboCategory->addItem(full_cat_names[cat], QVariant(cat));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void SearchEngine::fillEngineComboBox() {
|
void SearchEngine::fillEngineComboBox()
|
||||||
|
{
|
||||||
selectEngine->clear();
|
selectEngine->clear();
|
||||||
selectEngine->addItem(tr("All enabled"), QVariant("enabled"));
|
selectEngine->addItem(tr("All enabled"), QVariant("enabled"));
|
||||||
selectEngine->addItem(tr("All engines"), QVariant("all"));
|
selectEngine->addItem(tr("All engines"), QVariant("all"));
|
||||||
|
@ -118,15 +120,18 @@ void SearchEngine::fillEngineComboBox() {
|
||||||
selectEngine->addItem(tr("Multiple..."), QVariant("multi"));
|
selectEngine->addItem(tr("Multiple..."), QVariant("multi"));
|
||||||
}
|
}
|
||||||
|
|
||||||
QString SearchEngine::selectedCategory() const {
|
QString SearchEngine::selectedCategory() const
|
||||||
|
{
|
||||||
return comboCategory->itemData(comboCategory->currentIndex()).toString();
|
return comboCategory->itemData(comboCategory->currentIndex()).toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
QString SearchEngine::selectedEngine() const {
|
QString SearchEngine::selectedEngine() const
|
||||||
|
{
|
||||||
return selectEngine->itemData(selectEngine->currentIndex()).toString();
|
return selectEngine->itemData(selectEngine->currentIndex()).toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
SearchEngine::~SearchEngine() {
|
SearchEngine::~SearchEngine()
|
||||||
|
{
|
||||||
qDebug("Search destruction");
|
qDebug("Search destruction");
|
||||||
searchProcess->kill();
|
searchProcess->kill();
|
||||||
searchProcess->waitForFinished();
|
searchProcess->waitForFinished();
|
||||||
|
@ -145,9 +150,11 @@ SearchEngine::~SearchEngine() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void SearchEngine::tab_changed(int t)
|
void SearchEngine::tab_changed(int t)
|
||||||
{//when we switch from a tab that is not empty to another that is empty the download button
|
{
|
||||||
//doesn't have to be available
|
//when we switch from a tab that is not empty to another that is empty the download button
|
||||||
if (t>-1) {//-1 = no more tab
|
//doesn't have to be available
|
||||||
|
if (t > -1) {
|
||||||
|
//-1 = no more tab
|
||||||
currentSearchTab = all_tab.at(tabWidget->currentIndex());
|
currentSearchTab = all_tab.at(tabWidget->currentIndex());
|
||||||
if (currentSearchTab->getCurrentSearchListModel()->rowCount()) {
|
if (currentSearchTab->getCurrentSearchListModel()->rowCount()) {
|
||||||
download_button->setEnabled(true);
|
download_button->setEnabled(true);
|
||||||
|
@ -161,27 +168,32 @@ void SearchEngine::tab_changed(int t)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void SearchEngine::selectMultipleBox(const QString &text) {
|
void SearchEngine::selectMultipleBox(const QString &text)
|
||||||
|
{
|
||||||
if (text == tr("Multiple...")) on_enginesButton_clicked();
|
if (text == tr("Multiple...")) on_enginesButton_clicked();
|
||||||
}
|
}
|
||||||
|
|
||||||
void SearchEngine::on_enginesButton_clicked() {
|
void SearchEngine::on_enginesButton_clicked()
|
||||||
|
{
|
||||||
engineSelectDlg *dlg = new engineSelectDlg(this, supported_engines);
|
engineSelectDlg *dlg = new engineSelectDlg(this, supported_engines);
|
||||||
connect(dlg, SIGNAL(enginesChanged()), this, SLOT(fillCatCombobox()));
|
connect(dlg, SIGNAL(enginesChanged()), this, SLOT(fillCatCombobox()));
|
||||||
connect(dlg, SIGNAL(enginesChanged()), this, SLOT(fillEngineComboBox()));
|
connect(dlg, SIGNAL(enginesChanged()), this, SLOT(fillEngineComboBox()));
|
||||||
}
|
}
|
||||||
|
|
||||||
void SearchEngine::searchTextEdited(QString) {
|
void SearchEngine::searchTextEdited(QString)
|
||||||
|
{
|
||||||
// Enable search button
|
// Enable search button
|
||||||
search_button->setText(tr("Search"));
|
search_button->setText(tr("Search"));
|
||||||
}
|
}
|
||||||
|
|
||||||
void SearchEngine::giveFocusToSearchInput() {
|
void SearchEngine::giveFocusToSearchInput()
|
||||||
|
{
|
||||||
search_pattern->setFocus();
|
search_pattern->setFocus();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Function called when we click on search button
|
// Function called when we click on search button
|
||||||
void SearchEngine::on_search_button_clicked() {
|
void SearchEngine::on_search_button_clicked()
|
||||||
|
{
|
||||||
if (Utils::Misc::pythonVersion() < 0) {
|
if (Utils::Misc::pythonVersion() < 0) {
|
||||||
mp_mainWindow->showNotificationBaloon(tr("Search Engine"), tr("Please install Python to use the Search Engine."));
|
mp_mainWindow->showNotificationBaloon(tr("Search Engine"), tr("Please install Python to use the Search Engine."));
|
||||||
return;
|
return;
|
||||||
|
@ -194,9 +206,8 @@ void SearchEngine::on_search_button_clicked() {
|
||||||
searchProcess->terminate();
|
searchProcess->terminate();
|
||||||
#endif
|
#endif
|
||||||
search_stopped = true;
|
search_stopped = true;
|
||||||
if (searchTimeout->isActive()) {
|
if (searchTimeout->isActive())
|
||||||
searchTimeout->stop();
|
searchTimeout->stop();
|
||||||
}
|
|
||||||
if (search_button->text() != tr("Search")) {
|
if (search_button->text() != tr("Search")) {
|
||||||
search_button->setText(tr("Search"));
|
search_button->setText(tr("Search"));
|
||||||
return;
|
return;
|
||||||
|
@ -239,29 +250,30 @@ void SearchEngine::on_search_button_clicked() {
|
||||||
nb_search_results = 0;
|
nb_search_results = 0;
|
||||||
search_result_line_truncated.clear();
|
search_result_line_truncated.clear();
|
||||||
// Changing the text of the current label
|
// Changing the text of the current label
|
||||||
currentSearchTab->getCurrentLabel()->setText(tr("Results")+" <i>(0)</i>:");
|
currentSearchTab->getCurrentLabel()->setText(tr("Results") + " <i>(0)</i>:");
|
||||||
// Launch search
|
// Launch search
|
||||||
searchProcess->start(Utils::Misc::pythonExecutable(), params, QIODevice::ReadOnly);
|
searchProcess->start(Utils::Misc::pythonExecutable(), params, QIODevice::ReadOnly);
|
||||||
searchTimeout->start(180000); // 3min
|
searchTimeout->start(180000); // 3min
|
||||||
}
|
}
|
||||||
|
|
||||||
void SearchEngine::saveResultsColumnsWidth() {
|
void SearchEngine::saveResultsColumnsWidth()
|
||||||
|
{
|
||||||
if (all_tab.isEmpty())
|
if (all_tab.isEmpty())
|
||||||
return;
|
return;
|
||||||
QTreeView* treeview = all_tab.first()->getCurrentTreeView();
|
QTreeView* treeview = all_tab.first()->getCurrentTreeView();
|
||||||
Preferences* const pref = Preferences::instance();
|
Preferences* const pref = Preferences::instance();
|
||||||
QStringList new_width_list;
|
QStringList new_width_list;
|
||||||
short nbColumns = all_tab.first()->getCurrentSearchListModel()->columnCount();
|
short nbColumns = all_tab.first()->getCurrentSearchListModel()->columnCount();
|
||||||
for (short i=0; i<nbColumns; ++i) {
|
for (short i = 0; i < nbColumns; ++i)
|
||||||
if (treeview->columnWidth(i) > 0)
|
if (treeview->columnWidth(i) > 0)
|
||||||
new_width_list << QString::number(treeview->columnWidth(i));
|
new_width_list << QString::number(treeview->columnWidth(i));
|
||||||
}
|
|
||||||
// Don't save the width of the last column (auto column width)
|
// Don't save the width of the last column (auto column width)
|
||||||
new_width_list.removeLast();
|
new_width_list.removeLast();
|
||||||
pref->setSearchColsWidth(new_width_list.join(" "));
|
pref->setSearchColsWidth(new_width_list.join(" "));
|
||||||
}
|
}
|
||||||
|
|
||||||
void SearchEngine::downloadTorrent(QString engine_url, QString torrent_url) {
|
void SearchEngine::downloadTorrent(QString engine_url, QString torrent_url)
|
||||||
|
{
|
||||||
if (torrent_url.startsWith("bc://bt/", Qt::CaseInsensitive)) {
|
if (torrent_url.startsWith("bc://bt/", Qt::CaseInsensitive)) {
|
||||||
qDebug("Converting bc link to magnet link");
|
qDebug("Converting bc link to magnet link");
|
||||||
torrent_url = Utils::Misc::bcLinkToMagnet(torrent_url);
|
torrent_url = Utils::Misc::bcLinkToMagnet(torrent_url);
|
||||||
|
@ -271,7 +283,8 @@ void SearchEngine::downloadTorrent(QString engine_url, QString torrent_url) {
|
||||||
QStringList urls;
|
QStringList urls;
|
||||||
urls << torrent_url;
|
urls << torrent_url;
|
||||||
mp_mainWindow->downloadFromURLList(urls);
|
mp_mainWindow->downloadFromURLList(urls);
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
QProcess *downloadProcess = new QProcess(this);
|
QProcess *downloadProcess = new QProcess(this);
|
||||||
downloadProcess->setEnvironment(QProcess::systemEnvironment());
|
downloadProcess->setEnvironment(QProcess::systemEnvironment());
|
||||||
connect(downloadProcess, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(downloadFinished(int,QProcess::ExitStatus)));
|
connect(downloadProcess, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(downloadFinished(int,QProcess::ExitStatus)));
|
||||||
|
@ -285,7 +298,8 @@ void SearchEngine::downloadTorrent(QString engine_url, QString torrent_url) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void SearchEngine::searchStarted() {
|
void SearchEngine::searchStarted()
|
||||||
|
{
|
||||||
// Update SearchEngine widgets
|
// Update SearchEngine widgets
|
||||||
activeSearchTab->status = tr("Searching...");
|
activeSearchTab->status = tr("Searching...");
|
||||||
search_status->setText(activeSearchTab->status);
|
search_status->setText(activeSearchTab->status);
|
||||||
|
@ -296,23 +310,24 @@ void SearchEngine::searchStarted() {
|
||||||
// search Qprocess return output as soon as it gets new
|
// search Qprocess return output as soon as it gets new
|
||||||
// stuff to read. We split it into lines and add each
|
// stuff to read. We split it into lines and add each
|
||||||
// line to search results calling appendSearchResult().
|
// line to search results calling appendSearchResult().
|
||||||
void SearchEngine::readSearchOutput() {
|
void SearchEngine::readSearchOutput()
|
||||||
|
{
|
||||||
QByteArray output = searchProcess->readAllStandardOutput();
|
QByteArray output = searchProcess->readAllStandardOutput();
|
||||||
output.replace("\r", "");
|
output.replace("\r", "");
|
||||||
QList<QByteArray> lines_list = output.split('\n');
|
QList<QByteArray> lines_list = output.split('\n');
|
||||||
if (!search_result_line_truncated.isEmpty()) {
|
if (!search_result_line_truncated.isEmpty()) {
|
||||||
QByteArray end_of_line = lines_list.takeFirst();
|
QByteArray end_of_line = lines_list.takeFirst();
|
||||||
lines_list.prepend(search_result_line_truncated+end_of_line);
|
lines_list.prepend(search_result_line_truncated + end_of_line);
|
||||||
}
|
}
|
||||||
search_result_line_truncated = lines_list.takeLast().trimmed();
|
search_result_line_truncated = lines_list.takeLast().trimmed();
|
||||||
foreach (const QByteArray &line, lines_list) {
|
foreach (const QByteArray &line, lines_list)
|
||||||
appendSearchResult(QString::fromUtf8(line));
|
appendSearchResult(QString::fromUtf8(line));
|
||||||
}
|
|
||||||
if (activeSearchTab)
|
if (activeSearchTab)
|
||||||
activeSearchTab->getCurrentLabel()->setText(tr("Results")+QString::fromUtf8(" <i>(")+QString::number(nb_search_results)+QString::fromUtf8(")</i>:"));
|
activeSearchTab->getCurrentLabel()->setText(tr("Results") + QString::fromUtf8(" <i>(") + QString::number(nb_search_results) + QString::fromUtf8(")</i>:"));
|
||||||
}
|
}
|
||||||
|
|
||||||
void SearchEngine::downloadFinished(int exitcode, QProcess::ExitStatus) {
|
void SearchEngine::downloadFinished(int exitcode, QProcess::ExitStatus)
|
||||||
|
{
|
||||||
QProcess *downloadProcess = (QProcess*)sender();
|
QProcess *downloadProcess = (QProcess*)sender();
|
||||||
if (exitcode == 0) {
|
if (exitcode == 0) {
|
||||||
QString line = QString::fromUtf8(downloadProcess->readAllStandardOutput()).trimmed();
|
QString line = QString::fromUtf8(downloadProcess->readAllStandardOutput()).trimmed();
|
||||||
|
@ -338,7 +353,8 @@ static inline void removePythonScriptIfExists(const QString& script_path)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update nova.py search plugin if necessary
|
// Update nova.py search plugin if necessary
|
||||||
void SearchEngine::updateNova() {
|
void SearchEngine::updateNova()
|
||||||
|
{
|
||||||
qDebug("Updating nova");
|
qDebug("Updating nova");
|
||||||
// create nova directory if necessary
|
// create nova directory if necessary
|
||||||
QDir search_dir(Utils::Fs::searchEngineLocation());
|
QDir search_dir(Utils::Fs::searchEngineLocation());
|
||||||
|
@ -346,9 +362,8 @@ void SearchEngine::updateNova() {
|
||||||
QFile package_file(search_dir.absoluteFilePath("__init__.py"));
|
QFile package_file(search_dir.absoluteFilePath("__init__.py"));
|
||||||
package_file.open(QIODevice::WriteOnly | QIODevice::Text);
|
package_file.open(QIODevice::WriteOnly | QIODevice::Text);
|
||||||
package_file.close();
|
package_file.close();
|
||||||
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__"));
|
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");
|
||||||
|
@ -356,46 +371,46 @@ void SearchEngine::updateNova() {
|
||||||
package_file2.close();
|
package_file2.close();
|
||||||
// Copy search plugin files (if necessary)
|
// Copy search plugin files (if necessary)
|
||||||
QString filePath = search_dir.absoluteFilePath("nova2.py");
|
QString filePath = search_dir.absoluteFilePath("nova2.py");
|
||||||
if (getPluginVersion(":/"+nova_folder+"/nova2.py") > getPluginVersion(filePath)) {
|
if (getPluginVersion(":/" + nova_folder + "/nova2.py") > getPluginVersion(filePath)) {
|
||||||
removePythonScriptIfExists(filePath);
|
removePythonScriptIfExists(filePath);
|
||||||
QFile::copy(":/"+nova_folder+"/nova2.py", filePath);
|
QFile::copy(":/" + nova_folder + "/nova2.py", filePath);
|
||||||
}
|
}
|
||||||
|
|
||||||
filePath = search_dir.absoluteFilePath("nova2dl.py");
|
filePath = search_dir.absoluteFilePath("nova2dl.py");
|
||||||
if (getPluginVersion(":/"+nova_folder+"/nova2dl.py") > getPluginVersion(filePath)) {
|
if (getPluginVersion(":/" + nova_folder + "/nova2dl.py") > getPluginVersion(filePath)) {
|
||||||
removePythonScriptIfExists(filePath);
|
removePythonScriptIfExists(filePath);
|
||||||
QFile::copy(":/"+nova_folder+"/nova2dl.py", filePath);
|
QFile::copy(":/" + nova_folder + "/nova2dl.py", filePath);
|
||||||
}
|
}
|
||||||
|
|
||||||
filePath = search_dir.absoluteFilePath("novaprinter.py");
|
filePath = search_dir.absoluteFilePath("novaprinter.py");
|
||||||
if (getPluginVersion(":/"+nova_folder+"/novaprinter.py") > getPluginVersion(filePath)) {
|
if (getPluginVersion(":/" + nova_folder + "/novaprinter.py") > getPluginVersion(filePath)) {
|
||||||
removePythonScriptIfExists(filePath);
|
removePythonScriptIfExists(filePath);
|
||||||
QFile::copy(":/"+nova_folder+"/novaprinter.py", filePath);
|
QFile::copy(":/" + nova_folder + "/novaprinter.py", filePath);
|
||||||
}
|
}
|
||||||
|
|
||||||
filePath = search_dir.absoluteFilePath("helpers.py");
|
filePath = search_dir.absoluteFilePath("helpers.py");
|
||||||
if (getPluginVersion(":/"+nova_folder+"/helpers.py") > getPluginVersion(filePath)) {
|
if (getPluginVersion(":/" + nova_folder + "/helpers.py") > getPluginVersion(filePath)) {
|
||||||
removePythonScriptIfExists(filePath);
|
removePythonScriptIfExists(filePath);
|
||||||
QFile::copy(":/"+nova_folder+"/helpers.py", filePath);
|
QFile::copy(":/" + nova_folder + "/helpers.py", filePath);
|
||||||
}
|
}
|
||||||
|
|
||||||
filePath = search_dir.absoluteFilePath("socks.py");
|
filePath = search_dir.absoluteFilePath("socks.py");
|
||||||
removePythonScriptIfExists(filePath);
|
removePythonScriptIfExists(filePath);
|
||||||
QFile::copy(":/"+nova_folder+"/socks.py", filePath);
|
QFile::copy(":/" + nova_folder + "/socks.py", filePath);
|
||||||
|
|
||||||
if (nova_folder == "nova") {
|
if (nova_folder == "nova") {
|
||||||
filePath = search_dir.absoluteFilePath("fix_encoding.py");
|
filePath = search_dir.absoluteFilePath("fix_encoding.py");
|
||||||
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") {
|
else 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__"));
|
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) {
|
||||||
QString shipped_file = shipped_subDir.absoluteFilePath(file);
|
QString shipped_file = shipped_subDir.absoluteFilePath(file);
|
||||||
|
@ -408,13 +423,12 @@ void SearchEngine::updateNova() {
|
||||||
qDebug("%s copied to %s", qPrintable(shipped_file), qPrintable(dest_file));
|
qDebug("%s copied to %s", qPrintable(shipped_file), qPrintable(dest_file));
|
||||||
QFile::copy(shipped_file, dest_file);
|
QFile::copy(shipped_file, dest_file);
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
// Copy icons
|
else {
|
||||||
if (file.endsWith(".png")) {
|
// Copy icons
|
||||||
if (!QFile::exists(destDir.absoluteFilePath(file))) {
|
if (file.endsWith(".png"))
|
||||||
|
if (!QFile::exists(destDir.absoluteFilePath(file)))
|
||||||
QFile::copy(shipped_file, destDir.absoluteFilePath(file));
|
QFile::copy(shipped_file, destDir.absoluteFilePath(file));
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -422,37 +436,37 @@ void SearchEngine::updateNova() {
|
||||||
// Slot called when search is Finished
|
// Slot called when search is Finished
|
||||||
// Search can be finished for 3 reasons :
|
// Search can be finished for 3 reasons :
|
||||||
// Error | Stopped by user | Finished normally
|
// Error | Stopped by user | Finished normally
|
||||||
void SearchEngine::searchFinished(int exitcode, QProcess::ExitStatus) {
|
void SearchEngine::searchFinished(int exitcode, QProcess::ExitStatus)
|
||||||
if (searchTimeout->isActive()) {
|
{
|
||||||
|
if (searchTimeout->isActive())
|
||||||
searchTimeout->stop();
|
searchTimeout->stop();
|
||||||
}
|
|
||||||
bool useNotificationBalloons = Preferences::instance()->useProgramNotification();
|
bool useNotificationBalloons = Preferences::instance()->useProgramNotification();
|
||||||
if (useNotificationBalloons && mp_mainWindow->getCurrentTabWidget() != this) {
|
if (useNotificationBalloons && mp_mainWindow->getCurrentTabWidget() != this)
|
||||||
mp_mainWindow->showNotificationBaloon(tr("Search Engine"), tr("Search has finished"));
|
mp_mainWindow->showNotificationBaloon(tr("Search Engine"), tr("Search has finished"));
|
||||||
}
|
|
||||||
if (exitcode) {
|
if (exitcode) {
|
||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
activeSearchTab->status = tr("Search aborted");
|
activeSearchTab->status = tr("Search aborted");
|
||||||
#else
|
#else
|
||||||
activeSearchTab->status = tr("An error occurred during search...");
|
activeSearchTab->status = tr("An error occurred during search...");
|
||||||
#endif
|
#endif
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
if (search_stopped) {
|
if (search_stopped) {
|
||||||
activeSearchTab->status = tr("Search aborted");
|
activeSearchTab->status = tr("Search aborted");
|
||||||
} else {
|
}
|
||||||
if (no_search_results) {
|
else {
|
||||||
|
if (no_search_results)
|
||||||
activeSearchTab->status = tr("Search returned no results");
|
activeSearchTab->status = tr("Search returned no results");
|
||||||
} else {
|
else
|
||||||
activeSearchTab->status = tr("Search has finished");
|
activeSearchTab->status = tr("Search has finished");
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (activeSearchTab)
|
if (activeSearchTab)
|
||||||
if (currentSearchTab == activeSearchTab) search_status->setText(activeSearchTab->status);
|
if (currentSearchTab == activeSearchTab) search_status->setText(activeSearchTab->status);
|
||||||
activeSearchTab->getCurrentLabel()->setText(tr("Results", "i.e: Search results")+QString::fromUtf8(" <i>(")+QString::number(nb_search_results)+QString::fromUtf8(")</i>:"));
|
activeSearchTab->getCurrentLabel()->setText(tr("Results", "i.e: Search results") + QString::fromUtf8(" <i>(") + QString::number(nb_search_results) + QString::fromUtf8(")</i>:"));
|
||||||
activeSearchTab->isActive = false;
|
activeSearchTab->isActive = false;
|
||||||
activeSearchTab = 0;
|
activeSearchTab = 0;
|
||||||
|
|
||||||
search_button->setText(tr("Search"));
|
search_button->setText(tr("Search"));
|
||||||
}
|
}
|
||||||
|
@ -460,22 +474,20 @@ void SearchEngine::searchFinished(int exitcode, QProcess::ExitStatus) {
|
||||||
// SLOT to append one line to search results list
|
// SLOT to append one line to search results list
|
||||||
// Line is in the following form :
|
// Line is in the following form :
|
||||||
// file url | file name | file size | nb seeds | nb leechers | Search engine url
|
// file url | file name | file size | nb seeds | nb leechers | Search engine url
|
||||||
void SearchEngine::appendSearchResult(const QString &line) {
|
void SearchEngine::appendSearchResult(const QString &line)
|
||||||
|
{
|
||||||
if (!activeSearchTab) {
|
if (!activeSearchTab) {
|
||||||
if (searchProcess->state() != QProcess::NotRunning) {
|
if (searchProcess->state() != QProcess::NotRunning)
|
||||||
searchProcess->terminate();
|
searchProcess->terminate();
|
||||||
}
|
if (searchTimeout->isActive())
|
||||||
if (searchTimeout->isActive()) {
|
|
||||||
searchTimeout->stop();
|
searchTimeout->stop();
|
||||||
}
|
|
||||||
search_stopped = true;
|
search_stopped = true;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const QStringList parts = line.split("|");
|
const QStringList parts = line.split("|");
|
||||||
const int nb_fields = parts.size();
|
const int nb_fields = parts.size();
|
||||||
if (nb_fields < NB_PLUGIN_COLUMNS-1) { //-1 because desc_link is optional
|
if (nb_fields < NB_PLUGIN_COLUMNS - 1) //-1 because desc_link is optional
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
Q_ASSERT(activeSearchTab);
|
Q_ASSERT(activeSearchTab);
|
||||||
// Add item to search result list
|
// Add item to search result list
|
||||||
QStandardItemModel* cur_model = activeSearchTab->getCurrentSearchListModel();
|
QStandardItemModel* cur_model = activeSearchTab->getCurrentSearchListModel();
|
||||||
|
@ -488,17 +500,15 @@ void SearchEngine::appendSearchResult(const QString &line) {
|
||||||
cur_model->setData(cur_model->index(row, SearchSortModel::SIZE), parts.at(PL_SIZE).trimmed().toLongLong()); // Size
|
cur_model->setData(cur_model->index(row, SearchSortModel::SIZE), parts.at(PL_SIZE).trimmed().toLongLong()); // Size
|
||||||
bool ok = false;
|
bool ok = false;
|
||||||
qlonglong nb_seeders = parts.at(PL_SEEDS).trimmed().toLongLong(&ok);
|
qlonglong nb_seeders = parts.at(PL_SEEDS).trimmed().toLongLong(&ok);
|
||||||
if (!ok || nb_seeders < 0) {
|
if (!ok || nb_seeders < 0)
|
||||||
cur_model->setData(cur_model->index(row, SearchSortModel::SEEDS), -1); // Seeders
|
cur_model->setData(cur_model->index(row, SearchSortModel::SEEDS), -1); // Seeders
|
||||||
} else {
|
else
|
||||||
cur_model->setData(cur_model->index(row, SearchSortModel::SEEDS), nb_seeders); // Seeders
|
cur_model->setData(cur_model->index(row, SearchSortModel::SEEDS), nb_seeders); // Seeders
|
||||||
}
|
|
||||||
qlonglong nb_leechers = parts.at(PL_LEECHS).trimmed().toLongLong(&ok);
|
qlonglong nb_leechers = parts.at(PL_LEECHS).trimmed().toLongLong(&ok);
|
||||||
if (!ok || nb_leechers < 0) {
|
if (!ok || nb_leechers < 0)
|
||||||
cur_model->setData(cur_model->index(row, SearchSortModel::LEECHS), -1); // Leechers
|
cur_model->setData(cur_model->index(row, SearchSortModel::LEECHS), -1); // Leechers
|
||||||
} else {
|
else
|
||||||
cur_model->setData(cur_model->index(row, SearchSortModel::LEECHS), nb_leechers); // Leechers
|
cur_model->setData(cur_model->index(row, SearchSortModel::LEECHS), nb_leechers); // Leechers
|
||||||
}
|
|
||||||
cur_model->setData(cur_model->index(row, SearchSortModel::ENGINE_URL), parts.at(PL_ENGINE_URL).trimmed()); // Engine URL
|
cur_model->setData(cur_model->index(row, SearchSortModel::ENGINE_URL), parts.at(PL_ENGINE_URL).trimmed()); // Engine URL
|
||||||
// Description Link
|
// Description Link
|
||||||
if (nb_fields == NB_PLUGIN_COLUMNS)
|
if (nb_fields == NB_PLUGIN_COLUMNS)
|
||||||
|
@ -511,16 +521,15 @@ void SearchEngine::appendSearchResult(const QString &line) {
|
||||||
goToDescBtn->setEnabled(true);
|
goToDescBtn->setEnabled(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void SearchEngine::closeTab(int index) {
|
void SearchEngine::closeTab(int index)
|
||||||
|
{
|
||||||
// Search is run for active tab so if user decided to close it, then stop search
|
// Search is run for active tab so if user decided to close it, then stop search
|
||||||
if (activeSearchTab && index == tabWidget->indexOf(activeSearchTab)) {
|
if (activeSearchTab && index == tabWidget->indexOf(activeSearchTab)) {
|
||||||
qDebug("Closed active search Tab");
|
qDebug("Closed active search Tab");
|
||||||
if (searchProcess->state() != QProcess::NotRunning) {
|
if (searchProcess->state() != QProcess::NotRunning)
|
||||||
searchProcess->terminate();
|
searchProcess->terminate();
|
||||||
}
|
if (searchTimeout->isActive())
|
||||||
if (searchTimeout->isActive()) {
|
|
||||||
searchTimeout->stop();
|
searchTimeout->stop();
|
||||||
}
|
|
||||||
search_stopped = true;
|
search_stopped = true;
|
||||||
if (currentSearchTab == activeSearchTab) currentSearchTab = 0;
|
if (currentSearchTab == activeSearchTab) currentSearchTab = 0;
|
||||||
activeSearchTab = 0;
|
activeSearchTab = 0;
|
||||||
|
@ -533,7 +542,8 @@ void SearchEngine::closeTab(int index) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Download selected items in search results list
|
// Download selected items in search results list
|
||||||
void SearchEngine::on_download_button_clicked() {
|
void SearchEngine::on_download_button_clicked()
|
||||||
|
{
|
||||||
//QModelIndexList selectedIndexes = currentSearchTab->getCurrentTreeView()->selectionModel()->selectedIndexes();
|
//QModelIndexList selectedIndexes = currentSearchTab->getCurrentTreeView()->selectionModel()->selectedIndexes();
|
||||||
QModelIndexList selectedIndexes = all_tab.at(tabWidget->currentIndex())->getCurrentTreeView()->selectionModel()->selectedIndexes();
|
QModelIndexList selectedIndexes = all_tab.at(tabWidget->currentIndex())->getCurrentTreeView()->selectionModel()->selectedIndexes();
|
||||||
foreach (const QModelIndex &index, selectedIndexes) {
|
foreach (const QModelIndex &index, selectedIndexes) {
|
||||||
|
@ -563,7 +573,6 @@ void SearchEngine::on_goToDescBtn_clicked()
|
||||||
|
|
||||||
inline void SearchEngine::allTabsSetActiveState(bool newState)
|
inline void SearchEngine::allTabsSetActiveState(bool newState)
|
||||||
{
|
{
|
||||||
foreach(SearchTab *tab, all_tab) {
|
foreach(SearchTab *tab, all_tab)
|
||||||
tab->isActive = newState;
|
tab->isActive = newState;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue