From ac6fad8a677eb113839ff4ca79c8185e0aa8237b Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Tue, 7 Jul 2009 11:23:45 +0200
Subject: Added wildcard support for file lists in help projects.

The qhelpgenerator auto test was also updated to test the new feature.

Reviewed-by: kh
---
 tests/auto/qhelpgenerator/data/test.qhp  |  7 +++----
 tools/assistant/lib/qhelpprojectdata.cpp | 22 +++++++++++++++++++---
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/tests/auto/qhelpgenerator/data/test.qhp b/tests/auto/qhelpgenerator/data/test.qhp
index e9ac7f2..a97c00d 100644
--- a/tests/auto/qhelpgenerator/data/test.qhp
+++ b/tests/auto/qhelpgenerator/data/test.qhp
@@ -38,9 +38,8 @@
 		</keywords>	
 		<files>
 			<file>classic.css</file>
-			<file>test.html</file>
-			<file>people.html</file>
-			<file>./sub/about.html</file>			
+			<file>[pt]*.html</file>
+			<file>./sub/abou?.html</file>			
 		</files>
 	</filterSection>
 	<filterSection>
@@ -69,4 +68,4 @@
 			<file>cars.html</file>			
 		</files>
 	</filterSection>
-</QtHelpProject>
\ No newline at end of file
+</QtHelpProject>
diff --git a/tools/assistant/lib/qhelpprojectdata.cpp b/tools/assistant/lib/qhelpprojectdata.cpp
index 8947a36..55b4ea7 100644
--- a/tools/assistant/lib/qhelpprojectdata.cpp
+++ b/tools/assistant/lib/qhelpprojectdata.cpp
@@ -41,6 +41,7 @@
 
 #include "qhelpprojectdata_p.h"
 
+#include <QtCore/QDir>
 #include <QtCore/QFileInfo>
 #include <QtCore/QStack>
 #include <QtCore/QMap>
@@ -73,6 +74,7 @@ private:
     void readKeywords();
     void readFiles();
     void raiseUnknownTokenError();
+    void addMatchingFiles(const QString &pattern);
 };
 
 void QHelpProjectDataPrivate::raiseUnknownTokenError()
@@ -161,7 +163,7 @@ void QHelpProjectDataPrivate::readFilterSection()
         readNext();
         if (isStartElement()) {
             if (name() == QLatin1String("filterAttribute"))
-                filterSectionList.last().addFilterAttribute(readElementText());				
+                filterSectionList.last().addFilterAttribute(readElementText());
             else if (name() == QLatin1String("toc"))
                 readTOC();
             else if (name() == QLatin1String("keywords"))
@@ -244,7 +246,7 @@ void QHelpProjectDataPrivate::readFiles()
         readNext();
         if (isStartElement()) {
             if (name() == QLatin1String("file"))
-                filterSectionList.last().addFile(readElementText());
+                addMatchingFiles(readElementText());
             else
                 raiseUnknownTokenError();
         } else if (isEndElement()) {
@@ -258,7 +260,21 @@ void QHelpProjectDataPrivate::readFiles()
     }
 }
 
-
+// Expand file pattern and add matches into list. If the pattern does not match
+// any files, insert the pattern itself so the QHelpGenerator will emit a
+// meaningful warning later.
+void QHelpProjectDataPrivate::addMatchingFiles(const QString &pattern)
+{
+    QFileInfo fileInfo(rootPath + '/' + pattern);
+    const QStringList &matches =
+            fileInfo.dir().entryList(QStringList(fileInfo.fileName()));
+    for (QStringList::ConstIterator it = matches.constBegin();
+         it != matches.constEnd();
+         ++it)
+        filterSectionList.last().addFile(QFileInfo(pattern).dir().path() + '/' + *it);
+    if (matches.empty())
+        filterSectionList.last().addFile(pattern);
+}
 
 /*!
     \internal
-- 
cgit v0.12