Allow to edit common path of torrent content items

Author: glassez

src/base/path.cpp

@@ -312,6 +312,21 @@ Path Path::commonPath(const Path &left, const Path &right)
     return Path::createUnchecked(left.m_pathStr.first(commonPathSize));
 }
 
+Path Path::commonPath(const PathList &filePaths)
+{
+    if (filePaths.isEmpty())
+        return {};
+
+    if (filePaths.size() == 1)
+        return filePaths.at(0);
+
+    Path commonPath = Path::commonPath(filePaths.at(0), filePaths.at(1));
+    for (qsizetype i = 2; i < filePaths.size(); ++ i)
+        commonPath = Path::commonPath(commonPath, filePaths.at(i));
+
+    return commonPath;
+}
+
 Path Path::findRootFolder(const PathList &filePaths)
 {
     Path rootFolder;

src/base/path.h

@@ -82,6 +82,7 @@ class Path final
     Iterator end() const;
 
     static Path commonPath(const Path &left, const Path &right);
+    static Path commonPath(const PathList &filePaths);
 
     static Path findRootFolder(const PathList &filePaths);
     static void stripRootFolder(PathList &filePaths);

src/gui/torrentcontentlayoutdialog.cpp

@@ -80,11 +80,12 @@ TorrentContentLayoutDialog::TorrentContentLayoutDialog(BitTorrent::TorrentConten
     setWindowIcon(UIThemeManager::instance()->getIcon(u"edit-rename"_s));
 
     m_model = new TorrentContentLayoutModel(contentHandler, this);
-    m_ui->treeView->setModel(m_model);
+    m_ui->pathListView->setModel(m_model);
     if (m_model->rowCount() > 0)
     {
-        m_ui->treeView->selectionModel()->setCurrentIndex(m_model->index(0, 0)
+        m_ui->pathListView->selectionModel()->setCurrentIndex(m_model->index(0, 0)
                 , (QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows));
+        populateCommonPath();
     }
 
     connect(m_model, &QAbstractItemModel::dataChanged, this, [this]
@@ -105,21 +106,97 @@ TorrentContentLayoutDialog::TorrentContentLayoutDialog(BitTorrent::TorrentConten
         RaisedMessageBox::warning(this, tr("Rename error"), errorMessage, QMessageBox::Ok);
     });
 
-    m_ui->treeView->setItemDelegate(new TorrentContentLayoutItemDelegate(this));
+    m_ui->pathListView->setItemDelegate(new TorrentContentLayoutItemDelegate(this));
+
+    connect(m_ui->pathListView->selectionModel(), &QItemSelectionModel::selectionChanged, this, &TorrentContentLayoutDialog::populateCommonPath);
+    connect(m_ui->commonPathEdit, &QLineEdit::textEdited, this, &TorrentContentLayoutDialog::onCommonPathEdited);
 
     if (const QSize dialogSize = m_storeDialogSize; dialogSize.isValid())
         resize(dialogSize);
 
-    m_ui->treeView->header()->restoreState(m_storeViewState);
+    m_ui->pathListView->header()->restoreState(m_storeViewState);
 }
 
 TorrentContentLayoutDialog::~TorrentContentLayoutDialog()
 {
     m_storeDialogSize = size();
-    m_storeViewState = m_ui->treeView->header()->saveState();
+    m_storeViewState = m_ui->pathListView->header()->saveState();
     delete m_ui;
 }
 
+Path TorrentContentLayoutDialog::currentPath() const
+{
+    const QModelIndex currentIndex = m_ui->pathListView->selectionModel()->currentIndex();
+    if (!currentIndex.isValid())
+        return {};
+
+    return Path(currentIndex.siblingAtColumn(TorrentContentLayoutModel::COL_PATH).data().toString());
+}
+
+PathList TorrentContentLayoutDialog::selectedPaths() const
+{
+    const QModelIndexList selectedRows = m_ui->pathListView->selectionModel()->selectedRows(TorrentContentLayoutModel::COL_PATH);
+    if (selectedRows.isEmpty())
+        return {};
+
+    PathList selectedPaths;
+    selectedPaths.reserve(selectedRows.size());
+    for (const QModelIndex &rowIndex : selectedRows)
+        selectedPaths.append(Path(rowIndex.data().toString()));
+
+    return selectedPaths;
+}
+
+void TorrentContentLayoutDialog::populateCommonPath()
+{
+    PathList paths = selectedPaths();
+    if (paths.isEmpty())
+    {
+        const Path currentPath = this->currentPath();
+        if (currentPath.isValid())
+            paths.append(currentPath);
+    }
+
+    if (!paths.isEmpty())
+    {
+        m_commonPath = Path::commonPath(paths);
+        m_ui->commonPathEdit->setText(m_commonPath.toString());
+        m_ui->commonPathLabel->setEnabled(true);
+        m_ui->commonPathEdit->setEnabled(true);
+    }
+    else
+    {
+        m_commonPath = {};
+        m_ui->commonPathEdit->clear();
+        m_ui->commonPathLabel->setEnabled(false);
+        m_ui->commonPathEdit->setEnabled(false);
+    }
+}
+
+void TorrentContentLayoutDialog::onCommonPathEdited(const QString &pathStr)
+{
+    const Path oldCommonPath = m_commonPath;
+    m_commonPath = Path(pathStr);
+
+    QModelIndexList selectedRows = m_ui->pathListView->selectionModel()->selectedRows(TorrentContentLayoutModel::COL_PATH);
+    if (selectedRows.isEmpty())
+    {
+        const QModelIndex currentIndex = m_ui->pathListView->selectionModel()->currentIndex();
+        if (currentIndex.isValid())
+            selectedRows.append(currentIndex.siblingAtColumn(TorrentContentLayoutModel::COL_PATH));
+    }
+
+    if (selectedRows.isEmpty())
+        return;
+
+    for (const QModelIndex &rowIndex : selectedRows)
+    {
+        const Path oldPath {rowIndex.data().toString()};
+        const Path newPath = m_commonPath / oldCommonPath.relativePathOf(oldPath);
+        m_model->setData(rowIndex, newPath.toString());
+    }
+}
+
 void TorrentContentLayoutDialog::apply()
 {
     m_model->applyChangedFilePaths();

src/gui/torrentcontentlayoutdialog.h

@@ -30,6 +30,7 @@
 
 #include <QDialog>
 
+#include "base/path.h"
 #include "base/settingvalue.h"
 
 class TorrentContentLayoutModel;
@@ -54,6 +55,10 @@ class TorrentContentLayoutDialog final : public QDialog
     ~TorrentContentLayoutDialog();
 
 private:
+    Path currentPath() const;
+    PathList selectedPaths() const;
+    void populateCommonPath();
+    void onCommonPathEdited(const QString &pathStr);
     void apply();
 
     Ui::TorrentContentLayoutDialog *m_ui = nullptr;
@@ -62,4 +67,6 @@ class TorrentContentLayoutDialog final : public QDialog
 
     SettingValue<QSize> m_storeDialogSize;
     SettingValue<QByteArray> m_storeViewState;
+
+    Path m_commonPath;
 };

src/gui/torrentcontentlayoutdialog.ui

@@ -13,22 +13,32 @@
   <property name="windowTitle">
    <string>Manage Torrent Content</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
+  <layout class="QVBoxLayout" name="dialogLayout">
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
+    <widget class="QTreeView" name="pathListView">
+     <property name="editTriggers">
+      <set>QAbstractItemView::EditTrigger::AllEditTriggers</set>
+     </property>
+     <property name="alternatingRowColors">
+      <bool>true</bool>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::SelectionMode::ExtendedSelection</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="commonPathLayout">
      <item>
-      <widget class="QTreeView" name="treeView">
-       <property name="editTriggers">
-        <set>QAbstractItemView::EditTrigger::AllEditTriggers</set>
-       </property>
-       <property name="alternatingRowColors">
-        <bool>true</bool>
-       </property>
-       <property name="selectionMode">
-        <enum>QAbstractItemView::SelectionMode::ExtendedSelection</enum>
+      <widget class="QLabel" name="commonPathLabel">
+       <property name="text">
+        <string>Common path:</string>
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QLineEdit" name="commonPathEdit"/>
+     </item>
     </layout>
    </item>
    <item>

src/gui/torrentcontentlayoutmodel.h

@@ -69,7 +69,7 @@ class TorrentContentLayoutModel final : public QAbstractItemModel
     Qt::ItemFlags flags(const QModelIndex &index) const override;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
-    bool setData(const QModelIndex &index, const QVariant &value, int role) override;
+    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
 
     bool haveChangedFilePaths() const;
     void applyChangedFilePaths();