Add file tree

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>

5 files changed, 41 insertions, 301 deletions

diff --git a/launcher/ui/dialogs/ExportInstanceDialog.cpp b/launcher/ui/dialogs/ExportInstanceDialog.cpp
index f13e36e8..2c706b8a 100644
--- a/launcher/ui/dialogs/ExportInstanceDialog.cpp
+++ b/launcher/ui/dialogs/ExportInstanceDialog.cpp
@@ -51,294 +51,15 @@
 #include <icons/IconList.h>
 #include <FileSystem.h>
 
-class PackIgnoreProxy : public QSortFilterProxyModel
-{
-    Q_OBJECT
-
-public:
-    PackIgnoreProxy(InstancePtr instance, QObject *parent) : QSortFilterProxyModel(parent)
-    {
-        m_instance = instance;
-    }
-    // NOTE: Sadly, we have to do sorting ourselves.
-    bool lessThan(const QModelIndex &left, const QModelIndex &right) const
-    {
-        QFileSystemModel *fsm = qobject_cast<QFileSystemModel *>(sourceModel());
-        if (!fsm)
-        {
-            return QSortFilterProxyModel::lessThan(left, right);
-        }
-        bool asc = sortOrder() == Qt::AscendingOrder ? true : false;
-
-        QFileInfo leftFileInfo = fsm->fileInfo(left);
-        QFileInfo rightFileInfo = fsm->fileInfo(right);
-
-        if (!leftFileInfo.isDir() && rightFileInfo.isDir())
-        {
-            return !asc;
-        }
-        if (leftFileInfo.isDir() && !rightFileInfo.isDir())
-        {
-            return asc;
-        }
-
-        // sort and proxy model breaks the original model...
-        if (sortColumn() == 0)
-        {
-            return StringUtils::naturalCompare(leftFileInfo.fileName(), rightFileInfo.fileName(),
-                                           Qt::CaseInsensitive) < 0;
-        }
-        if (sortColumn() == 1)
-        {
-            auto leftSize = leftFileInfo.size();
-            auto rightSize = rightFileInfo.size();
-            if ((leftSize == rightSize) || (leftFileInfo.isDir() && rightFileInfo.isDir()))
-            {
-                return StringUtils::naturalCompare(leftFileInfo.fileName(),
-                                               rightFileInfo.fileName(),
-                                               Qt::CaseInsensitive) < 0
-                           ? asc
-                           : !asc;
-            }
-            return leftSize < rightSize;
-        }
-        return QSortFilterProxyModel::lessThan(left, right);
-    }
-
-    virtual Qt::ItemFlags flags(const QModelIndex &index) const
-    {
-        if (!index.isValid())
-            return Qt::NoItemFlags;
-
-        auto sourceIndex = mapToSource(index);
-        Qt::ItemFlags flags = sourceIndex.flags();
-        if (index.column() == 0)
-        {
-            flags |= Qt::ItemIsUserCheckable;
-            if (sourceIndex.model()->hasChildren(sourceIndex))
-            {
-                flags |= Qt::ItemIsAutoTristate;
-            }
-        }
-
-        return flags;
-    }
-
-    virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const
-    {
-        QModelIndex sourceIndex = mapToSource(index);
-
-        if (index.column() == 0 && role == Qt::CheckStateRole)
-        {
-            QFileSystemModel *fsm = qobject_cast<QFileSystemModel *>(sourceModel());
-            auto blockedPath = relPath(fsm->filePath(sourceIndex));
-            auto cover = blocked.cover(blockedPath);
-            if (!cover.isNull())
-            {
-                return QVariant(Qt::Unchecked);
-            }
-            else if (blocked.exists(blockedPath))
-            {
-                return QVariant(Qt::PartiallyChecked);
-            }
-            else
-            {
-                return QVariant(Qt::Checked);
-            }
-        }
-
-        return sourceIndex.data(role);
-    }
-
-    virtual bool setData(const QModelIndex &index, const QVariant &value,
-                         int role = Qt::EditRole)
-    {
-        if (index.column() == 0 && role == Qt::CheckStateRole)
-        {
-            Qt::CheckState state = static_cast<Qt::CheckState>(value.toInt());
-            return setFilterState(index, state);
-        }
-
-        QModelIndex sourceIndex = mapToSource(index);
-        return QSortFilterProxyModel::sourceModel()->setData(sourceIndex, value, role);
-    }
-
-    QString relPath(const QString &path) const
-    {
-        QString prefix = QDir().absoluteFilePath(m_instance->instanceRoot());
-        prefix += '/';
-        if (!path.startsWith(prefix))
-        {
-            return QString();
-        }
-        return path.mid(prefix.size());
-    }
-
-    bool setFilterState(QModelIndex index, Qt::CheckState state)
-    {
-        QFileSystemModel *fsm = qobject_cast<QFileSystemModel *>(sourceModel());
-
-        if (!fsm)
-        {
-            return false;
-        }
-
-        QModelIndex sourceIndex = mapToSource(index);
-        auto blockedPath = relPath(fsm->filePath(sourceIndex));
-        bool changed = false;
-        if (state == Qt::Unchecked)
-        {
-            // blocking a path
-            auto &node = blocked.insert(blockedPath);
-            // get rid of all blocked nodes below
-            node.clear();
-            changed = true;
-        }
-        else if (state == Qt::Checked || state == Qt::PartiallyChecked)
-        {
-            if (!blocked.remove(blockedPath))
-            {
-                auto cover = blocked.cover(blockedPath);
-                qDebug() << "Blocked by cover" << cover;
-                // uncover
-                blocked.remove(cover);
-                // block all contents, except for any cover
-                QModelIndex rootIndex =
-                    fsm->index(FS::PathCombine(m_instance->instanceRoot(), cover));
-                QModelIndex doing = rootIndex;
-                int row = 0;
-                QStack<QModelIndex> todo;
-                while (1)
-                {
-                    auto node = fsm->index(row, 0, doing);
-                    if (!node.isValid())
-                    {
-                        if (!todo.size())
-                        {
-                            break;
-                        }
-                        else
-                        {
-                            doing = todo.pop();
-                            row = 0;
-                            continue;
-                        }
-                    }
-                    auto relpath = relPath(fsm->filePath(node));
-                    if (blockedPath.startsWith(relpath)) // cover found?
-                    {
-                        // continue processing cover later
-                        todo.push(node);
-                    }
-                    else
-                    {
-                        // or just block this one.
-                        blocked.insert(relpath);
-                    }
-                    row++;
-                }
-            }
-            changed = true;
-        }
-        if (changed)
-        {
-            // update the thing
-            emit dataChanged(index, index, {Qt::CheckStateRole});
-            // update everything above index
-            QModelIndex up = index.parent();
-            while (1)
-            {
-                if (!up.isValid())
-                    break;
-                emit dataChanged(up, up, {Qt::CheckStateRole});
-                up = up.parent();
-            }
-            // and everything below the index
-            QModelIndex doing = index;
-            int row = 0;
-            QStack<QModelIndex> todo;
-            while (1)
-            {
-                auto node = this->index(row, 0, doing);
-                if (!node.isValid())
-                {
-                    if (!todo.size())
-                    {
-                        break;
-                    }
-                    else
-                    {
-                        doing = todo.pop();
-                        row = 0;
-                        continue;
-                    }
-                }
-                emit dataChanged(node, node, {Qt::CheckStateRole});
-                todo.push(node);
-                row++;
-            }
-            // siblings and unrelated nodes are ignored
-        }
-        return true;
-    }
-
-    bool shouldExpand(QModelIndex index)
-    {
-        QModelIndex sourceIndex = mapToSource(index);
-        QFileSystemModel *fsm = qobject_cast<QFileSystemModel *>(sourceModel());
-        if (!fsm)
-        {
-            return false;
-        }
-        auto blockedPath = relPath(fsm->filePath(sourceIndex));
-        auto found = blocked.find(blockedPath);
-        if(found)
-        {
-            return !found->leaf();
-        }
-        return false;
-    }
-
-    void setBlockedPaths(QStringList paths)
-    {
-        beginResetModel();
-        blocked.clear();
-        blocked.insert(paths);
-        endResetModel();
-    }
-
-    const SeparatorPrefixTree<'/'> & blockedPaths() const
-    {
-        return blocked;
-    }
-
-protected:
-    bool filterAcceptsColumn(int source_column, const QModelIndex &source_parent) const
-    {
-        Q_UNUSED(source_parent)
-
-        // adjust the columns you want to filter out here
-        // return false for those that will be hidden
-        if (source_column == 2 || source_column == 3)
-            return false;
-
-        return true;
-    }
-
-private:
-    InstancePtr m_instance;
-    SeparatorPrefixTree<'/'> blocked;
-};
-
 ExportInstanceDialog::ExportInstanceDialog(InstancePtr instance, QWidget *parent)
     : QDialog(parent), ui(new Ui::ExportInstanceDialog), m_instance(instance)
 {
     ui->setupUi(this);
     auto model = new QFileSystemModel(this);
-    proxyModel = new PackIgnoreProxy(m_instance, this);
+    auto root = instance->instanceRoot();
+    proxyModel = new PackIgnoreProxy(root, this);
     loadPackIgnore();
     proxyModel->setSourceModel(model);
-    auto root = instance->instanceRoot();
     ui->treeView->setModel(proxyModel);
     ui->treeView->setRootIndex(proxyModel->mapFromSource(model->index(root)));
     ui->treeView->sortByColumn(0, Qt::AscendingOrder);
@@ -407,17 +128,6 @@ bool ExportInstanceDialog::doExport()
     {
         return false;
     }
-    if (QFile::exists(output))
-    {
-        int ret =
-            QMessageBox::question(this, tr("Overwrite?"),
-                                  tr("This file already exists. Do you want to overwrite it?"),
-                                  QMessageBox::No, QMessageBox::Yes);
-        if (ret == QMessageBox::No)
-        {
-            return false;
-        }
-    }
 
     SaveIcon(m_instance);
 
diff --git a/launcher/ui/dialogs/ExportInstanceDialog.h b/launcher/ui/dialogs/ExportInstanceDialog.h
index dea02d1b..b1b8f911 100644
--- a/launcher/ui/dialogs/ExportInstanceDialog.h
+++ b/launcher/ui/dialogs/ExportInstanceDialog.h
@@ -18,9 +18,9 @@
 #include <QDialog>
 #include <QModelIndex>
 #include <memory>
+#include "PackIgnoreProxy.h"
 
 class BaseInstance;
-class PackIgnoreProxy;
 typedef std::shared_ptr<BaseInstance> InstancePtr;
 
 namespace Ui
diff --git a/launcher/ui/dialogs/ExportMrPackDialog.cpp b/launcher/ui/dialogs/ExportMrPackDialog.cpp
index 735a6245..1a839061 100644
--- a/launcher/ui/dialogs/ExportMrPackDialog.cpp
+++ b/launcher/ui/dialogs/ExportMrPackDialog.cpp
@@ -17,6 +17,7 @@
  */
 
 #include "ExportMrPackDialog.h"
+#include <QFileSystemModel>
 #include "ui_ExportMrPackDialog.h"
 
 ExportMrPackDialog::ExportMrPackDialog(InstancePtr instance, QWidget* parent)
@@ -24,15 +25,29 @@ ExportMrPackDialog::ExportMrPackDialog(InstancePtr instance, QWidget* parent)
 {
     ui->setupUi(this);
     ui->name->setText(instance->name());
+
+    auto model = new QFileSystemModel(this);
+    // use the game root - everything outside cannot be exported
+    QString root = instance->gameRoot();
+    proxy = new PackIgnoreProxy(root, this);
+    proxy->setSourceModel(model);
+    ui->treeView->setModel(proxy);
+    ui->treeView->setRootIndex(proxy->mapFromSource(model->index(root)));
+    ui->treeView->sortByColumn(0, Qt::AscendingOrder);
+    model->setFilter(QDir::AllEntries | QDir::NoDotAndDotDot | QDir::AllDirs | QDir::Hidden);
+    model->setRootPath(root);
+    auto headerView = ui->treeView->header();
+    headerView->setSectionResizeMode(QHeaderView::ResizeToContents);
+    headerView->setSectionResizeMode(0, QHeaderView::Stretch);
 }
 
-void ExportMrPackDialog::done(int result) {
+void ExportMrPackDialog::done(int result)
+{
     if (result != Accepted) {
         QDialog::done(result);
         return;
     }
     QDialog::done(result);
-
 }
 
 ExportMrPackDialog::~ExportMrPackDialog()
diff --git a/launcher/ui/dialogs/ExportMrPackDialog.h b/launcher/ui/dialogs/ExportMrPackDialog.h
index 31ab86ff..454c25eb 100644
--- a/launcher/ui/dialogs/ExportMrPackDialog.h
+++ b/launcher/ui/dialogs/ExportMrPackDialog.h
@@ -20,6 +20,7 @@
 
 #include <QDialog>
 #include "BaseInstance.h"
+#include "PackIgnoreProxy.h"
 
 namespace Ui {
 class ExportMrPackDialog;
@@ -37,4 +38,5 @@ class ExportMrPackDialog : public QDialog {
    private:
     InstancePtr instance;
     Ui::ExportMrPackDialog* ui;
+    PackIgnoreProxy* proxy;
 };
diff --git a/launcher/ui/dialogs/ExportMrPackDialog.ui b/launcher/ui/dialogs/ExportMrPackDialog.ui
index 37c87158..8e6d61ff 100644
--- a/launcher/ui/dialogs/ExportMrPackDialog.ui
+++ b/launcher/ui/dialogs/ExportMrPackDialog.ui
@@ -15,13 +15,13 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
-    <widget class="QGroupBox" name="groupBox">
+    <widget class="QGroupBox" name="information">
      <property name="title">
       <string>Information</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
       <item row="3" column="0">
-       <widget class="QLabel" name="label_3">
+       <widget class="QLabel" name="versionLabel">
         <property name="text">
          <string>Summary</string>
         </property>
@@ -31,14 +31,14 @@
        <widget class="QLineEdit" name="summary"/>
       </item>
       <item row="0" column="0">
-       <widget class="QLabel" name="label">
+       <widget class="QLabel" name="nameLabel">
         <property name="text">
          <string>Name</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
-       <widget class="QLabel" name="label_2">
+       <widget class="QLabel" name="summaryLabel">
         <property name="text">
          <string>Version</string>
         </property>
@@ -54,14 +54,27 @@
     </widget>
    </item>
    <item>
-    <widget class="QLabel" name="label_4">
+    <widget class="QLabel" name="filesLabel">
      <property name="text">
       <string>Files</string>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QTreeView" name="treeView"/>
+    <widget class="QTreeView" name="treeView">
+     <property name="alternatingRowColors">
+      <bool>true</bool>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::ExtendedSelection</enum>
+     </property>
+     <property name="sortingEnabled">
+      <bool>true</bool>
+     </property>
+     <attribute name="headerStretchLastSection">
+      <bool>false</bool>
+     </attribute>
+    </widget>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">