Merge lp:~saviq/unity8/cache-network-data into lp:unity8

[Michał Sawicz]

Implement a caching network access manager to cache images.

It's the first step to improving our network usage and dash icon loading speed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:918
http://jenkins.qa.ubuntu.com/job/unity8-ci/3051/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/494
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/89
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/145
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/145
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/145/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/145
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/943
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/962
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/962/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7775

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3051/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:918
http://jenkins.qa.ubuntu.com/job/unity8-ci/3092/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/655/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/130/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/186/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/186/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/186/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1252/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3092/rebuild

review: Needs Fixing (continuous-integration)

[lp:~saviq/unity8/cache-network-data]

919. By Michał Sawicz on 2014-06-04

Merge trunk.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:919
http://jenkins.qa.ubuntu.com/job/unity8-ci/3094/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/658
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/188
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/188
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/188/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/188
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1090
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1256
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1256/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8066

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3094/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-03-07 18:36:53 +0000
+++ src/CMakeLists.txt	2014-06-04 11:13:15 +0000
@@ -19,6 +19,7 @@
     ApplicationArguments.h
     main.cpp
     MouseTouchAdaptor.cpp
+    CachingNetworkManagerFactory.cpp
     ${QML_FILES} # This is to make qml and image files appear in the IDE's project tree
     )
 add_executable(${SHELL_APP} ${COMMON_SRCS})

=== added file 'src/CachingNetworkManagerFactory.cpp'
--- src/CachingNetworkManagerFactory.cpp	1970-01-01 00:00:00 +0000
+++ src/CachingNetworkManagerFactory.cpp	2014-06-04 11:13:15 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "CachingNetworkManagerFactory.h"
+
+#include <QNetworkDiskCache>
+#include <QNetworkAccessManager>
+#include <QStandardPaths>
+
+CachingNetworkManagerFactory::CachingNetworkManagerFactory()
+    : m_cache(new QNetworkDiskCache())
+{
+    m_cache->setCacheDirectory(QString("%1/network").arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)));
+}
+
+QNetworkAccessManager *CachingNetworkManagerFactory::create(QObject *parent) {
+    QNetworkAccessManager *manager = new QNetworkAccessManager(parent);
+    manager->setCache(m_cache);
+    return manager;
+}

=== added file 'src/CachingNetworkManagerFactory.h'
--- src/CachingNetworkManagerFactory.h	1970-01-01 00:00:00 +0000
+++ src/CachingNetworkManagerFactory.h	2014-06-04 11:13:15 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef CACHINGNETWORKMANAGERFACTORY_H
+#define CACHINGNETWORKMANAGERFACTORY_H
+
+#include <QQmlNetworkAccessManagerFactory>
+
+class QNetworkDiskCache;
+class QNetworkAccessManager;
+
+class CachingNetworkManagerFactory : public QQmlNetworkAccessManagerFactory
+{
+public:
+    CachingNetworkManagerFactory();
+
+    QNetworkAccessManager *create(QObject *parent) override;
+
+private:
+    QNetworkDiskCache *m_cache;
+};
+
+#endif // CACHINGNETWORKMANAGERFACTORY_H

=== modified file 'src/main.cpp'
--- src/main.cpp	2014-05-20 03:01:51 +0000
+++ src/main.cpp	2014-06-04 11:13:15 +0000
@@ -35,15 +35,15 @@
 #include <paths.h>
 #include "MouseTouchAdaptor.h"
 #include "ApplicationArguments.h"
+#include "CachingNetworkManagerFactory.h"
 
 #include <unity-mir/qmirserver.h>
 
-
 int startShell(int argc, const char** argv, void* server)
 {
     const bool isUbuntuMirServer = qgetenv("QT_QPA_PLATFORM") == "ubuntumirserver";
 
-    QGuiApplication::setApplicationName(UNITY8_GREETER ? "Unity 8 Greeter" : "Unity 8");
+    QGuiApplication::setApplicationName(UNITY8_GREETER ? "unity8-greeter" : "unity8");
     QGuiApplication *application;
 
     QCommandLineParser parser;
@@ -160,6 +160,9 @@
     }
     appendImportPaths(view->engine(), ::fallbackImportPaths());
 
+    CachingNetworkManagerFactory *managerFactory = new CachingNetworkManagerFactory();
+    view->engine()->setNetworkAccessManagerFactory(managerFactory);
+
     view->setSource(source);
     view->setColor(Qt::transparent);