New upstream version 3.1

[minitube] / src / diskcache.cpp

diff --git a/src/diskcache.cpp b/src/diskcache.cpp
index f9d0391b45c4b86700a46c268854f8b253ffa6a1..61fb8917ca84bd8b012092316f3e114d7bb2e885 100644 (file)
--- a/src/diskcache.cpp
+++ b/src/diskcache.cpp
@@ -25,7 +25,8 @@ DiskCache::DiskCache(QObject *parent) : QNetworkDiskCache(parent) { }
 
 QIODevice* DiskCache::prepare(const QNetworkCacheMetaData &metaData) {
     QString mime;
-    foreach (QNetworkCacheMetaData::RawHeader header, metaData.rawHeaders()) {
+    const auto headers = metaData.rawHeaders();
+    for (const QNetworkCacheMetaData::RawHeader &header : headers) {
         // qDebug() << header.first << header.second;
         if (header.first.constData() == QLatin1String("Content-Type")) {
             mime = header.second;
@@ -33,9 +34,23 @@ QIODevice* DiskCache::prepare(const QNetworkCacheMetaData &metaData) {
         }
     }
 
-    if (mime.startsWith(QLatin1String("image/")) ||
-                        mime.endsWith(QLatin1String("/javascript")))
+    if (mime == QLatin1String("application/json") || mime.startsWith(QLatin1String("image/"))) {
         return QNetworkDiskCache::prepare(metaData);
+    }
 
     return 0;
 }
+
+QNetworkCacheMetaData DiskCache::metaData(const QUrl &url) {
+    // Remove "key" from query string in order to reuse cache when key changes
+    static const QString keyQueryItem = "key";
+    QUrlQuery q(url);
+    if (q.hasQueryItem(keyQueryItem)) {
+        q.removeQueryItem(keyQueryItem);
+        QUrl url2(url);
+        url2.setQuery(q);
+        return QNetworkDiskCache::metaData(url2);
+    }
+
+    return QNetworkDiskCache::metaData(url);
+}