From 4b503008bca98d57c7380d3829dfeb5eec83a855 Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Tue, 7 Apr 2020 13:31:23 +0500
Subject: [PATCH] feature: remove duplicatte compression for emails

---
 plogical/backupUtilities.py | 40 +++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/plogical/backupUtilities.py b/plogical/backupUtilities.py
index 24a58e667..945ae845d 100755
--- a/plogical/backupUtilities.py
+++ b/plogical/backupUtilities.py
@@ -471,11 +471,10 @@ class backupUtilities:
 
         logging.CyberCPLogFileWriter.statusWriter(status, "Backing up email accounts..\n")
 
-        try:
-            make_archive(os.path.join(tempStoragePath, domainName), 'gztar', os.path.join("/home", "vmail", domainName))
-        except BaseException as msg:
-            pass
+        emailPath = '/home/vmail/%s' % (domainName)
 
+        if os.path.exists(emailPath):
+            copy_tree(emailPath, '%s/vmail' % (tempStoragePath))
 
         ## shutil.make_archive. Creating final package.
 
@@ -862,21 +861,32 @@ class backupUtilities:
 
             logging.CyberCPLogFileWriter.statusWriter(status, "Extracting email accounts!")
 
-            try:
-                pathToCompressedEmails = os.path.join(completPath, masterDomain + ".tar.gz")
-                emailHome = os.path.join("/home","vmail",masterDomain)
+            if not twoPointO:
 
-                tar = tarfile.open(pathToCompressedEmails)
-                tar.extractall(emailHome)
-                tar.close()
+                try:
+                    pathToCompressedEmails = os.path.join(completPath, masterDomain + ".tar.gz")
+                    emailHome = os.path.join("/home","vmail",masterDomain)
 
-                ## Change permissions
+                    tar = tarfile.open(pathToCompressedEmails)
+                    tar.extractall(emailHome)
+                    tar.close()
 
-                command = "chmod -r vmail:vmail " + emailHome
-                subprocess.call(shlex.split(command))
+                    ## Change permissions
 
-            except:
-                pass
+                    command = "chown -R vmail:vmail " + emailHome
+                    subprocess.call(shlex.split(command))
+
+                except:
+                    pass
+            else:
+
+                emailsPath = '%s/vmail' % (completPath)
+
+                if os.path.exists(emailsPath):
+                    copy_tree(emailsPath, '/home/vmail/%s' % (masterDomain))
+
+                command = "chown -R vmail:vmail /home/vmail/%s" % (masterDomain)
+                ProcessUtilities.executioner(command)
 
             ## emails extracted