From 96a2b757e768774d92219b067021f9e7ee1113d8 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sat, 11 Mar 2017 17:28:02 +0100
Subject: [PATCH] refs #887, support nested directories in comparison

---
 src/blackmisc/directoryutils.cpp | 43 +++++++++++++++++++++++++++++---
 src/blackmisc/directoryutils.h   | 10 ++++++--
 2 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/src/blackmisc/directoryutils.cpp b/src/blackmisc/directoryutils.cpp
index d065aec8c..d02983a60 100644
--- a/src/blackmisc/directoryutils.cpp
+++ b/src/blackmisc/directoryutils.cpp
@@ -100,6 +100,13 @@ namespace BlackMisc
         return QUrl::fromPercentEncoding(directory.toUtf8());
     }
 
+    QStringList CDirectoryUtils::getSubDirectories(const QString &rootDir)
+    {
+        QDir dir(rootDir);
+        if (!dir.exists()) { return QStringList(); }
+        return dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::NoSymLinks);
+    }
+
     QSet<QString> CDirectoryUtils::fileNamesToQSet(const QFileInfoList &fileInfoList)
     {
         QSet<QString> sl;
@@ -136,15 +143,16 @@ namespace BlackMisc
         return found;
     }
 
-    CDirectoryUtils::DirComparison CDirectoryUtils::compareTwoDirectories(const QString &dirSource, const QString &dirTarget)
+    CDirectoryUtils::DirComparison CDirectoryUtils::compareTwoDirectories(const QString &dirSource, const QString &dirTarget, bool nestedDirs)
     {
         DirComparison comp;
         const QDir d1(dirSource);
         const QDir d2(dirTarget);
 
-        if (!d1.exists() || !d2.exists()) { return comp; }
-        const QFileInfoList dSourceList = d1.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::Name);
-        const QFileInfoList dTargetList = d2.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::Name);
+        QFileInfoList dSourceList;
+        QFileInfoList dTargetList;
+        if (d1.exists()) { dSourceList = d1.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::Name); }
+        if (d2.exists()) { dTargetList = d2.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::Name); }
 
         // only names
         const QSet<QString> sSourceFiles = CDirectoryUtils::fileNamesToQSet(dSourceList);
@@ -187,9 +195,36 @@ namespace BlackMisc
                 comp.newerInSource.insert(source.canonicalFilePath());
             }
         }
+
+        if (nestedDirs)
+        {
+            const QStringList relativeSubdirs = CDirectoryUtils::getSubDirectories(dirSource);
+            if (!relativeSubdirs.isEmpty())
+            {
+                for (const QString relativeSubdir : relativeSubdirs)
+                {
+                    const QString sourceSubdir = CFileUtils::appendFilePaths(dirSource, relativeSubdir);
+                    const QString targetSubdir = CFileUtils::appendFilePaths(dirTarget, relativeSubdir);
+                    const DirComparison subComparison = CDirectoryUtils::compareTwoDirectories(sourceSubdir, targetSubdir, true);
+                    comp.insert(subComparison);
+                }
+            }
+        }
+
         comp.ok = true;
         return comp;
     }
+
+    void CDirectoryUtils::DirComparison::insert(const CDirectoryUtils::DirComparison &otherComparison)
+    {
+        source           += otherComparison.source;
+        missingInSource  += otherComparison.missingInSource;
+        missingInTarget  += otherComparison.missingInTarget;
+        newerInSource    += otherComparison.newerInSource;
+        newerInTarget    += otherComparison.newerInTarget;
+        sameNameInSource += otherComparison.sameNameInSource;
+        sameNameInTarget += otherComparison.sameNameInTarget;
+    }
 } // ns
 
 //! \endcond
diff --git a/src/blackmisc/directoryutils.h b/src/blackmisc/directoryutils.h
index a6d174fbf..941dbaaef 100644
--- a/src/blackmisc/directoryutils.h
+++ b/src/blackmisc/directoryutils.h
@@ -51,6 +51,9 @@ namespace BlackMisc
         //! Virtually the inverse operation of CDirectoryUtils::normalizedApplicationDirectory
         static QString decodeNormalizedDirectory(const QString &directory);
 
+        //! All sub directories of given dir
+        static QStringList getSubDirectories(const QString &rootDir);
+
         //! Result of directory comparison
         struct DirComparison
         {
@@ -62,10 +65,13 @@ namespace BlackMisc
             QSet<QString> newerInTarget;     //!< file in target is newer
             QSet<QString> sameNameInSource;  //!< file exists in source and target, source name
             QSet<QString> sameNameInTarget;  //!< file exists in source and target, target name
+
+            //! Insert values of another comparison
+            void insert(const DirComparison &otherComparison);
         };
 
-        //! Compare 2 directories (only files, not subdirectories
-        static DirComparison compareTwoDirectories(const QString &dirSource, const QString &dirTarget);
+        //! Compare 2 directories (only files, but with hierarchy)
+        static DirComparison compareTwoDirectories(const QString &dirSource, const QString &dirTarget, bool nestedDirs);
 
     private:
         //! Returns the application directory of the calling executable as normalized string.