Fix

horsicq · Jan 3, 2020 · 514add8 · 514add8
1 parent 5460c5c
commit 514add8
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 11 deletions.
diff --git a/Formats b/Formats
diff --git a/global.h b/global.h
@@ -28,7 +28,7 @@
 #define X_ORGANIZATIONNAME "NTInfo"
 #define X_ORGANIZATIONDOMAIN "ntinfo.biz"
 #define X_HOMEPAGE "https://github.com/horsicq/x64dbg-Plugin-Manager"
-#define X_SEVERVERSION "https://raw.githubusercontent.com/horsicq/x64dbg-Plugin-Manager/master/release_version.txt"
+#define X_SERVERVERSION "https://raw.githubusercontent.com/horsicq/x64dbg-Plugin-Manager/master/release_version.txt"
 
 #define X_JSON_DEFAULT "https://raw.githubusercontent.com/x64dbg/PluginManager/master/list.json"
 

diff --git a/gui_source/dialoginstallmodule.h b/gui_source/dialoginstallmodule.h
@@ -34,7 +34,7 @@ class DialogInstallModule : public QDialog
     Q_OBJECT
 
 public:
-    explicit DialogInstallModule(QWidget *parent, XPLUGINMANAGER::OPTIONS *pOptions, QString sModuleFileName);
+    explicit DialogInstallModule(QWidget *parent, XPLUGINMANAGER::OPTIONS *pOptions,QString sModuleFileName);
     ~DialogInstallModule();
 
 private slots:

diff --git a/gui_source/guimainwindow.cpp b/gui_source/guimainwindow.cpp
@@ -639,7 +639,7 @@ void GuiMainWindow::updateAllInstalledPlugins()
 void GuiMainWindow::checkForUpdates()
 {
     QNetworkAccessManager manager(this);
-    QNetworkRequest request(QUrl(X_SEVERVERSION));
+    QNetworkRequest request(QUrl(X_SERVERVERSION));
     QNetworkReply *pReply=manager.get(request);
     QEventLoop loop;
     QObject::connect(pReply, SIGNAL(finished()), &loop, SLOT(quit()));

diff --git a/removemoduleprocess.cpp b/removemoduleprocess.cpp
@@ -73,19 +73,41 @@ void RemoveModuleProcess::process()
 
                 emit infoMessage(currentStats.sFile);
 
-                if(record.bIsFile)
+                if(record.action==Utils::RRA_REMOVEFILE)
                 {
                     XBinary::removeFile(record.sFullPath);
+
+                    if(XBinary::isFileExists(record.sFullPath))
+                    {
+                        emit errorMessage(tr("%1: %2").arg(tr("Cannot remove file")).arg(record.sFullPath));
+                        bIsStop=true;
+                    }
                 }
-                else
+                else if(record.action==Utils::RRA_REMOVEDIRECTORYIFEMPTY)
                 {
-                    XBinary::removeDirectory(record.sFullPath);
+                    if(XBinary::isDirectoryEmpty(record.sFullPath))
+                    {
+                        XBinary::removeDirectory(record.sFullPath);
+
+                        if(XBinary::isDirectoryExists(record.sFullPath))
+                        {
+                            emit errorMessage(tr("%1: %2").arg(tr("Cannot remove directory")).arg(record.sFullPath));
+                            bIsStop=true;
+                        }
+                    }
                 }
 
                 currentStats.nCurrentFile=j+1;
             }
 
-            XBinary::removeFile(sFileName);
+            if(!bIsStop)
+            {
+                XBinary::removeFile(sFileName);
+            }
+            else
+            {
+                emit errorMessage(tr("Please, close all applications and try again."));
+            }
         }
 
         currentStats.nCurrentModule=i+1;

diff --git a/utils.cpp b/utils.cpp
@@ -184,7 +184,7 @@ QByteArray Utils::createPluginInfo(Utils::MDATA *pMData, QList<Utils::FILE_RECOR
             removeArray.append(record);
         }
 
-        for(int i=0;i<nDirectoriesCount;i++)
+        for(int i=nDirectoriesCount-1;i>=0;i--)
         {
             QJsonObject record;
 
@@ -291,7 +291,11 @@ Utils::MDATA Utils::getMDataFromData(QByteArray baData, QString sRootPath)
 
         if(sAction=="remove_file")
         {
-            record.bIsFile=true;
+            record.action=RRA_REMOVEFILE;
+        }
+        else if(sAction=="remove_directory_if_empty")
+        {
+            record.action=RRA_REMOVEDIRECTORYIFEMPTY;
         }
 
         result.listRemoveRecords.append(record);

diff --git a/utils.h b/utils.h
@@ -80,11 +80,18 @@ class Utils : public QObject
         QString sSHA1;
     };
 
+    enum RRA
+    {
+        RRA_UNKNOWN=0,
+        RRA_REMOVEFILE,
+        RRA_REMOVEDIRECTORYIFEMPTY
+    };
+
     struct REMOVE_RECORD
     {
         QString sFullPath;
         QString sPath;
-        bool bIsFile;
+        RRA action;
     };
 
     struct MDATA