Improve docset icon search logic (fixes #251, #264)

Decreases file I/O, since icons are kept in Docset now.
zealdocs · Jan 30, 2015 · 04b5dee · 04b5dee
1 parent dde2141
commit 04b5dee
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 15 deletions.
diff --git a/src/registry/docset.cpp b/src/registry/docset.cpp
@@ -56,6 +56,8 @@ Docset::Docset(const QString &path) :
 
     prefix = info.bundleName.isEmpty() ? m_name : info.bundleName;
 
+    findIcon();
+
     m_isValid = true;
 }
 
@@ -85,25 +87,33 @@ QString Docset::documentPath() const
 
 QIcon Docset::icon() const
 {
-    const QDir dir(documentPath());
+    return m_icon;
+}
+
+void Docset::findIcon()
+{
+    m_icon = QIcon(QDir(m_path).absoluteFilePath(QStringLiteral("icon.png")));
+    if (!m_icon.availableSizes().isEmpty())
+        return;
 
-    QIcon icon(dir.absoluteFilePath("favicon.ico"));
 
-    if (icon.availableSizes().isEmpty())
-        icon = QIcon(dir.absoluteFilePath("icon.png"));
+    m_icon = QIcon(QDir(documentPath()).absoluteFilePath(QStringLiteral("favicon.ico")));
+    if (!m_icon.availableSizes().isEmpty())
+        return;
 
-    if (icon.availableSizes().isEmpty()) {
-        QString bundleName = info.bundleName;
-        bundleName.replace(" ", "_");
+    QString bundleName = info.bundleName;
+    bundleName.replace(" ", "_");
+    m_icon = QIcon(QString("icons:%1.png").arg(bundleName));
+    if (!m_icon.availableSizes().isEmpty())
+        return;
 
-        icon = QIcon(QString("icons:%1.png").arg(bundleName));
+    // Fallback to identifier and docset file name.
+    m_icon = QIcon(QString("icons:%1.png").arg(info.bundleIdentifier));
+    if (!m_icon.availableSizes().isEmpty())
+        return;
 
-        // Fallback to identifier and docset file name.
-        if (icon.availableSizes().isEmpty())
-            icon = QIcon(QString("icons:%1.png").arg(info.bundleIdentifier));
-        if (icon.availableSizes().isEmpty())
-            icon = QIcon(QString("icons:%1.png").arg(m_name));
-    }
-    return icon;
+    m_icon = QIcon(QString("icons:%1.png").arg(m_name));
+    if (!m_icon.availableSizes().isEmpty())
+        return;
 }
 
diff --git a/src/registry/docset.h b/src/registry/docset.h
@@ -36,10 +36,13 @@ class Docset
     DocsetInfo info;
 
 private:
+    void findIcon();
+
     bool m_isValid = false;
 
     QString m_name;
     QString m_path;
+    QIcon m_icon;
 };
 
 } // namespace Zeal