Plugins::FileTransfer: create and delete directory

Author: KangLin

Plugins/FileTransfer/BackendFieTransfer.cpp

@@ -57,11 +57,18 @@ bool CBackendFieTransfer::event(QEvent *event)
     if(event->type() == QEvent::Type::User) {
         CFileTransferEvent* pEvent = (CFileTransferEvent*)event;
         switch(pEvent->m_Command) {
+        case CFileTransferEvent::Command::MakeDir:
+            if(m_pSFTP)
+                m_pSFTP->MakeDir(pEvent->m_szSourcePath);
+            break;
+        case CFileTransferEvent::Command::RemoveDir:
+            if(m_pSFTP)
+                m_pSFTP->RemoveDir(pEvent->m_szSourcePath);
+            break;
         case CFileTransferEvent::Command::GetDir:
         {
-            if(m_pSFTP) {
+            if(m_pSFTP)
                 m_pSFTP->slotGetDir(pEvent->m_pRemoteFileSystem);
-            }
             break;
         }
         case CFileTransferEvent::Command::Upload:
@@ -112,6 +119,12 @@ int CBackendFieTransfer::SetConnect(COperateFileTransfer *pOperate)
     check = connect(this, SIGNAL(sigGetDir(CRemoteFileSystem*, QVector<QSharedPointer<CRemoteFileSystem> >, bool)),
                     pForm, SIGNAL(sigGetDir(CRemoteFileSystem*, QVector<QSharedPointer<CRemoteFileSystem> >, bool)));
     Q_ASSERT(check);
+    check = connect(pForm, SIGNAL(sigMakeDir(const QString&)),
+                    this, SLOT(slotMakeDir(const QString&)));
+    Q_ASSERT(check);
+    check = connect(pForm, SIGNAL(sigRemoveDir(const QString&)),
+                    this, SLOT(slotRemoveDir(const QString&)));
+    Q_ASSERT(check);
     return nRet;
 }
 
@@ -129,6 +142,24 @@ CBackendFieTransfer::OnInitReturnValue CBackendFieTransfer::InitSFTP()
     return OnInitReturnValue::UseOnProcess;
 }
 
+void CBackendFieTransfer::slotMakeDir(const QString &szDir)
+{
+    if(szDir.isEmpty()) return;
+    CFileTransferEvent* pEvent = new CFileTransferEvent(
+        CFileTransferEvent::Command::MakeDir, szDir);
+    QCoreApplication::postEvent(this, pEvent);
+    WakeUp();
+}
+
+void CBackendFieTransfer::slotRemoveDir(const QString &szDir)
+{
+    if(szDir.isEmpty()) return;
+    CFileTransferEvent* pEvent = new CFileTransferEvent(
+        CFileTransferEvent::Command::RemoveDir, szDir);
+    QCoreApplication::postEvent(this, pEvent);
+    WakeUp();
+}
+
 void CBackendFieTransfer::slotGetDir(CRemoteFileSystem *p)
 {
     if(!p || p->GetPath().isEmpty())

Plugins/FileTransfer/BackendFieTransfer.h

@@ -24,6 +24,8 @@ class CBackendFieTransfer : public CBackend
     virtual int OnProcess() override;
 
 private Q_SLOTS:
+    void slotMakeDir(const QString& szDir);
+    void slotRemoveDir(const QString& szDir);
     void slotGetDir(CRemoteFileSystem*);
 Q_SIGNALS:
     void sigGetDir(CRemoteFileSystem*, QVector<QSharedPointer<CRemoteFileSystem> > contents, bool bEnd);

Plugins/FileTransfer/ChannelSFTP.cpp

@@ -187,7 +187,8 @@ int CChannelSFTP::MakeDir(const QString &dir)
         {
             qCritical(log) << "Can't create directory:" << nRet
                     << ssh_get_error(m_Session);
-        }
+        } else
+            qDebug(log) << "Create directory:" << dir;
     }
     return nRet;
 }
@@ -201,8 +202,9 @@ int CChannelSFTP::RemoveDir(const QString &dir)
     if (nRet != SSH_OK)
     {
         qCritical(log) << "Can't remove directory:" << nRet
-                       << ssh_get_error(m_Session);
-    }
+                       << ssh_get_error(m_Session) << dir;
+    } else
+        qDebug(log) << "Remove directory:" << dir;
     return nRet;
 }
 

Plugins/FileTransfer/FrmFileTransfer.cpp

@@ -24,7 +24,7 @@ CFrmFileTransfer::CFrmFileTransfer(QWidget *parent)
 {
     bool check = false;
     ui->setupUi(this);
-    
+
     m_pModelLocalDir = new QFileSystemModel(this);
     m_pModelLocalDir->setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
     m_pModelLocalDir->setReadOnly(false);
@@ -54,7 +54,7 @@ CFrmFileTransfer::CFrmFileTransfer(QWidget *parent)
     ui->tabLocal->verticalHeader()->hide();
     ui->tabLocal->horizontalHeader()->setSectionResizeMode(
         QHeaderView::ResizeToContents);
-    
+
     m_pModelRemoteDir = new CRemoteFileSystemModel(this);
     check = connect(m_pModelRemoteDir, SIGNAL(sigGetDir(CRemoteFileSystem*)),
                     this, SIGNAL(sigGetDir(CRemoteFileSystem*)));
@@ -366,10 +366,27 @@ void CFrmFileTransfer::slotTreeRemoteAddToList()
 
 void CFrmFileTransfer::slotTreeRemoteNew()
 {
+    QString szName = QInputDialog::getText(
+        this, tr("New folder"), tr("Folder name:"));
+    if(szName.isEmpty()) return;
+    auto idx = ui->treeRemote->currentIndex();
+    if(idx.isValid()) {
+        auto p = m_pModelRemoteDir->GetRemoteFileSystemFromIndex(idx);
+        if(p && !p->GetPath().isEmpty()) {
+            QString szPath = p->GetPath() + "/" + szName;
+            emit sigMakeDir(szPath);
+        }
+    }
 }
 
 void CFrmFileTransfer::slotTreeRemoteDelete()
 {
+    auto idx = ui->treeRemote->currentIndex();
+    if(idx.isValid()) {
+        auto p = m_pModelRemoteDir->GetRemoteFileSystemFromIndex(idx);
+        if(p && !p->GetPath().isEmpty())
+            emit sigRemoveDir(p->GetPath());
+    }
 }
 
 void CFrmFileTransfer::slotTreeRemoteRename()

Plugins/FileTransfer/FrmFileTransfer.h

@@ -23,11 +23,14 @@ class CFrmFileTransfer : public QWidget
 
 Q_SIGNALS:
     void sigUpload(const QString& source, const QString& destination);
+
+    void sigGetDir(CRemoteFileSystem*);
     void sigGetDir(CRemoteFileSystem*,
                        QVector<QSharedPointer<CRemoteFileSystem> > contents,
                        bool bEnd);
-Q_SIGNALS:
-    void sigGetDir(CRemoteFileSystem*);
+
+    void sigMakeDir(const QString &szPath);
+    void sigRemoveDir(const QString &szPath);
 
 private:
     //! Set local root path