Added option for disk cache use

src/networkaccessmanager.cpp

@@ -31,16 +31,29 @@
 #include <QNetworkRequest>
 #include <QList>
 #include <QNetworkReply>
+#include <QDesktopServices>
+#include <QNetworkDiskCache>
 
 #include "networkaccessmanager.h"
 
 // public:
-NetworkAccessManager::NetworkAccessManager(QObject *parent)
-    : QNetworkAccessManager(parent)
+NetworkAccessManager::NetworkAccessManager(QObject *parent, bool diskCacheEnabled)
+    : QNetworkAccessManager(parent), m_networkDiskCache(0)
 {
+    if (diskCacheEnabled) {
+        m_networkDiskCache = new QNetworkDiskCache();
+        m_networkDiskCache->setCacheDirectory(QDesktopServices::storageLocation(QDesktopServices::CacheLocation));
+        setCache(m_networkDiskCache);
+    }
     connect(this, SIGNAL(finished(QNetworkReply*)), SLOT(handleFinished(QNetworkReply*)));
 }
 
+NetworkAccessManager::~NetworkAccessManager()
+{
+    if (m_networkDiskCache)
+        delete m_networkDiskCache;
+}
+
 // protected:
 QNetworkReply *NetworkAccessManager::createRequest(Operation op, const QNetworkRequest & req, QIODevice * outgoingData)
 {

src/networkaccessmanager.h

@@ -32,11 +32,15 @@
 
 #include <QNetworkAccessManager>
 
+class QNetworkDiskCache;
+
 class NetworkAccessManager : public QNetworkAccessManager
 {
     Q_OBJECT
+    QNetworkDiskCache* m_networkDiskCache;
 public:
-    NetworkAccessManager(QObject *parent = 0);
+    NetworkAccessManager(QObject *parent = 0, bool diskCacheEnabled = false);
+    virtual ~NetworkAccessManager();
 
 protected:
     QNetworkReply *createRequest(Operation op, const QNetworkRequest & req, QIODevice * outgoingData = 0);

src/phantom.cpp

@@ -63,6 +63,7 @@ Phantom::Phantom(QObject *parent)
 
     bool autoLoadImages = true;
     bool pluginsEnabled = false;
+    bool diskCacheEnabled = false;
 
     // second argument: script name
     QStringList args = QApplication::arguments();
@@ -98,6 +99,14 @@ Phantom::Phantom(QObject *parent)
             pluginsEnabled = false;
             continue;
         }
+        if (arg == "--disk-cache=yes") {
+            diskCacheEnabled = true;
+            continue;
+        }
+        if (arg == "--disk-cache=no") {
+            diskCacheEnabled = false;
+            continue;
+        }
         if (arg.startsWith("--proxy=")) {
             m_proxyHost = arg.mid(8).trimmed();
             if (m_proxyHost.lastIndexOf(':') > 0) {
@@ -139,7 +148,7 @@ Phantom::Phantom(QObject *parent)
     }
 
     // Provide WebPage with a non-standard Network Access Manager
-    m_netAccessMan = new NetworkAccessManager(this);
+    m_netAccessMan = new NetworkAccessManager(this, diskCacheEnabled);
     m_page.setNetworkAccessManager(m_netAccessMan);
 
     connect(m_page.mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), SLOT(inject()));

src/usage.txt

@@ -7,4 +7,4 @@ Options:
     --proxy=address:port               Set the network proxy.
     --upload-file fileId=/file/path    Upload a file by creating a '<input type="file" id="foo" />'
                                        and calling phantom.setFormInputFile(document.getElementById('foo'), 'fileId').
-
+    --disk-cache=[yes|no]              Enable disk cache (at desktop services cache storage location, default is 'no').