From 97ae6eca2887655dbe44d2c9864d341a449e59a9 Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Thu, 7 May 2020 17:15:31 +0500
Subject: [PATCH] fix : https://github.com/usmannasir/cyberpanel/issues/329

---
 backup/backupManager.py        | 41 +++++++++++++++-------------------
 backup/static/backup/backup.js |  1 +
 static/backup/backup.js        |  1 +
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/backup/backupManager.py b/backup/backupManager.py
index f7181f4ca..6e298d26b 100755
--- a/backup/backupManager.py
+++ b/backup/backupManager.py
@@ -1115,32 +1115,27 @@ class BackupManager:
 
             time.sleep(3)
 
-            if os.path.isfile(backupLogPath):
-                command = "sudo cat " + backupLogPath
-                status = ProcessUtilities.outputExecutioner(command)
+            command = "sudo cat " + backupLogPath
+            status = ProcessUtilities.outputExecutioner(command)
 
-                if status.find("completed[success]") > -1:
-                    command = "rm -rf " + removalPath
-                    ProcessUtilities.executioner(command)
-                    data_ret = {'remoteTransferStatus': 1, 'error_message': "None", "status": status, "complete": 1}
-                    json_data = json.dumps(data_ret)
-                    return HttpResponse(json_data)
-                elif status.find("[5010]") > -1:
-                    command = "sudo rm -rf " + removalPath
-                    ProcessUtilities.executioner(command)
-                    data = {'remoteTransferStatus': 0, 'error_message': status,
-                            "status": "None", "complete": 0}
-                    json_data = json.dumps(data)
-                    return HttpResponse(json_data)
-                else:
-                    data_ret = {'remoteTransferStatus': 1, 'error_message': "None", "status": status, "complete": 0}
-                    json_data = json.dumps(data_ret)
-                    return HttpResponse(json_data)
-            else:
-                data_ret = {'remoteTransferStatus': 0, 'error_message': "No such log found", "status": "None",
-                            "complete": 0}
+            if status.find("completed[success]") > -1:
+                command = "rm -rf " + removalPath
+                ProcessUtilities.executioner(command)
+                data_ret = {'remoteTransferStatus': 1, 'error_message': "None", "status": status, "complete": 1}
                 json_data = json.dumps(data_ret)
                 return HttpResponse(json_data)
+            elif status.find("[5010]") > -1:
+                command = "sudo rm -rf " + removalPath
+                ProcessUtilities.executioner(command)
+                data = {'remoteTransferStatus': 0, 'error_message': status,
+                        "status": "None", "complete": 0}
+                json_data = json.dumps(data)
+                return HttpResponse(json_data)
+            else:
+                data_ret = {'remoteTransferStatus': 1, 'error_message': "None", "status": status, "complete": 0}
+                json_data = json.dumps(data_ret)
+                return HttpResponse(json_data)
+
         except BaseException as msg:
             data = {'remoteTransferStatus': 0, 'error_message': str(msg), "status": "None", "complete": 0}
             json_data = json.dumps(data)
diff --git a/backup/static/backup/backup.js b/backup/static/backup/backup.js
index a41fffb41..cbe74d8ef 100755
--- a/backup/static/backup/backup.js
+++ b/backup/static/backup/backup.js
@@ -1347,6 +1347,7 @@ app.controller('remoteBackupControl', function ($scope, $http, $timeout) {
         $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas);
 
         function ListInitialDatas(response) {
+            $scope.backupProcessStarted = true;
 
             if (response.data.remoteTransferStatus === 1) {
 
diff --git a/static/backup/backup.js b/static/backup/backup.js
index a41fffb41..cbe74d8ef 100644
--- a/static/backup/backup.js
+++ b/static/backup/backup.js
@@ -1347,6 +1347,7 @@ app.controller('remoteBackupControl', function ($scope, $http, $timeout) {
         $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas);
 
         function ListInitialDatas(response) {
+            $scope.backupProcessStarted = true;
 
             if (response.data.remoteTransferStatus === 1) {