Merge lp:~osomon/webbrowser-app/cache-deleter-update into lp:webbrowser-app

[Olivier Tilloy]

Actually clear the network cache by deleting the correct set of files in the correct directory.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1036
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1837/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3012/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/594/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/594/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/594/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3010/console

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/webbrowser/SettingsPage.qml'
--- src/app/webbrowser/SettingsPage.qml	2015-05-22 19:20:27 +0000
+++ src/app/webbrowser/SettingsPage.qml	2015-05-29 08:47:28 +0000
@@ -256,7 +256,7 @@
                             text: i18n.tr("Clear Cache")
                             onClicked: {
                                 enabled = false
-                                CacheDeleter.clear(cacheLocation + "/Cache", function() { enabled = true })
+                                CacheDeleter.clear(cacheLocation + "/Cache2", function() { enabled = true })
                             }
                         }
                     }

=== modified file 'src/app/webbrowser/cache-deleter.cpp'
--- src/app/webbrowser/cache-deleter.cpp	2015-03-12 19:07:29 +0000
+++ src/app/webbrowser/cache-deleter.cpp	2015-05-29 08:47:28 +0000
@@ -60,16 +60,22 @@
  */
 void CacheDeleter::doClear(const QString& cachePath)
 {
-    // This assumes the cache is using chromium’s blockfile backend
-    // TODO: if oxide switches to using the simple backend
-    //  (https://launchpad.net/bugs/1430349), this will need updating
-    //  to remove a different set of files.
-    QStringList nameFilters = QStringList() << "data_*" << "f_*";
+    // This assumes the cache is using chromium’s simple cache backend.
+    QStringList nameFilters = QStringList()
+            << "0*" << "1*" << "2*" << "3*" << "4*" << "5*" << "6*" << "7*"
+            << "8*" << "9*" << "a*" << "b*" << "c*" << "d*" << "e*" << "f*"
+            << "index";
     QDir::Filters filters = QDir::Files | QDir::NoDotAndDotDot;
     QFileInfoList files = QDir(cachePath).entryInfoList(nameFilters, filters);
     Q_FOREACH(const QFileInfo& file, files) {
         QFile::remove(file.absoluteFilePath());
     }
+
+    nameFilters = QStringList() << "the-real-index";
+    files = QDir(cachePath + "/index-dir").entryInfoList(nameFilters, filters);
+    Q_FOREACH(const QFileInfo& file, files) {
+        QFile::remove(file.absoluteFilePath());
+    }
 }
 
 void CacheDeleter::onCleared()