Merge lp:~osomon/webbrowser-app/cacheLocation into lp:webbrowser-app

[Olivier Tilloy]

Specify the cache path on the web context, to avoid caching data under ~/.local/share/.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:911
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1487/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1496
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/245
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/245
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/245/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/245/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1328
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1494
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1494/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18293

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1487/rebuild

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

What about existing cache data in .local/share? How will users get rid of that?

[Olivier Tilloy (osomon)]

Good point, I’ll add some code to purge it on startup.

[lp:~osomon/webbrowser-app/cacheLocation]

912. By Olivier Tilloy on 2015-02-26

Purge the old cache data that was previously written to the data location.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:912
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1494/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1547
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/252
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/252
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/252/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/252
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1377
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1545
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1545/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18372

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1494/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:912
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1495/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1548
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/253
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/253
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/253/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/253
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1378
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1546
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1546/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18376

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1495/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:912
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1496/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1549
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/254
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/254
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/254/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/254
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1379
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1547
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1547/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18378

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1496/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/Ubuntu/Web/UbuntuWebContext.qml'
--- src/Ubuntu/Web/UbuntuWebContext.qml	2014-11-28 17:49:22 +0000
+++ src/Ubuntu/Web/UbuntuWebContext.qml	2015-02-26 10:13:52 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -22,6 +22,7 @@
 Oxide.WebContext {
     readonly property string defaultUserAgent: __ua.defaultUA
 
+    cachePath: cacheLocation
     dataPath: dataLocation
     userAgent: defaultUserAgent
 

=== modified file 'src/Ubuntu/Web/plugin.cpp'
--- src/Ubuntu/Web/plugin.cpp	2014-11-26 10:38:23 +0000
+++ src/Ubuntu/Web/plugin.cpp	2015-02-26 10:13:52 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -34,6 +34,7 @@
 {
     Q_OBJECT
 
+    Q_PROPERTY(QString cacheLocation READ cacheLocation NOTIFY cacheLocationChanged)
     Q_PROPERTY(QString dataLocation READ dataLocation NOTIFY dataLocationChanged)
     Q_PROPERTY(QString formFactor READ formFactor CONSTANT)
     Q_PROPERTY(QString webviewDevtoolsDebugHost READ devtoolsHost CONSTANT)
@@ -43,6 +44,7 @@
 public:
     UbuntuWebPluginContext(QObject* parent = 0);
 
+    QString cacheLocation() const;
     QString dataLocation() const;
     QString formFactor();
     QString devtoolsHost();
@@ -50,6 +52,7 @@
     QStringList hostMappingRules();
 
 Q_SIGNALS:
+    void cacheLocationChanged() const;
     void dataLocationChanged() const;
 
 private:
@@ -66,14 +69,29 @@
     , m_hostMappingRulesQueried(false)
 {
     connect(QCoreApplication::instance(), SIGNAL(applicationNameChanged()),
+            this, SIGNAL(cacheLocationChanged()));
+    connect(QCoreApplication::instance(), SIGNAL(applicationNameChanged()),
             this, SIGNAL(dataLocationChanged()));
 }
 
+QString UbuntuWebPluginContext::cacheLocation() const
+{
+    QDir location(QStandardPaths::writableLocation(QStandardPaths::CacheLocation));
+    if (!location.exists()) {
+        QDir::root().mkpath(location.absolutePath());
+    }
+    return location.absolutePath();
+}
+
 QString UbuntuWebPluginContext::dataLocation() const
 {
     QDir location(QStandardPaths::writableLocation(QStandardPaths::DataLocation));
     if (!location.exists()) {
         QDir::root().mkpath(location.absolutePath());
+    } else {
+        // Prior to fixing https://launchpad.net/bugs/1424726, chromium’s cache
+        // data was written to the data location. Purge the old cache data.
+        QDir(location.absoluteFilePath("Cache")).removeRecursively();
     }
     return location.absolutePath();
 }