Merge branch 'circular' into 'master'

Consistently sort content files

See merge request OpenMW/openmw!1350

apps/launcher/datafilespage.cpp

@@ -121,6 +121,7 @@ void Launcher::DataFilesPage::populateFileViews(const QString& contentModelName)
 
     for (const QString &path : paths)
         mSelector->addFiles(path);
+    mSelector->sortFiles();
 
     PathIterator pathIterator(paths);
 

apps/opencs/editor.cpp

@@ -149,11 +149,7 @@ std::pair<Files::PathContainer, std::vector<std::string> > CS::Editor::readConfi
     dataDirs.insert (dataDirs.end(), dataLocal.begin(), dataLocal.end());
 
     //iterate the data directories and add them to the file dialog for loading
-    for (Files::PathContainer::const_reverse_iterator iter = dataDirs.rbegin(); iter != dataDirs.rend(); ++iter)
-    {
-        QString path = QString::fromUtf8 (iter->string().c_str());
-        mFileDialog.addFiles(path);
-    }
+    mFileDialog.addFiles(dataDirs);
 
     return std::make_pair (dataDirs, variables["fallback-archive"].as<Files::EscapeStringVector>().toStdStringVector());
 }

apps/opencs/view/doc/filedialog.cpp

@@ -28,9 +28,14 @@ CSVDoc::FileDialog::FileDialog(QWidget *parent) :
     mAdjusterWidget = new AdjusterWidget (this);
 }
 
-void CSVDoc::FileDialog::addFiles(const QString &path)
+void CSVDoc::FileDialog::addFiles(const std::vector<boost::filesystem::path>& dataDirs)
 {
-    mSelector->addFiles(path);
+    for (auto iter = dataDirs.rbegin(); iter != dataDirs.rend(); ++iter)
+    {
+        QString path = QString::fromUtf8(iter->string().c_str());
+        mSelector->addFiles(path);
+    }
+    mSelector->sortFiles();
 }
 
 void CSVDoc::FileDialog::setEncoding(const QString &encoding)

apps/opencs/view/doc/filedialog.hpp

@@ -45,7 +45,7 @@ namespace CSVDoc
         explicit FileDialog(QWidget *parent = nullptr);
         void showDialog (ContentAction action);
 
-        void addFiles (const QString &path);
+        void addFiles(const std::vector<boost::filesystem::path>& dataDirs);
         void setEncoding (const QString &encoding);
         void clearFiles ();
 

components/contentselector/model/contentmodel.cpp

@@ -2,6 +2,7 @@
 #include "esmfile.hpp"
 
 #include <stdexcept>
+#include <unordered_set>
 
 #include <QDir>
 #include <QTextCodec>
@@ -420,6 +421,7 @@ void ContentSelectorModel::ContentModel::addFiles(const QString &path)
     if (mShowOMWScripts)
         filters << "*.omwscripts";
     dir.setNameFilters(filters);
+    dir.setSorting(QDir::Name);
 
     for (const QString &path2 : dir.entryList())
     {
@@ -474,8 +476,6 @@ void ContentSelectorModel::ContentModel::addFiles(const QString &path)
         }
 
     }
-
-    sortFiles();
 }
 
 void ContentSelectorModel::ContentModel::clearFiles()
@@ -504,41 +504,37 @@ QStringList ContentSelectorModel::ContentModel::gameFiles() const
 
 void ContentSelectorModel::ContentModel::sortFiles()
 {
-    //first, sort the model such that all dependencies are ordered upstream (gamefile) first.
-    bool movedFiles = true;
-    int fileCount = mFiles.size();
-
+    emit layoutAboutToBeChanged();
     //Dependency sort
-    //iterate until no sorting of files occurs
-    while (movedFiles)
+    std::unordered_set<const EsmFile*> moved;
+    for(int i = mFiles.size() - 1; i > 0;)
     {
-        movedFiles = false;
-        //iterate each file, obtaining a reference to it's gamefiles list
-        for (int i = 0; i < fileCount; i++)
+        const auto file = mFiles.at(i);
+        if(moved.find(file) == moved.end())
         {
-            QModelIndex idx1 = index (i, 0, QModelIndex());
-            const QStringList &gamefiles = mFiles.at(i)->gameFiles();
-            //iterate each file after the current file, verifying that none of it's
-            //dependencies appear.
-            for (int j = i + 1; j < fileCount; j++)
+            int index = -1;
+            for(int j = 0; j < i; ++j)
             {
-                if (gamefiles.contains(mFiles.at(j)->fileName(), Qt::CaseInsensitive)
-                 || (!mFiles.at(i)->isGameFile() && gamefiles.isEmpty()
-                 && mFiles.at(j)->fileName().compare("Morrowind.esm", Qt::CaseInsensitive) == 0)) // Hack: implicit dependency on Morrowind.esm for dependency-less files
+                const QStringList& gameFiles = mFiles.at(j)->gameFiles();
+                if(gameFiles.contains(file->fileName(), Qt::CaseInsensitive)
+                    || (!mFiles.at(j)->isGameFile() && gameFiles.isEmpty()
+                    && file->fileName().compare("Morrowind.esm", Qt::CaseInsensitive) == 0)) // Hack: implicit dependency on Morrowind.esm for dependency-less files
                 {
-                        mFiles.move(j, i);
-
-                        QModelIndex idx2 = index (j, 0, QModelIndex());
-
-                        emit dataChanged (idx1, idx2);
-
-                        movedFiles = true;
+                    index = j;
+                    break;
                 }
             }
-            if (movedFiles)
-                break;
+            if(index >= 0)
+            {
+                mFiles.move(i, index);
+                moved.insert(file);
+                continue;
+            }
         }
+        --i;
+        moved.clear();
     }
+    emit layoutChanged();
 }
 
 bool ContentSelectorModel::ContentModel::isChecked(const QString& filepath) const

components/contentselector/model/contentmodel.hpp

@@ -44,6 +44,7 @@ namespace ContentSelectorModel
         bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;
 
         void addFiles(const QString &path);
+        void sortFiles();
         void clearFiles();
 
         QModelIndex indexFromItem(const EsmFile *item) const;
@@ -68,8 +69,6 @@ namespace ContentSelectorModel
 
         void addFile(EsmFile *file);
 
-        void sortFiles();
-
         /// Checks a specific plug-in for load order errors
         /// \return all errors found for specific plug-in
         QList<LoadOrderError> checkForLoadOrderErrors(const EsmFile *file, int row) const;

components/contentselector/view/contentselector.cpp

@@ -173,6 +173,11 @@ void ContentSelectorView::ContentSelector::addFiles(const QString &path)
     mContentModel->checkForLoadOrderErrors();
 }
 
+void ContentSelectorView::ContentSelector::sortFiles()
+{
+    mContentModel->sortFiles();
+}
+
 void ContentSelectorView::ContentSelector::clearFiles()
 {
     mContentModel->clearFiles();

components/contentselector/view/contentselector.hpp

@@ -28,6 +28,7 @@ namespace ContentSelectorView
         QString currentFile() const;
 
         void addFiles(const QString &path);
+        void sortFiles();
         void clearFiles();
         void setProfileContent (const QStringList &fileList);