Merge lp:~osomon/webbrowser-app/favicon-optimizations into lp:webbrowser-app

[Olivier Tilloy]

Various favicon optimizations.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1468
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/507/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/509
    FAILURE: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/45/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/509
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/502
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/502
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/497
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/497/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/497
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/497/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/497
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/497/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/497
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/497/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/497
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/497/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/497
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/497/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/507/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/Favicon.qml'
--- src/app/Favicon.qml	2015-08-10 15:22:00 +0000
+++ src/app/Favicon.qml	2016-05-27 15:37:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 Canonical Ltd.
+ * Copyright 2014-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -21,7 +21,9 @@
 import webbrowsercommon.private 0.1
 
 Item {
-    property alias source: fetcher.url
+    id: favicon
+
+    property url source
     property bool fallbackIcon: true
     property alias shouldCache: fetcher.shouldCache
 
@@ -36,6 +38,7 @@
 
     FaviconFetcher {
         id: fetcher
+        url: favicon.visible ? favicon.source : ""
     }
 
     Icon {

=== modified file 'src/app/favicon-fetcher.cpp'
--- src/app/favicon-fetcher.cpp	2015-09-21 19:41:22 +0000
+++ src/app/favicon-fetcher.cpp	2016-05-27 15:37:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 Canonical Ltd.
+ * Copyright 2014-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -96,7 +96,9 @@
 
         QFileInfo fileinfo(m_filepath);
         if (fileinfo.exists() && (fileinfo.lastModified().daysTo(QDateTime::currentDateTime()) < CACHE_EXPIRATION_DAYS)) {
-            setLocalUrl(QUrl::fromLocalFile(m_filepath));
+            if (fileinfo.size() > 0) {
+                setLocalUrl(QUrl::fromLocalFile(m_filepath));
+            }
         } else {
             m_redirections = 0;
             download(url);
@@ -150,6 +152,13 @@
     m_reply = m_manager->get(request);
 }
 
+void FaviconFetcher::cacheEmptyFile() const
+{
+    // Write an empty file to the cache to avoid subsequent attempts
+    // to download an inexistent icon over and over again.
+    QFile(m_filepath).open(QIODevice::WriteOnly);
+}
+
 void FaviconFetcher::downloadFinished(QNetworkReply* reply)
 {
     if (reply->error() == QNetworkReply::OperationCanceledError) {
@@ -171,6 +180,8 @@
                     setLocalUrl(QUrl("data:image/png;base64," + ba.toBase64()));
                 }
             }
+        } else {
+            cacheEmptyFile();
         }
         reply->deleteLater();
         m_reply = 0;
@@ -185,6 +196,7 @@
             qWarning() << "Failed to download"
                        << m_url.toString().toUtf8().data()
                        << ": too many redirections";
+            cacheEmptyFile();
         }
     }
 }

=== modified file 'src/app/favicon-fetcher.h'
--- src/app/favicon-fetcher.h	2015-05-26 21:42:54 +0000
+++ src/app/favicon-fetcher.h	2016-05-27 15:37:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 Canonical Ltd.
+ * Copyright 2014-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -62,6 +62,7 @@
 
 private:
     void setLocalUrl(const QUrl& url);
+    void cacheEmptyFile() const;
 
     bool m_shouldCache;
     QString m_cacheLocation;

=== modified file 'tests/unittests/favicon-fetcher/tst_FaviconFetcherTests.cpp'
--- tests/unittests/favicon-fetcher/tst_FaviconFetcherTests.cpp	2015-10-07 17:49:58 +0000
+++ tests/unittests/favicon-fetcher/tst_FaviconFetcherTests.cpp	2016-05-27 15:37:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 Canonical Ltd.
+ * Copyright 2014-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -193,7 +193,7 @@
         QCOMPARE(cache.count(), (uint) 0);
     }
 
-    void shouldNotCacheInvalidIcon()
+    void shouldFailToDownloadInvalidIcon()
     {
         // First fetch a valid icon to ensure localUrl is initially not empty
         QUrl url(server->baseURL() + "/favicon1.ico");
@@ -201,7 +201,7 @@
         QVERIFY(fetcherSpy->wait());
         QVERIFY(!fetcher->localUrl().isEmpty());
         // Then request an invalid one
-        url = QUrl(server->baseURL() + "/invalid");
+        url = QUrl(server->baseURL() + "/invalid.png");
         fetcher->setUrl(url);
         QVERIFY(serverSpy->wait());
         QVERIFY(fetcher->localUrl().isEmpty());