New upstream version 3.6.1

[minitube] / lib / http / src / localcache.cpp

diff --git a/lib/http/src/localcache.cpp b/lib/http/src/localcache.cpp
index 99b93150797282b636c3a97469b4f104643206e0..d4c0bb1574dd43a98b8b2278611573317c13b649 100644 (file)
--- a/lib/http/src/localcache.cpp
+++ b/lib/http/src/localcache.cpp
@@ -56,7 +56,22 @@ QByteArray LocalCache::value(const QByteArray &key) {
 
     QFile file(path);
     if (!file.open(QIODevice::ReadOnly)) {
-        qWarning() << __PRETTY_FUNCTION__ << file.fileName() << file.errorString();
+        qWarning() << file.fileName() << file.errorString();
+#ifndef QT_NO_DEBUG_OUTPUT
+        misses++;
+#endif
+        return QByteArray();
+    }
+#ifndef QT_NO_DEBUG_OUTPUT
+    hits++;
+#endif
+    return file.readAll();
+}
+
+QByteArray LocalCache::possiblyStaleValue(const QByteArray &key) {
+    const QString path = cachePath(key);
+    QFile file(path);
+    if (!file.open(QIODevice::ReadOnly)) {
 #ifndef QT_NO_DEBUG_OUTPUT
         misses++;
 #endif