From d369782ae182d1127a9ebdc6c181543409149cbd Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Fri, 22 Aug 2014 18:48:26 +0200
Subject: [PATCH] ntroduce the concept of package fallback

---
 src/plasma/package.cpp         | 19 +++++++++++++++----
 src/plasma/private/package_p.h |  2 ++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/plasma/package.cpp b/src/plasma/package.cpp
index 6ad332167..cc93f4829 100644
--- a/src/plasma/package.cpp
+++ b/src/plasma/package.cpp
@@ -49,6 +49,7 @@ Package::Package(PackageStructure *structure)
     : d(new PackagePrivate())
 {
     d->structure = structure;
+    d->fallbackPackage = Package(structure);
     if (d->structure) {
         d->structure.data()->initPackage(this);
     }
@@ -290,7 +291,7 @@ QString Package::filePath(const char *fileType, const QString &filename) const
 {
     if (!d->valid) {
         //qDebug() << "package is not valid";
-        return QString();
+        return d->fallbackFilePath(fileType, filename);
     }
 
     const QString discoveryKey(fileType + filename);
@@ -305,7 +306,7 @@ QString Package::filePath(const char *fileType, const QString &filename) const
         //qDebug()<<d->contents.keys();
         if (!d->contents.contains(fileType)) {
             //qDebug() << "package does not contain" << fileType << filename;
-            return QString();
+            return d->fallbackFilePath(fileType, filename);
         }
 
         paths = d->contents[fileType].paths;
@@ -313,7 +314,7 @@ QString Package::filePath(const char *fileType, const QString &filename) const
         if (paths.isEmpty()) {
             //qDebug() << "no matching path came of it, while looking for" << fileType << filename;
             d->discoveries.insert(discoveryKey, QString());
-            return QString();
+            return d->fallbackFilePath(fileType, filename);
         }
     } else {
         //when filetype is empty paths is always empty, so try with an empty string
@@ -356,7 +357,7 @@ QString Package::filePath(const char *fileType, const QString &filename) const
     }
 
     //qDebug() << fileType << filename << "does not exist in" << prefixes << "at root" << d->path;
-    return QString();
+    return d->fallbackFilePath(fileType, filename);
 }
 
 QStringList Package::entryList(const char *key) const
@@ -792,6 +793,7 @@ PackagePrivate &PackagePrivate::operator=(const PackagePrivate &rhs)
     }
 
     structure = rhs.structure;
+    fallbackPackage = Package(structure.data());
     path = rhs.path;
     contentsPrefixPaths = rhs.contentsPrefixPaths;
     servicePrefix = rhs.servicePrefix;
@@ -871,4 +873,13 @@ void PackagePrivate::createPackageMetadata(const QString &path)
     metadata = new KPluginInfo(metadataPath);
 }
 
+QString PackagePrivate::fallbackFilePath(const char *key, const QString &filename) const
+{
+    if (fallbackPackage.isValid()) {
+        return fallbackPackage.filePath(key, filename);
+    } else {
+        return QString();
+    }
+}
+
 } // Namespace
diff --git a/src/plasma/private/package_p.h b/src/plasma/private/package_p.h
index d902eb11c..72fe03561 100644
--- a/src/plasma/private/package_p.h
+++ b/src/plasma/private/package_p.h
@@ -73,6 +73,7 @@ public:
     void createPackageMetadata(const QString &path);
     QString unpack(const QString &filePath);
     void updateHash(const QString &basePath, const QString &subPath, const QDir &dir, QCryptographicHash &hash);
+    QString fallbackFilePath(const char *key, const QString &filename = QString()) const;
 
     QWeakPointer<PackageStructure> structure;
     QString path;
@@ -82,6 +83,7 @@ public:
     QString servicePrefix;
     QHash<QString, QString> discoveries;
     QHash<QByteArray, ContentStructure> contents;
+    Package fallbackPackage;
 #ifndef PLASMA_NO_PACKAGE_EXTRADATA
     QStringList mimeTypes;
 #endif