Imported Upstream version 2.4

[minitube] / src / diskcache.cpp

diff --git a/src/diskcache.cpp b/src/diskcache.cpp
index f9d0391b45c4b86700a46c268854f8b253ffa6a1..4766b008635f3c5c8dc988914dfd35ae389fe939 100644 (file)
--- a/src/diskcache.cpp
+++ b/src/diskcache.cpp
@@ -25,7 +25,7 @@ DiskCache::DiskCache(QObject *parent) : QNetworkDiskCache(parent) { }
 
 QIODevice* DiskCache::prepare(const QNetworkCacheMetaData &metaData) {
     QString mime;
-    foreach (QNetworkCacheMetaData::RawHeader header, metaData.rawHeaders()) {
+    foreach (const QNetworkCacheMetaData::RawHeader &header, metaData.rawHeaders()) {
         // qDebug() << header.first << header.second;
         if (header.first.constData() == QLatin1String("Content-Type")) {
             mime = header.second;
@@ -33,9 +33,20 @@ 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";
+    if (url.hasQueryItem(keyQueryItem)) {
+        QUrl url2(url);
+        url2.removeQueryItem(keyQueryItem);
+        return QNetworkDiskCache::metaData(url2);
+    }
+    return QNetworkDiskCache::metaData(url);
+}