Database: add CDatabaseFolder::InSubFolder

Author: KangLin

App/Client/Favorite/FavoriteModel.cpp

@@ -282,10 +282,15 @@ bool CFavoriteModel::Move(QModelIndex index, QModelIndex parentIndex)
     if(item.isFavorite())
         bRet = m_pDatabase->Move(item.id, nParentId);
     else {
-        if(item.id != nParentId)
+        if(item.id != nParentId && ip->FindRecursive(ipParent->item).isEmpty())
             bRet = m_pDatabase->MoveNode(item.id, nParentId);
-        else
-            qWarning(log) << "The same node:" << item.id;
+        else {
+            if(item.id == nParentId)
+                qWarning(log) << "The same node:" << item.id;
+            else
+                qWarning(log) << "The destination node is a child node of this node."
+                              << item.id << ipParent->item.id;
+        }
     }
     if(bRet)
         bRet = MoveTree(ip->item, ipParent->item.id);

Src/Database/DatabaseTree.cpp

@@ -346,12 +346,21 @@ bool CDatabaseFolder::MoveFolder(int id, int newParentId)
         qWarning(log) << GetError();
         return false;
     }
+    // Check the newParentId is not the child of id
+    bool bRet = InSubFolder(id, newParentId);
+    if(bRet) {
+        SetError("The id is the parent of newParentId. "
+                 + QString::number(id) + " is the parent of "
+                 + QString::number(newParentId));
+        qWarning(log) << GetError();
+        return false;
+    }
     QSqlQuery query(GetDatabase());
     query.prepare("UPDATE `" + m_szTableName + "` "
                   " SET `parent_id` = :parent_id WHERE `id` = :id");
     query.bindValue(":id", id);
     query.bindValue(":parent_id", newParentId);
-    bool bRet = query.exec();
+    bRet = query.exec();
     if (bRet)
         emit sigChanged();
     else {
@@ -449,6 +458,19 @@ QList<TreeItem> CDatabaseFolder::GetSubFolders(int parentId)
     return folders;
 }
 
+bool CDatabaseFolder::InSubFolder(int parentId, int id)
+{
+    bool bRet = false;
+    auto items = GetSubFolders(parentId);
+    foreach(auto it, items) {
+        if(it.GetId() == id)
+            return true;
+        bRet = InSubFolder(it.GetId(), id);
+        if(bRet) return true;
+    }
+    return bRet;
+}
+
 int CDatabaseFolder::GetCount(int parentId)
 {
     QSqlQuery query(GetDatabase());

Src/Database/DatabaseTree.h

@@ -77,6 +77,8 @@ class PLUGIN_EXPORT CDatabaseFolder : public CDatabase
     [[nodiscard]] TreeItem GetFolder(int id);
     [[nodiscard]] QList<TreeItem> GetAllFolders();
     [[nodiscard]] QList<TreeItem> GetSubFolders(int parentId);
+    [[nodiscard]] bool InSubFolder(int parentId, int id);
+
     /*!
      * \brief Get count
      * \param parentId: - 0 : Get all count