Small refactoring of delete func

Author: Lightjohn

QtFileExplorer.pro

@@ -18,14 +18,16 @@ SOURCES += main.cpp\
     mywindows.cpp \
     fileinfo.cpp \
     imagepreview.cpp \
-    keypresseater.cpp
+    keypresseater.cpp \
+    refreshtask.cpp
 
 HEADERS  += \
     deletetask.h \
     mywindows.h \
     fileinfo.h \
     imagepreview.h \
-    keypresseater.h
+    keypresseater.h \
+    refreshtask.h
 
 FORMS    +=
 

deletetask.cpp

@@ -7,31 +7,37 @@ deletetask::deletetask(QStringList something, QLabel *status,
   this->todelete = something;
 }
 
-void deletetask::run() {
-  status->setText("DELETING " + todelete.at(0));
-
-  for (int i = 0; i < todelete.length(); ++i) {
-    // qDebug() << "DELETE" << shiftList.at(i);
-    // Old delete = RM -r
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
-
-    QFileInfo tmp(todelete.at(i));
+void deletetask::deleteFileRm(QString filepath) {
+    QFileInfo tmp(filepath);
     if (tmp.isFile()) {
-      QFile file(todelete.at(i));
+      QFile file(filepath);
       if (!file.remove()) {
         qDebug() << "File not deleted: " << file.fileName();
       }
     } else {
-      QDir folder(todelete.at(i));
+      QDir folder(filepath);
       if (!folder.removeRecursively()) {
         qDebug() << "Not all was deleted: " << folder.absolutePath();
       }
     }
+}
+
+void deletetask::run() {
+  status->setText("DELETING " + todelete.at(0));
+
+  for (int i = 0; i < todelete.length(); ++i) {
+    // qDebug() << "DELETE" << shiftList.at(i);
+    // Old delete = RM -r
+    QString toDelete = todelete.at(i);
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
+    deleteFileRm(toDelete);
 #else
     // New delete = Move to Trash
-    QString toDelete = todelete.at(i);
     if (!QFile::moveToTrash(toDelete)) {
       qDebug() << "Not deleted: " << toDelete;
+      qDebug() << "Trying to rm ";
+      deleteFileRm(toDelete);
+
     }
 #endif
   }

deletetask.h

@@ -11,7 +11,7 @@ class deletetask : public QRunnable {
 public:
   deletetask(QStringList, QLabel *, QList<QString> *);
   void run() override;
-
+  void deleteFileRm(QString filepath);
 private:
   QLabel *status;
   QList<QString> *deleteList;

mywindows.cpp

@@ -161,8 +161,7 @@ void myWindows::clickedNew(QModelIndex index, QModelIndex) {
   updatePath(index);
   QString fileName = model->fileName(index);
   QFileInfo infoFile(lastFilePath);
-  QString ext = fileName.split(".")
-                    .back(); // We could use here QFileInfo::completeSuffix()
+  QString ext = fileName.split(".").back(); // We could use here QFileInfo::completeSuffix()
   int SIZE_NAME_MAX = 50;
   if (fileName.length() > SIZE_NAME_MAX) {
     info->setName(fileName.mid(0, SIZE_NAME_MAX));
@@ -341,23 +340,28 @@ void myWindows::saveSettings() {
   settings.setValue("depthMax", MAX_DEPTH);
 }
 
+int myWindows::canDelete() {
+    QMessageBox box;
+    box.setText("Selected files/folders will be eternally deleted !!");
+    box.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
+    box.setWindowFlags(Qt::WindowStaysOnTopHint);
+    box.setDefaultButton(QMessageBox::Ok);
+    return box.exec();
+}
+
+
 void myWindows::keyboardDel() {
   // If oldDelete i.e rm -r, ask for confirmation else move to bin
 #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
-  QMessageBox box;
-  box.setText("Selected files/folders will be eternally deleted !!");
-  box.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
-  box.setWindowFlags(Qt::WindowStaysOnTopHint);
-  box.setDefaultButton(QMessageBox::Ok);
-  int ret = box.exec();
+  int ret = canDelete();
+#else
+  // New way, we can "delete" all the time
+  int ret = QMessageBox::Ok;
+#endif
   if (ret == QMessageBox::Ok) {
     deletetask *task = new deletetask(shiftList, deleteStatus, toDelete);
     QThreadPool::globalInstance()->start(task);
   }
-#else
-  deletetask *task = new deletetask(shiftList, deleteStatus, toDelete);
-  QThreadPool::globalInstance()->start(task);
-#endif
 }
 
 // To add coloration to folders/files

mywindows.h

@@ -62,6 +62,7 @@ class myWindows : public QWidget {
   int screenW;
   void closeEvent(QCloseEvent *);
 
+  int canDelete();
 public slots:
   void clickedNew(QModelIndex index, QModelIndex index2);
   void keyboardEvent();

refreshtask.cpp

@@ -0,0 +1,21 @@
+#include "refreshtask.h"
+
+
+
+refreshtask::refreshtask(QLabel *preview, QString path, int depth)
+{
+    shouldrun = false;
+    maxdepth = depth;
+    currentPath = path;
+    this->preview = preview;
+}
+
+
+void refreshtask::run() {
+
+
+}
+
+void refreshtask::stop() {
+    shouldrun = true;
+}

refreshtask.h

@@ -0,0 +1,23 @@
+#ifndef REFRESHTASK_H
+#define REFRESHTASK_H
+
+#include <QRunnable>
+#include <QFileInfo>
+#include <QLabel>
+#include <QDir>
+
+
+class refreshtask: public QRunnable
+{
+public:
+  refreshtask(QLabel *preview, QString currentPath, int depth);
+  void run() override;
+  void stop();
+private:
+  bool shouldrun;
+  QLabel *preview;
+  QString currentPath;
+  int maxdepth;
+};
+
+#endif // REFRESHTASK_H