From 44864be6739609ed55b37298d4f20ba2507d64be Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Sun, 26 Dec 2010 12:32:41 +0000 Subject: [PATCH] Move the nova folder back where it was --- src/searchengine/engineselectdlg.cpp | 2 +- src/searchengine/{nova2 => nova}/__init__.py | 0 .../{nova2 => nova}/engines/__init__.py | 0 .../{nova2 => nova}/engines/btjunkie.png | Bin .../{nova2 => nova}/engines/btjunkie.py | 0 .../{nova2 => nova}/engines/extratorrent.png | Bin .../{nova2 => nova}/engines/extratorrent.py | 0 .../{nova2 => nova}/engines/isohunt.png | Bin .../{nova2 => nova}/engines/isohunt.py | 0 .../engines/kickasstorrents.png | Bin .../engines/kickasstorrents.py | 0 .../{nova2 => nova}/engines/mininova.png | Bin .../{nova2 => nova}/engines/mininova.py | 0 .../{nova2 => nova}/engines/piratebay.png | Bin .../{nova2 => nova}/engines/piratebay.py | 0 .../engines/torrentdownloads.png | Bin .../engines/torrentdownloads.py | 0 .../engines/torrentreactor.png | Bin .../{nova2 => nova}/engines/torrentreactor.py | 0 .../{nova2 => nova}/engines/versions.txt | 0 .../{nova2 => nova}/engines/vertor.png | Bin .../{nova2 => nova}/engines/vertor.py | 0 src/searchengine/{nova2 => nova}/helpers.py | 0 src/searchengine/{nova2 => nova}/nova2.py | 0 src/searchengine/{nova2 => nova}/nova2dl.py | 0 .../{nova2 => nova}/novaprinter.py | 0 src/searchengine/{nova2 => nova}/socks.py | 0 src/searchengine/search.qrc | 46 +++++++++--------- src/searchengine/searchengine.cpp | 20 ++++---- 29 files changed, 34 insertions(+), 34 deletions(-) rename src/searchengine/{nova2 => nova}/__init__.py (100%) rename src/searchengine/{nova2 => nova}/engines/__init__.py (100%) rename src/searchengine/{nova2 => nova}/engines/btjunkie.png (100%) rename src/searchengine/{nova2 => nova}/engines/btjunkie.py (100%) rename src/searchengine/{nova2 => nova}/engines/extratorrent.png (100%) rename src/searchengine/{nova2 => nova}/engines/extratorrent.py (100%) rename src/searchengine/{nova2 => nova}/engines/isohunt.png (100%) rename src/searchengine/{nova2 => nova}/engines/isohunt.py (100%) rename src/searchengine/{nova2 => nova}/engines/kickasstorrents.png (100%) rename src/searchengine/{nova2 => nova}/engines/kickasstorrents.py (100%) rename src/searchengine/{nova2 => nova}/engines/mininova.png (100%) rename src/searchengine/{nova2 => nova}/engines/mininova.py (100%) rename src/searchengine/{nova2 => nova}/engines/piratebay.png (100%) rename src/searchengine/{nova2 => nova}/engines/piratebay.py (100%) rename src/searchengine/{nova2 => nova}/engines/torrentdownloads.png (100%) rename src/searchengine/{nova2 => nova}/engines/torrentdownloads.py (100%) rename src/searchengine/{nova2 => nova}/engines/torrentreactor.png (100%) rename src/searchengine/{nova2 => nova}/engines/torrentreactor.py (100%) rename src/searchengine/{nova2 => nova}/engines/versions.txt (100%) rename src/searchengine/{nova2 => nova}/engines/vertor.png (100%) rename src/searchengine/{nova2 => nova}/engines/vertor.py (100%) rename src/searchengine/{nova2 => nova}/helpers.py (100%) rename src/searchengine/{nova2 => nova}/nova2.py (100%) rename src/searchengine/{nova2 => nova}/nova2dl.py (100%) rename src/searchengine/{nova2 => nova}/novaprinter.py (100%) rename src/searchengine/{nova2 => nova}/socks.py (100%) diff --git a/src/searchengine/engineselectdlg.cpp b/src/searchengine/engineselectdlg.cpp index 61de3eac1..65a8b081d 100644 --- a/src/searchengine/engineselectdlg.cpp +++ b/src/searchengine/engineselectdlg.cpp @@ -44,7 +44,7 @@ #include enum EngineColumns {ENGINE_NAME, ENGINE_URL, ENGINE_STATE, ENGINE_ID}; -#define UPDATE_URL "http://qbittorrent.svn.sourceforge.net/viewvc/qbittorrent/trunk/src/searchengine/nova2/engines/" +#define UPDATE_URL "http://qbittorrent.svn.sourceforge.net/viewvc/qbittorrent/trunk/src/searchengine/nova/engines/" engineSelectDlg::engineSelectDlg(QWidget *parent, SupportedEngines *supported_engines) : QDialog(parent), supported_engines(supported_engines) { setupUi(this); diff --git a/src/searchengine/nova2/__init__.py b/src/searchengine/nova/__init__.py similarity index 100% rename from src/searchengine/nova2/__init__.py rename to src/searchengine/nova/__init__.py diff --git a/src/searchengine/nova2/engines/__init__.py b/src/searchengine/nova/engines/__init__.py similarity index 100% rename from src/searchengine/nova2/engines/__init__.py rename to src/searchengine/nova/engines/__init__.py diff --git a/src/searchengine/nova2/engines/btjunkie.png b/src/searchengine/nova/engines/btjunkie.png similarity index 100% rename from src/searchengine/nova2/engines/btjunkie.png rename to src/searchengine/nova/engines/btjunkie.png diff --git a/src/searchengine/nova2/engines/btjunkie.py b/src/searchengine/nova/engines/btjunkie.py similarity index 100% rename from src/searchengine/nova2/engines/btjunkie.py rename to src/searchengine/nova/engines/btjunkie.py diff --git a/src/searchengine/nova2/engines/extratorrent.png b/src/searchengine/nova/engines/extratorrent.png similarity index 100% rename from src/searchengine/nova2/engines/extratorrent.png rename to src/searchengine/nova/engines/extratorrent.png diff --git a/src/searchengine/nova2/engines/extratorrent.py b/src/searchengine/nova/engines/extratorrent.py similarity index 100% rename from src/searchengine/nova2/engines/extratorrent.py rename to src/searchengine/nova/engines/extratorrent.py diff --git a/src/searchengine/nova2/engines/isohunt.png b/src/searchengine/nova/engines/isohunt.png similarity index 100% rename from src/searchengine/nova2/engines/isohunt.png rename to src/searchengine/nova/engines/isohunt.png diff --git a/src/searchengine/nova2/engines/isohunt.py b/src/searchengine/nova/engines/isohunt.py similarity index 100% rename from src/searchengine/nova2/engines/isohunt.py rename to src/searchengine/nova/engines/isohunt.py diff --git a/src/searchengine/nova2/engines/kickasstorrents.png b/src/searchengine/nova/engines/kickasstorrents.png similarity index 100% rename from src/searchengine/nova2/engines/kickasstorrents.png rename to src/searchengine/nova/engines/kickasstorrents.png diff --git a/src/searchengine/nova2/engines/kickasstorrents.py b/src/searchengine/nova/engines/kickasstorrents.py similarity index 100% rename from src/searchengine/nova2/engines/kickasstorrents.py rename to src/searchengine/nova/engines/kickasstorrents.py diff --git a/src/searchengine/nova2/engines/mininova.png b/src/searchengine/nova/engines/mininova.png similarity index 100% rename from src/searchengine/nova2/engines/mininova.png rename to src/searchengine/nova/engines/mininova.png diff --git a/src/searchengine/nova2/engines/mininova.py b/src/searchengine/nova/engines/mininova.py similarity index 100% rename from src/searchengine/nova2/engines/mininova.py rename to src/searchengine/nova/engines/mininova.py diff --git a/src/searchengine/nova2/engines/piratebay.png b/src/searchengine/nova/engines/piratebay.png similarity index 100% rename from src/searchengine/nova2/engines/piratebay.png rename to src/searchengine/nova/engines/piratebay.png diff --git a/src/searchengine/nova2/engines/piratebay.py b/src/searchengine/nova/engines/piratebay.py similarity index 100% rename from src/searchengine/nova2/engines/piratebay.py rename to src/searchengine/nova/engines/piratebay.py diff --git a/src/searchengine/nova2/engines/torrentdownloads.png b/src/searchengine/nova/engines/torrentdownloads.png similarity index 100% rename from src/searchengine/nova2/engines/torrentdownloads.png rename to src/searchengine/nova/engines/torrentdownloads.png diff --git a/src/searchengine/nova2/engines/torrentdownloads.py b/src/searchengine/nova/engines/torrentdownloads.py similarity index 100% rename from src/searchengine/nova2/engines/torrentdownloads.py rename to src/searchengine/nova/engines/torrentdownloads.py diff --git a/src/searchengine/nova2/engines/torrentreactor.png b/src/searchengine/nova/engines/torrentreactor.png similarity index 100% rename from src/searchengine/nova2/engines/torrentreactor.png rename to src/searchengine/nova/engines/torrentreactor.png diff --git a/src/searchengine/nova2/engines/torrentreactor.py b/src/searchengine/nova/engines/torrentreactor.py similarity index 100% rename from src/searchengine/nova2/engines/torrentreactor.py rename to src/searchengine/nova/engines/torrentreactor.py diff --git a/src/searchengine/nova2/engines/versions.txt b/src/searchengine/nova/engines/versions.txt similarity index 100% rename from src/searchengine/nova2/engines/versions.txt rename to src/searchengine/nova/engines/versions.txt diff --git a/src/searchengine/nova2/engines/vertor.png b/src/searchengine/nova/engines/vertor.png similarity index 100% rename from src/searchengine/nova2/engines/vertor.png rename to src/searchengine/nova/engines/vertor.png diff --git a/src/searchengine/nova2/engines/vertor.py b/src/searchengine/nova/engines/vertor.py similarity index 100% rename from src/searchengine/nova2/engines/vertor.py rename to src/searchengine/nova/engines/vertor.py diff --git a/src/searchengine/nova2/helpers.py b/src/searchengine/nova/helpers.py similarity index 100% rename from src/searchengine/nova2/helpers.py rename to src/searchengine/nova/helpers.py diff --git a/src/searchengine/nova2/nova2.py b/src/searchengine/nova/nova2.py similarity index 100% rename from src/searchengine/nova2/nova2.py rename to src/searchengine/nova/nova2.py diff --git a/src/searchengine/nova2/nova2dl.py b/src/searchengine/nova/nova2dl.py similarity index 100% rename from src/searchengine/nova2/nova2dl.py rename to src/searchengine/nova/nova2dl.py diff --git a/src/searchengine/nova2/novaprinter.py b/src/searchengine/nova/novaprinter.py similarity index 100% rename from src/searchengine/nova2/novaprinter.py rename to src/searchengine/nova/novaprinter.py diff --git a/src/searchengine/nova2/socks.py b/src/searchengine/nova/socks.py similarity index 100% rename from src/searchengine/nova2/socks.py rename to src/searchengine/nova/socks.py diff --git a/src/searchengine/search.qrc b/src/searchengine/search.qrc index e0d334a90..fdb98b369 100644 --- a/src/searchengine/search.qrc +++ b/src/searchengine/search.qrc @@ -1,27 +1,27 @@ - nova2/nova2.py - nova2/novaprinter.py - nova2/socks.py - nova2/nova2dl.py - nova2/helpers.py - nova2/engines/vertor.png - nova2/engines/mininova.png - nova2/engines/mininova.py - nova2/engines/torrentdownloads.png - nova2/engines/isohunt.png - nova2/engines/torrentreactor.py - nova2/engines/btjunkie.png - nova2/engines/piratebay.py - nova2/engines/torrentdownloads.py - nova2/engines/torrentreactor.png - nova2/engines/isohunt.py - nova2/engines/btjunkie.py - nova2/engines/piratebay.png - nova2/engines/vertor.py - nova2/engines/extratorrent.py - nova2/engines/extratorrent.png - nova2/engines/kickasstorrents.png - nova2/engines/kickasstorrents.png + nova/nova2.py + nova/novaprinter.py + nova/socks.py + nova/nova2dl.py + nova/helpers.py + nova/engines/vertor.png + nova/engines/mininova.png + nova/engines/mininova.py + nova/engines/torrentdownloads.png + nova/engines/isohunt.png + nova/engines/torrentreactor.py + nova/engines/btjunkie.png + nova/engines/piratebay.py + nova/engines/torrentdownloads.py + nova/engines/torrentreactor.png + nova/engines/isohunt.py + nova/engines/btjunkie.py + nova/engines/piratebay.png + nova/engines/vertor.py + nova/engines/extratorrent.py + nova/engines/extratorrent.png + nova/engines/kickasstorrents.png + nova/engines/kickasstorrents.png diff --git a/src/searchengine/searchengine.cpp b/src/searchengine/searchengine.cpp index 108d266cc..643df4705 100644 --- a/src/searchengine/searchengine.cpp +++ b/src/searchengine/searchengine.cpp @@ -491,39 +491,39 @@ void SearchEngine::updateNova() { package_file2.close(); // Copy search plugin files (if necessary) QString filePath = search_dir.absoluteFilePath("nova2.py"); - if(getPluginVersion(":/nova2/nova2.py") > getPluginVersion(filePath)) { + if(getPluginVersion(":/nova/nova2.py") > getPluginVersion(filePath)) { if(QFile::exists(filePath)) { misc::safeRemove(filePath); misc::safeRemove(filePath+"c"); } - QFile::copy(":/nova2/nova2.py", filePath); + QFile::copy(":/nova/nova2.py", filePath); } filePath = search_dir.absoluteFilePath("nova2dl.py"); - if(getPluginVersion(":/nova2/nova2dl.py") > getPluginVersion(filePath)) { + if(getPluginVersion(":/nova/nova2dl.py") > getPluginVersion(filePath)) { if(QFile::exists(filePath)){ misc::safeRemove(filePath); misc::safeRemove(filePath+"c"); } - QFile::copy(":/nova2/nova2dl.py", filePath); + QFile::copy(":/nova/nova2dl.py", filePath); } filePath = search_dir.absoluteFilePath("novaprinter.py"); - if(getPluginVersion(":/nova2/novaprinter.py") > getPluginVersion(filePath)) { + if(getPluginVersion(":/nova/novaprinter.py") > getPluginVersion(filePath)) { if(QFile::exists(filePath)){ misc::safeRemove(filePath); misc::safeRemove(filePath+"c"); } - QFile::copy(":/nova2/novaprinter.py", filePath); + QFile::copy(":/nova/novaprinter.py", filePath); } filePath = search_dir.absoluteFilePath("helpers.py"); - if(getPluginVersion(":/nova2/helpers.py") > getPluginVersion(filePath)) { + if(getPluginVersion(":/nova/helpers.py") > getPluginVersion(filePath)) { if(QFile::exists(filePath)){ misc::safeRemove(filePath); misc::safeRemove(filePath+"c"); } - QFile::copy(":/nova2/helpers.py", filePath); + QFile::copy(":/nova/helpers.py", filePath); } filePath = search_dir.absoluteFilePath("socks.py"); @@ -531,9 +531,9 @@ void SearchEngine::updateNova() { misc::safeRemove(filePath); misc::safeRemove(filePath+"c"); } - QFile::copy(":/nova2/socks.py", filePath); + QFile::copy(":/nova/socks.py", filePath); QDir destDir(QDir(misc::searchEngineLocation()).absoluteFilePath("engines")); - QDir shipped_subDir(":/nova2/engines/"); + QDir shipped_subDir(":/nova/engines/"); QStringList files = shipped_subDir.entryList(); foreach(const QString &file, files){ QString shipped_file = shipped_subDir.absoluteFilePath(file);