Browse Source

Move the nova folder back where it was

adaptive-webui-19844
Christophe Dumez 14 years ago
parent
commit
44864be673
  1. 2
      src/searchengine/engineselectdlg.cpp
  2. 0
      src/searchengine/nova/__init__.py
  3. 0
      src/searchengine/nova/engines/__init__.py
  4. 0
      src/searchengine/nova/engines/btjunkie.png
  5. 0
      src/searchengine/nova/engines/btjunkie.py
  6. 0
      src/searchengine/nova/engines/extratorrent.png
  7. 0
      src/searchengine/nova/engines/extratorrent.py
  8. 0
      src/searchengine/nova/engines/isohunt.png
  9. 0
      src/searchengine/nova/engines/isohunt.py
  10. 0
      src/searchengine/nova/engines/kickasstorrents.png
  11. 0
      src/searchengine/nova/engines/kickasstorrents.py
  12. 0
      src/searchengine/nova/engines/mininova.png
  13. 0
      src/searchengine/nova/engines/mininova.py
  14. 0
      src/searchengine/nova/engines/piratebay.png
  15. 0
      src/searchengine/nova/engines/piratebay.py
  16. 0
      src/searchengine/nova/engines/torrentdownloads.png
  17. 0
      src/searchengine/nova/engines/torrentdownloads.py
  18. 0
      src/searchengine/nova/engines/torrentreactor.png
  19. 0
      src/searchengine/nova/engines/torrentreactor.py
  20. 0
      src/searchengine/nova/engines/versions.txt
  21. 0
      src/searchengine/nova/engines/vertor.png
  22. 0
      src/searchengine/nova/engines/vertor.py
  23. 0
      src/searchengine/nova/helpers.py
  24. 0
      src/searchengine/nova/nova2.py
  25. 0
      src/searchengine/nova/nova2dl.py
  26. 0
      src/searchengine/nova/novaprinter.py
  27. 0
      src/searchengine/nova/socks.py
  28. 46
      src/searchengine/search.qrc
  29. 20
      src/searchengine/searchengine.cpp

2
src/searchengine/engineselectdlg.cpp

@ -44,7 +44,7 @@
#include <QTemporaryFile> #include <QTemporaryFile>
enum EngineColumns {ENGINE_NAME, ENGINE_URL, ENGINE_STATE, ENGINE_ID}; 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) { engineSelectDlg::engineSelectDlg(QWidget *parent, SupportedEngines *supported_engines) : QDialog(parent), supported_engines(supported_engines) {
setupUi(this); setupUi(this);

0
src/searchengine/nova2/__init__.py → src/searchengine/nova/__init__.py

0
src/searchengine/nova2/engines/__init__.py → src/searchengine/nova/engines/__init__.py

0
src/searchengine/nova2/engines/btjunkie.png → src/searchengine/nova/engines/btjunkie.png

Before

Width:  |  Height:  |  Size: 622 B

After

Width:  |  Height:  |  Size: 622 B

0
src/searchengine/nova2/engines/btjunkie.py → src/searchengine/nova/engines/btjunkie.py

0
src/searchengine/nova2/engines/extratorrent.png → src/searchengine/nova/engines/extratorrent.png

Before

Width:  |  Height:  |  Size: 605 B

After

Width:  |  Height:  |  Size: 605 B

0
src/searchengine/nova2/engines/extratorrent.py → src/searchengine/nova/engines/extratorrent.py

0
src/searchengine/nova2/engines/isohunt.png → src/searchengine/nova/engines/isohunt.png

Before

Width:  |  Height:  |  Size: 633 B

After

Width:  |  Height:  |  Size: 633 B

0
src/searchengine/nova2/engines/isohunt.py → src/searchengine/nova/engines/isohunt.py

0
src/searchengine/nova2/engines/kickasstorrents.png → src/searchengine/nova/engines/kickasstorrents.png

Before

Width:  |  Height:  |  Size: 787 B

After

Width:  |  Height:  |  Size: 787 B

0
src/searchengine/nova2/engines/kickasstorrents.py → src/searchengine/nova/engines/kickasstorrents.py

0
src/searchengine/nova2/engines/mininova.png → src/searchengine/nova/engines/mininova.png

Before

Width:  |  Height:  |  Size: 365 B

After

Width:  |  Height:  |  Size: 365 B

0
src/searchengine/nova2/engines/mininova.py → src/searchengine/nova/engines/mininova.py

0
src/searchengine/nova2/engines/piratebay.png → src/searchengine/nova/engines/piratebay.png

Before

Width:  |  Height:  |  Size: 609 B

After

Width:  |  Height:  |  Size: 609 B

0
src/searchengine/nova2/engines/piratebay.py → src/searchengine/nova/engines/piratebay.py

0
src/searchengine/nova2/engines/torrentdownloads.png → src/searchengine/nova/engines/torrentdownloads.png

Before

Width:  |  Height:  |  Size: 423 B

After

Width:  |  Height:  |  Size: 423 B

0
src/searchengine/nova2/engines/torrentdownloads.py → src/searchengine/nova/engines/torrentdownloads.py

0
src/searchengine/nova2/engines/torrentreactor.png → src/searchengine/nova/engines/torrentreactor.png

Before

Width:  |  Height:  |  Size: 529 B

After

Width:  |  Height:  |  Size: 529 B

0
src/searchengine/nova2/engines/torrentreactor.py → src/searchengine/nova/engines/torrentreactor.py

0
src/searchengine/nova2/engines/versions.txt → src/searchengine/nova/engines/versions.txt

0
src/searchengine/nova2/engines/vertor.png → src/searchengine/nova/engines/vertor.png

Before

Width:  |  Height:  |  Size: 643 B

After

Width:  |  Height:  |  Size: 643 B

0
src/searchengine/nova2/engines/vertor.py → src/searchengine/nova/engines/vertor.py

0
src/searchengine/nova2/helpers.py → src/searchengine/nova/helpers.py

0
src/searchengine/nova2/nova2.py → src/searchengine/nova/nova2.py

0
src/searchengine/nova2/nova2dl.py → src/searchengine/nova/nova2dl.py

0
src/searchengine/nova2/novaprinter.py → src/searchengine/nova/novaprinter.py

0
src/searchengine/nova2/socks.py → src/searchengine/nova/socks.py

46
src/searchengine/search.qrc

@ -1,27 +1,27 @@
<!DOCTYPE RCC><RCC version="1.0"> <!DOCTYPE RCC><RCC version="1.0">
<qresource> <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> </qresource>
</RCC> </RCC>

20
src/searchengine/searchengine.cpp

@ -491,39 +491,39 @@ 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(":/nova2/nova2.py") > getPluginVersion(filePath)) { if(getPluginVersion(":/nova/nova2.py") > getPluginVersion(filePath)) {
if(QFile::exists(filePath)) { if(QFile::exists(filePath)) {
misc::safeRemove(filePath); misc::safeRemove(filePath);
misc::safeRemove(filePath+"c"); misc::safeRemove(filePath+"c");
} }
QFile::copy(":/nova2/nova2.py", filePath); QFile::copy(":/nova/nova2.py", filePath);
} }
filePath = search_dir.absoluteFilePath("nova2dl.py"); filePath = search_dir.absoluteFilePath("nova2dl.py");
if(getPluginVersion(":/nova2/nova2dl.py") > getPluginVersion(filePath)) { if(getPluginVersion(":/nova/nova2dl.py") > getPluginVersion(filePath)) {
if(QFile::exists(filePath)){ if(QFile::exists(filePath)){
misc::safeRemove(filePath); misc::safeRemove(filePath);
misc::safeRemove(filePath+"c"); misc::safeRemove(filePath+"c");
} }
QFile::copy(":/nova2/nova2dl.py", filePath); QFile::copy(":/nova/nova2dl.py", filePath);
} }
filePath = search_dir.absoluteFilePath("novaprinter.py"); filePath = search_dir.absoluteFilePath("novaprinter.py");
if(getPluginVersion(":/nova2/novaprinter.py") > getPluginVersion(filePath)) { if(getPluginVersion(":/nova/novaprinter.py") > getPluginVersion(filePath)) {
if(QFile::exists(filePath)){ if(QFile::exists(filePath)){
misc::safeRemove(filePath); misc::safeRemove(filePath);
misc::safeRemove(filePath+"c"); misc::safeRemove(filePath+"c");
} }
QFile::copy(":/nova2/novaprinter.py", filePath); QFile::copy(":/nova/novaprinter.py", filePath);
} }
filePath = search_dir.absoluteFilePath("helpers.py"); filePath = search_dir.absoluteFilePath("helpers.py");
if(getPluginVersion(":/nova2/helpers.py") > getPluginVersion(filePath)) { if(getPluginVersion(":/nova/helpers.py") > getPluginVersion(filePath)) {
if(QFile::exists(filePath)){ if(QFile::exists(filePath)){
misc::safeRemove(filePath); misc::safeRemove(filePath);
misc::safeRemove(filePath+"c"); misc::safeRemove(filePath+"c");
} }
QFile::copy(":/nova2/helpers.py", filePath); QFile::copy(":/nova/helpers.py", filePath);
} }
filePath = search_dir.absoluteFilePath("socks.py"); filePath = search_dir.absoluteFilePath("socks.py");
@ -531,9 +531,9 @@ void SearchEngine::updateNova() {
misc::safeRemove(filePath); misc::safeRemove(filePath);
misc::safeRemove(filePath+"c"); misc::safeRemove(filePath+"c");
} }
QFile::copy(":/nova2/socks.py", filePath); QFile::copy(":/nova/socks.py", filePath);
QDir destDir(QDir(misc::searchEngineLocation()).absoluteFilePath("engines")); QDir destDir(QDir(misc::searchEngineLocation()).absoluteFilePath("engines"));
QDir shipped_subDir(":/nova2/engines/"); QDir shipped_subDir(":/nova/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);

Loading…
Cancel
Save