Move the nova folder back where it was

src/searchengine/engineselectdlg.cpp

@@ -44,7 +44,7 @@
 #include <QTemporaryFile>
 
 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);

src/searchengine/search.qrc

@@ -1,27 +1,27 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-  <file>nova2/nova2.py</file>
+  <file>nova/nova2.py</file>
-  <file>nova2/novaprinter.py</file>
+  <file>nova/novaprinter.py</file>
-  <file>nova2/socks.py</file>
+  <file>nova/socks.py</file>
-  <file>nova2/nova2dl.py</file>
+  <file>nova/nova2dl.py</file>
-  <file>nova2/helpers.py</file>
+  <file>nova/helpers.py</file>
-  <file>nova2/engines/vertor.png</file>
+  <file>nova/engines/vertor.png</file>
-  <file>nova2/engines/mininova.png</file>
+  <file>nova/engines/mininova.png</file>
-  <file>nova2/engines/mininova.py</file>
+  <file>nova/engines/mininova.py</file>
-  <file>nova2/engines/torrentdownloads.png</file>
+  <file>nova/engines/torrentdownloads.png</file>
-  <file>nova2/engines/isohunt.png</file>
+  <file>nova/engines/isohunt.png</file>
-  <file>nova2/engines/torrentreactor.py</file>
+  <file>nova/engines/torrentreactor.py</file>
-  <file>nova2/engines/btjunkie.png</file>
+  <file>nova/engines/btjunkie.png</file>
-  <file>nova2/engines/piratebay.py</file>
+  <file>nova/engines/piratebay.py</file>
-  <file>nova2/engines/torrentdownloads.py</file>
+  <file>nova/engines/torrentdownloads.py</file>
-  <file>nova2/engines/torrentreactor.png</file>
+  <file>nova/engines/torrentreactor.png</file>
-  <file>nova2/engines/isohunt.py</file>
+  <file>nova/engines/isohunt.py</file>
-  <file>nova2/engines/btjunkie.py</file>
+  <file>nova/engines/btjunkie.py</file>
-  <file>nova2/engines/piratebay.png</file>
+  <file>nova/engines/piratebay.png</file>
-  <file>nova2/engines/vertor.py</file>
+  <file>nova/engines/vertor.py</file>
-  <file>nova2/engines/extratorrent.py</file>
+  <file>nova/engines/extratorrent.py</file>
-  <file>nova2/engines/extratorrent.png</file>
+  <file>nova/engines/extratorrent.png</file>
-  <file>nova2/engines/kickasstorrents.png</file>
+  <file>nova/engines/kickasstorrents.png</file>
-  <file>nova2/engines/kickasstorrents.png</file>
+  <file>nova/engines/kickasstorrents.png</file>
 </qresource>
 </RCC>

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);