Merge lp:~stolowski/unity-scope-click/clear-cache-on-lang-change into lp:unity-scope-click

[Paweł Stołowski]

Clear network cache if language was changed

Clear network cache if language was changed

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:446
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/738/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/142/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/138/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/738/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:447
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/739/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/143/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/139/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/739/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:449
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/740/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/144/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/140/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/740/rebuild

review: Needs Fixing (continuous-integration)

[dobey (dobey)]

review: Approve

=== modified file 'libclickscope/click/network_access_manager.cpp'
--- libclickscope/click/network_access_manager.cpp	2016-05-06 14:29:42 +0000
+++ libclickscope/click/network_access_manager.cpp	2016-05-06 14:29:42 +0000
@@ -30,9 +30,12 @@
 #include "network_access_manager.h"
 #include <QNetworkDiskCache>
 #include <QStandardPaths>
+#include <click/configuration.h>
+#include <fstream>
+#include <sstream>
+#include <iostream>
 #include <QDateTime>
 #include <time.h>
-#include <iostream>
 
 click::network::Reply::Reply(QNetworkReply* reply, int id) : reply(reply)
 {
@@ -112,6 +115,7 @@
 
 namespace
 {
+
 QNetworkAccessManager& networkAccessManagerInstance()
 {
     static QNetworkAccessManager nam;
@@ -120,11 +124,43 @@
         QNetworkDiskCache* cache = new QNetworkDiskCache(&nam);
         cache->setCacheDirectory(QString("%1/unity-scope-click/network").arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)));
         nam.setCache(cache);
+
+        // FIXME: workaround for https://bugreports.qt.io/browse/QTBUG-14750 (no support for Vary header),
+        // should be removed once Qt network cache implements it.
+        if (click::network::AccessManager::languageChanged()) {
+            qDebug() << "Language change detected, clearing network cache";
+            nam.cache()->clear();
+        }
     }
     return nam;
 }
 }
 
+bool click::network::AccessManager::languageChanged()
+{
+    const QString langFilePath = QString("%1/unity-scope-click/language").arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation));
+    std::string lastLanguage;
+    {
+        std::ifstream lastLanguageFile(langFilePath.toStdString());
+        if (lastLanguageFile) {
+            std::stringstream ss;
+            ss << lastLanguageFile.rdbuf();
+            lastLanguage = ss.str();
+        }
+    }
+
+    auto const langs = Configuration().get_accept_languages();
+    if (lastLanguage != langs) {
+        std::ofstream lastLanguageFile(langFilePath.toStdString(), std::ios::out|std::ios::trunc);
+        lastLanguageFile << langs;
+        if (!lastLanguageFile) {
+            qWarning() << "Failed to write language file";
+        }
+        return true;
+    }
+    return false;
+}
+
 static int request_id = static_cast<int>(time(nullptr)); // this ensures request ids will be unique even if scope is restarted
 
 QSharedPointer<click::network::Reply> click::network::AccessManager::get(QNetworkRequest& request)
@@ -162,3 +198,4 @@
 #endif
     return QSharedPointer<click::network::Reply>(new click::network::Reply(networkAccessManagerInstance().sendCustomRequest(request, verb, data), id));
 }
+

=== modified file 'libclickscope/click/network_access_manager.h'
--- libclickscope/click/network_access_manager.h	2016-05-06 14:29:42 +0000
+++ libclickscope/click/network_access_manager.h	2016-05-06 14:29:42 +0000
@@ -93,6 +93,7 @@
     virtual QSharedPointer<Reply> head(QNetworkRequest& request);
     virtual QSharedPointer<Reply> post(QNetworkRequest& request, QByteArray& data);
     virtual QSharedPointer<Reply> sendCustomRequest(QNetworkRequest& request, QByteArray& verb, QIODevice *data = 0);
+    static bool languageChanged();
 };
 }
 }