From 54d8ee4b7d0e3e7d00ce432e2900f9e33430b95e Mon Sep 17 00:00:00 2001
From: xithical <86810816+xithical@users.noreply.github.com>
Date: Sun, 27 Feb 2022 10:32:26 -0600
Subject: [PATCH 01/18] Add migration for excluded backup directories

Changes the column 'directories' in the backups table to 'excluded_dirs' so that we're only storing a list of excluded directories
---
 app/migrations/20220227162446_backup_options.py | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 app/migrations/20220227162446_backup_options.py

diff --git a/app/migrations/20220227162446_backup_options.py b/app/migrations/20220227162446_backup_options.py
new file mode 100644
index 00000000..1239dd54
--- /dev/null
+++ b/app/migrations/20220227162446_backup_options.py
@@ -0,0 +1,8 @@
+# Generated by database migrator
+import peewee
+
+def migrate(migrator, db):
+    migrator.rename_column('backups', 'directories', 'excluded_dirs')
+
+def rollback(migrator, db):
+    migrator.rename_column('backups', 'excluded_dirs', 'directories')
\ No newline at end of file

From 29800eee3c4ba67b3db8e6c0270c9ac5a481a6ef Mon Sep 17 00:00:00 2001
From: xithical <86810816+xithical@users.noreply.github.com>
Date: Sun, 27 Feb 2022 12:35:48 -0600
Subject: [PATCH 02/18] Add methods for excluded backup directories

Adds get, add, and delete methods for excluded backup directories
---
 app/classes/models/management.py | 36 +++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/app/classes/models/management.py b/app/classes/models/management.py
index b652ff11..b089df70 100644
--- a/app/classes/models/management.py
+++ b/app/classes/models/management.py
@@ -125,7 +125,7 @@ class Schedules(Model):
 #                                   Backups Class
 #************************************************************************************************
 class Backups(Model):
-    directories = CharField(null=True)
+    excluded_dirs = CharField(null=True)
     max_backups = IntegerField()
     server_id = ForeignKeyField(Servers, backref='backups_server')
     class Meta:
@@ -311,28 +311,28 @@ class helpers_management:
             row = Backups.select().where(Backups.server_id == server_id).join(Servers)[0]
             conf = {
                 "backup_path": row.server_id.backup_path,
-                "directories": row.directories,
+                "excluded_dirs": row.excluded_dirs,
                 "max_backups": row.max_backups,
                 "server_id": row.server_id.server_id
             }
         except IndexError:
             conf = {
                 "backup_path": None,
-                "directories": None,
+                "excluded_dirs": None,
                 "max_backups": 0,
                 "server_id": server_id
             }
         return conf
 
     @staticmethod
-    def set_backup_config(server_id: int, backup_path: str = None, max_backups: int = None):
+    def set_backup_config(server_id: int, backup_path: str = None, max_backups: int = None, excluded_dirs: list = None):
         logger.debug(f"Updating server {server_id} backup config with {locals()}")
         if Backups.select().where(Backups.server_id == server_id).count() != 0:
             new_row = False
             conf = {}
         else:
             conf = {
-                "directories": None,
+                "excluded_dirs": None,
                 "max_backups": 0,
                 "server_id":   server_id
             }
@@ -354,6 +354,32 @@ class helpers_management:
                     Servers.update(backup_path=backup_path).where(Servers.server_id == server_id)
                 Backups.create(**conf)
             logger.debug("Creating new backup record.")
+    
+    @staticmethod
+    def get_excluded_backup_dirs(server_id: int):
+        excluded_dirs = Backups.select(Backups.excluded_dirs).where(Backups.server_id == server_id).execute()
+        dir_list = excluded_dirs.split(",")
+        return dir_list
+
+    @staticmethod
+    def add_excluded_backup_dir(server_id: int, dir_to_add: str):
+        dir_list = management_helper.get_excluded_backup_dirs()
+        if dir_to_add not in dir_list:
+            dir_list.append(dir_to_add)
+            excluded_dirs = ",".join(dir_list)
+            management_helper.set_backup_config(server_id=server_id, excluded_dirs=excluded_dirs)
+        else:
+            logger.debug(f"Not adding {dir_to_add} to excluded directories - already in the excluded directory list for server ID {server_id}")
+    
+    @staticmethod
+    def del_excluded_backup_dir(server_id: int, dir_to_del: str):
+        dir_list = management_helper.get_excluded_backup_dirs()
+        if dir_to_del in dir_list:
+            dir_list.remove(dir_to_del)
+            excluded_dirs = ",".join(dir_list)
+            management_helper.set_backup_config(server_id=server_id, excluded_dirs=excluded_dirs)
+        else:
+            logger.debug(f"Not removing {dir_to_del} from excluded directories - not in the excluded directory list for server ID {server_id}")
 
 
 management_helper = helpers_management()

From 7c5bb0984cfb3e409b0ef19ed84a914144aa41f0 Mon Sep 17 00:00:00 2001
From: xithical <86810816+xithical@users.noreply.github.com>
Date: Sun, 27 Feb 2022 13:11:22 -0600
Subject: [PATCH 03/18] Add logic for removing excluded files/dirs from backups

Updated backup thread to copy all server files to a temporary directory, iterate through excluded directory list, remove excluded directories/files, then create the backup archive
---
 app/classes/shared/server.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 82e1c1da..0a01ff90 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -8,6 +8,7 @@ import logging.config
 import shutil
 import subprocess
 import html
+import tempfile
 from apscheduler.schedulers.background import BackgroundScheduler
 #TZLocal is set as a hidden import on win pipeline
 from tzlocal import get_localzone
@@ -568,14 +569,30 @@ class Server:
             backup_filename = f"{self.settings['backup_path']}/{datetime.datetime.now().strftime('%Y-%m-%d_%H-%M-%S')}"
             logger.info(f"Creating backup of server '{self.settings['server_name']}'" +
                         f" (ID#{self.server_id}, path={self.server_path}) at '{backup_filename}'")
-            shutil.make_archive(helper.get_os_understandable_path(backup_filename), 'zip', self.server_path)
+            
+            # shutil.make_archive(helper.get_os_understandable_path(backup_filename), 'zip', self.server_path)
+            tempDir = tempfile.mkdtemp()
+            shutil.copytree(self.server_path, tempDir)
+            excluded_dirs = management_helper.get_excluded_backup_dirs(self.server_id)
+            server_dir = helper.get_os_understandable_path(self.settings['path'])
+            for dir in excluded_dirs:
+                temp_dir = helper.get_os_understandable_path(dir).replace(server_dir, helper.get_os_understandable_path(tempDir))
+                if os.path.isdir(temp_dir):
+                    shutil.rmtree(temp_dir)
+                else:
+                    os.remove(temp_dir)
+            
+            shutil.make_archive(helper.get_os_understandable_path(backup_filename), 'zip', tempDir)
+
             while len(self.list_backups()) > conf["max_backups"] and conf["max_backups"] > 0:
                 backup_list = self.list_backups()
                 oldfile = backup_list[0]
                 oldfile_path = f"{conf['backup_path']}/{oldfile['path']}"
                 logger.info(f"Removing old backup '{oldfile['path']}'")
                 os.remove(helper.get_os_understandable_path(oldfile_path))
+
             self.is_backingup = False
+            shutil.rmtree(tempDir)
             logger.info(f"Backup of server: {self.name} completed")
             return
         except:

From eaca8acf72bce838ea79285949313ab1e0b42ac2 Mon Sep 17 00:00:00 2001
From: xithical <86810816+xithical@users.noreply.github.com>
Date: Sun, 27 Feb 2022 13:17:14 -0600
Subject: [PATCH 04/18] Clean up backup server method for readability

---
 app/classes/shared/server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 0a01ff90..71e1148a 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -570,11 +570,11 @@ class Server:
             logger.info(f"Creating backup of server '{self.settings['server_name']}'" +
                         f" (ID#{self.server_id}, path={self.server_path}) at '{backup_filename}'")
             
-            # shutil.make_archive(helper.get_os_understandable_path(backup_filename), 'zip', self.server_path)
             tempDir = tempfile.mkdtemp()
             shutil.copytree(self.server_path, tempDir)
             excluded_dirs = management_helper.get_excluded_backup_dirs(self.server_id)
             server_dir = helper.get_os_understandable_path(self.settings['path'])
+            
             for dir in excluded_dirs:
                 temp_dir = helper.get_os_understandable_path(dir).replace(server_dir, helper.get_os_understandable_path(tempDir))
                 if os.path.isdir(temp_dir):

From cf5bfe88c172b028ce086138d86ed64a70195a7a Mon Sep 17 00:00:00 2001
From: xithical <86810816+xithical@users.noreply.github.com>
Date: Sun, 27 Feb 2022 13:21:54 -0600
Subject: [PATCH 05/18] Better documentation for backup logic

---
 app/classes/shared/server.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 71e1148a..dec37d8a 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -574,13 +574,18 @@ class Server:
             shutil.copytree(self.server_path, tempDir)
             excluded_dirs = management_helper.get_excluded_backup_dirs(self.server_id)
             server_dir = helper.get_os_understandable_path(self.settings['path'])
-            
+
             for dir in excluded_dirs:
-                temp_dir = helper.get_os_understandable_path(dir).replace(server_dir, helper.get_os_understandable_path(tempDir))
-                if os.path.isdir(temp_dir):
-                    shutil.rmtree(temp_dir)
+                # Take the full path of the excluded dir and replace the server path with the temp path
+                # This is so that we're only deleting excluded dirs from the temp path and not the server path
+                excluded_dir = helper.get_os_understandable_path(dir).replace(server_dir, helper.get_os_understandable_path(tempDir))
+                # Next, check to see if it is a directory
+                if os.path.isdir(excluded_dir):
+                    # If it is a directory, recursively delete the entire directory from the backup
+                    shutil.rmtree(excluded_dir)
                 else:
-                    os.remove(temp_dir)
+                    # If not, just remove the file
+                    os.remove(excluded_dir)
             
             shutil.make_archive(helper.get_os_understandable_path(backup_filename), 'zip', tempDir)
 

From 4b484782c61866872bf6d6d350f3f8a400c08106 Mon Sep 17 00:00:00 2001
From: xithical <86810816+xithical@users.noreply.github.com>
Date: Sun, 27 Feb 2022 13:38:16 -0600
Subject: [PATCH 06/18] Fix excluded directories not being separatable

Excluded directories were being pulled from the database as not a string, so I just used the get_backup_config() method to pull exclusions as a string so I could split it
---
 app/classes/models/management.py | 2 +-
 app/classes/shared/server.py     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/classes/models/management.py b/app/classes/models/management.py
index b089df70..887b2d27 100644
--- a/app/classes/models/management.py
+++ b/app/classes/models/management.py
@@ -357,7 +357,7 @@ class helpers_management:
     
     @staticmethod
     def get_excluded_backup_dirs(server_id: int):
-        excluded_dirs = Backups.select(Backups.excluded_dirs).where(Backups.server_id == server_id).execute()
+        excluded_dirs = helpers_management.get_backup_config(server_id)['excluded_dirs']
         dir_list = excluded_dirs.split(",")
         return dir_list
 
diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index dec37d8a..06d6b453 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -571,7 +571,7 @@ class Server:
                         f" (ID#{self.server_id}, path={self.server_path}) at '{backup_filename}'")
             
             tempDir = tempfile.mkdtemp()
-            shutil.copytree(self.server_path, tempDir)
+            shutil.copytree(self.server_path, tempDir, dirs_exist_ok=True)
             excluded_dirs = management_helper.get_excluded_backup_dirs(self.server_id)
             server_dir = helper.get_os_understandable_path(self.settings['path'])
 

From 6d7ddf8494663d07fbb4b2af27434f5e8c0f4cc5 Mon Sep 17 00:00:00 2001
From: xithical <86810816+xithical@users.noreply.github.com>
Date: Sun, 27 Feb 2022 15:08:03 -0600
Subject: [PATCH 07/18] Add controllers for backup exclusion logic

---
 app/classes/controllers/management_controller.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/classes/controllers/management_controller.py b/app/classes/controllers/management_controller.py
index d256c52a..1d1fdc8f 100644
--- a/app/classes/controllers/management_controller.py
+++ b/app/classes/controllers/management_controller.py
@@ -106,3 +106,15 @@ class Management_Controller:
     @staticmethod
     def set_backup_config(server_id: int, backup_path: str = None, max_backups: int = None):
         return management_helper.set_backup_config(server_id, backup_path, max_backups)
+
+    @staticmethod
+    def get_excluded_backup_dirs(server_id: int):
+        return management_helper.get_excluded_backup_dirs(server_id)
+
+    @staticmethod
+    def add_excluded_backup_dir(server_id: int, dir_to_add: str):
+        management_helper.add_excluded_backup_dir(server_id, dir_to_add)
+
+    @staticmethod
+    def del_excluded_backup_dir(server_id: int, dir_to_del: str):
+        management_helper.del_excluded_backup_dir(server_id, dir_to_del)
\ No newline at end of file

From e7d78cadd405f633975c0065fa41d941bda20e8b Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sun, 27 Feb 2022 16:15:40 -0500
Subject: [PATCH 08/18] Initial frontend for backup omissions

---
 app/classes/shared/helpers.py                 |  57 +++++
 app/classes/web/ajax_handler.py               |  21 ++
 .../templates/panel/server_backup.html        | 207 ++++++++++++++++++
 .../templates/server/bedrock_wizard.html      |  20 +-
 app/frontend/templates/server/wizard.html     |  20 +-
 5 files changed, 313 insertions(+), 12 deletions(-)

diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index a4566df5..72a583a7 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -737,6 +737,57 @@ class Helpers:
 
         return output
 
+    @staticmethod
+    def generate_backup_tree(folder, output=""):
+        file_list = os.listdir(folder)
+        file_list = sorted(file_list, key=str.casefold)
+        output += \
+    f"""<ul class="tree-nested d-block" id="{folder}ul">"""\
+
+        for raw_filename in file_list:
+            filename = html.escape(raw_filename)
+            rel = os.path.join(folder, raw_filename)
+            dpath = os.path.join(folder, filename)
+            if os.path.isdir(rel):
+                output += \
+                    f"""<li class="tree-item" data-path="{dpath}">
+                    \n<div id="{dpath}" data-path="{dpath}" data-name="{filename}" class="tree-caret tree-ctx-item tree-folder">
+                    <input type="checkbox" name="root_path" value="{dpath}">
+                    <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
+                      <i class="far fa-folder"></i>
+                      <i class="far fa-folder-open"></i>
+                      {filename}
+                      </span>
+                    </input></div><li>
+                    \n"""\
+
+        return output
+
+    @staticmethod
+    def generate_backup_dir(folder, output=""):
+        file_list = os.listdir(folder)
+        file_list = sorted(file_list, key=str.casefold)
+        output += \
+    f"""<ul class="tree-nested d-block" id="{folder}ul">"""\
+
+        for raw_filename in file_list:
+            filename = html.escape(raw_filename)
+            rel = os.path.join(folder, raw_filename)
+            dpath = os.path.join(folder, filename)
+            if os.path.isdir(rel):
+                output += \
+                    f"""<li class="tree-item" data-path="{dpath}">
+                    \n<div id="{dpath}" data-path="{dpath}" data-name="{filename}" class="tree-caret tree-ctx-item tree-folder">
+                    <input type="checkbox" name="root_path" value="{dpath}">
+                    <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
+                      <i class="far fa-folder"></i>
+                      <i class="far fa-folder-open"></i>
+                      {filename}
+                      </span>
+                    </input></div><li>"""\
+
+        return output
+
     @staticmethod
     def generate_zip_dir(folder, output=""):
         file_list = os.listdir(folder)
@@ -773,6 +824,12 @@ class Helpers:
                 websocket_helper.broadcast_user(user_id, 'send_temp_path',{
                 'path': tempDir
                 })
+    @staticmethod
+    def backup_select(path, user_id):
+        if user_id:
+            websocket_helper.broadcast_user(user_id, 'send_temp_path',{
+            'path': path
+        })
 
     @staticmethod
     def unzip_backup_archive(backup_path, zip_name):
diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index 5d739c9a..72f6ca08 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -146,6 +146,22 @@ class AjaxHandler(BaseHandler):
                         helper.generate_zip_dir(path))
             self.finish()
 
+        elif page == "get_backup_tree":
+            server_id = self.get_argument('id', None)
+            path = self.get_argument('path', None)
+
+            self.write(helper.get_os_understandable_path(path) + '\n' +
+                        helper.generate_backup_tree(path, server_id))
+            self.finish()
+
+        elif page == "get_backup_dir":
+            server_id = self.get_argument('id', None)
+            path = self.get_argument('path', None)
+
+            self.write(helper.get_os_understandable_path(path) + '\n' +
+                        helper.generate_backup_dir(path, server_id))
+            self.finish()
+
         elif page == "get_dir":
             server_id = self.get_argument('id', None)
             path = self.get_argument('path', None)
@@ -318,6 +334,11 @@ class AjaxHandler(BaseHandler):
             helper.unzipServer(path, exec_user['user_id'])
             return
 
+        elif page == "backup_select":
+            path = self.get_argument('path', None)
+            helper.backup_select(path, exec_user['user_id'])
+            return
+
 
     @tornado.web.authenticated
     def delete(self, page):
diff --git a/app/frontend/templates/panel/server_backup.html b/app/frontend/templates/panel/server_backup.html
index e71522c2..df305d3d 100644
--- a/app/frontend/templates/panel/server_backup.html
+++ b/app/frontend/templates/panel/server_backup.html
@@ -55,6 +55,46 @@
                         <input type="text" class="form-control" name="max_backups" id="max_backups" value="{{ data['backup_config']['max_backups']  }}" placeholder="{{ translate('serverBackups', 'maxBackups', data['lang']) }}" >
                       </div>
 
+                      <div class="col-sm-12">
+                        <div class="form-group">
+                          <label for="server">{{ translate('serverWizard', 'selectRoot', data['lang']) }} <small>{{ translate('serverWizard', 'explainRoot', data['lang']) }}</small></label>
+                          <br>
+                          <button class="btn btn-primary mr-2" id="root_files_button" data-server_path="{{ data['server_stats']['server_id']['path']}}" type="button">{{ translate('serverWizard', 'clickRoot', data['lang']) }}</button>
+                        </div>
+                      </div>
+                      <div class="col-sm-12" style="visibility: hidden;">
+                        <div class="form-group">
+                          <input type="text" class="form-control" id="zip_root_path" name="zip_root_path">
+                        </div>
+                      </div>
+                      <div class="modal fade" id="dir_select" tabindex="-1" role="dialog" aria-labelledby="dir_select" aria-hidden="true">
+                        <div class="modal-dialog" role="document">
+                          <div class="modal-content">
+                            <div class="modal-header">
+                              <h5 class="modal-title" id="exampleModalLongTitle">{{ translate('serverWizard', 'selectZipDir', data['lang']) }}</h5>
+                              <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                                <span aria-hidden="true">&times;</span>
+                              </button>
+                            </div>
+                            <div class="modal-body">
+                              <div class="tree-ctx-item" id="main-tree-div" data-path="" style="overflow: scroll; max-height:75%;">
+                                <input type="checkbox" id="main-tree-input" name="root_path" value="" disabled>
+                                  <span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path="">
+                                    <i class="far fa-folder"></i>
+                                    <i class="far fa-folder-open"></i>
+                                    {{ translate('serverFiles', 'files', data['lang']) }}
+                                    </span>
+                                </input>
+                              </div>
+                            </div>
+                            <div class="modal-footer">
+                              <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ translate('serverWizard', 'close', data['lang']) }}</button>
+                              <button type="button" id="modal-okay" data-dismiss="modal" class="btn btn-primary">{{ translate('serverWizard', 'save', data['lang']) }}</button>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+
                       <button type="submit" class="btn btn-success mr-2">{{ translate('serverBackups', 'save', data['lang']) }}</button>
                       <button type="reset" class="btn btn-light">{{ translate('serverBackups', 'cancel', data['lang']) }}</button>
                     </form>
@@ -116,6 +156,44 @@
 
 
 </div>
+<style>
+  /* Remove default bullets */
+ .tree-view,
+ .tree-nested {
+   list-style-type: none;
+   margin: 0;
+   padding: 0;
+   margin-left: 10px;
+ }
+
+ /* Style the items */
+ .tree-item,
+ .files-tree-title {
+   cursor: pointer;
+   user-select: none; /* Prevent text selection */
+ }
+
+ /* Create the caret/arrow with a unicode, and style it */
+ .tree-caret .fa-folder {
+   display: inline-block;
+ }
+ .tree-caret .fa-folder-open {
+   display: none;
+ }
+
+ /* Rotate the caret/arrow icon when clicked on (using JavaScript) */
+ .tree-caret-down .fa-folder {
+   display: none;
+ }
+ .tree-caret-down .fa-folder-open {
+   display: inline-block;
+ }
+
+ /* Hide the nested list */
+ .tree-nested {
+   display: none;
+ }
+</style>
 <!-- content-wrapper ends -->
 
 {% end %}
@@ -123,6 +201,7 @@
 {% block js %}
 <script>
 
+const server_id = new URLSearchParams(document.location.search).get('id')
 
     //used to get cookies from browser - this is part of tornados xsrf protection - it's for extra security
     function getCookie(name) {
@@ -258,6 +337,134 @@
   });
 
 
+  document.getElementById("root_files_button").addEventListener("click", function(){
+    if($("#root_files_button").data('server_path') != ""){
+      if(document.getElementById('root_files_button').classList.contains('clicked')){
+        document.getElementById('main-tree-div').innerHTML = '<input type="radio" id="main-tree-input" name="root_path" value="" checked><span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate('serverFiles', 'files', data['lang']) }}</span></input>'
+      }else{
+        document.getElementById('root_files_button').classList.add('clicked')
+      }
+    path = $("#root_files_button").data('server_path')
+    console.log($("#root_files_button").data('server_path'))
+    var token = getCookie("_xsrf");
+    var dialog = bootbox.dialog({
+      message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
+      closeButton: false
+  });
+
+    $.ajax({
+      type: "POST",
+      headers: {'X-XSRFToken': token},
+      url: '/ajax/backup_select?id='+server_id+'&path='+path,
+    });
+  }else{
+    bootbox.alert("You must input a path before selecting this button");
+  }
+  });
+  if (webSocket) {
+    webSocket.on('send_temp_path', function (data) {
+      setTimeout(function(){
+        var x = document.querySelector('.bootbox');
+        if (x) {
+          x.remove()
+        }
+        var x = document.querySelector('.modal-backdrop');
+        if (x) {
+          x.remove()
+        }
+        document.getElementById('main-tree-input').setAttribute('value', data.path)
+        getTreeView(data.path);
+        show_file_tree();
+
+    }, 5000);
+    });
+  }
+
+  function getTreeView(path) {
+    path = path
+
+    $.ajax({
+      type: "GET",
+      url: '/ajax/get_backup_tree?id='+server_id+'&path='+path,
+      dataType: 'text',
+      success: function(data){
+        console.log("got response:");
+        console.log(data);
+
+        dataArr = data.split('\n');
+        serverDir = dataArr.shift(); // Remove & return first element (server directory)
+        text = dataArr.join('\n');
+
+        try{
+          document.getElementById('main-tree-div').innerHTML += text;
+          document.getElementById('main-tree').parentElement.classList.add("clicked");
+        }catch{
+          document.getElementById('files-tree').innerHTML = text;
+        }
+        
+
+        document.getElementsByClassName('files-tree-title')[0].setAttribute('data-path', serverDir);
+        document.getElementsByClassName('files-tree-title')[0].setAttribute('data-name', 'Files');
+
+      },
+    });
+  }
+  function getToggleMain(event) {
+    path = event.target.parentElement.getAttribute('data-path');
+        document.getElementById("files-tree").classList.toggle("d-block");
+        document.getElementById(path+"span").classList.toggle("tree-caret-down");
+        document.getElementById(path+"span").classList.toggle("tree-caret");
+    }
+  
+
+  function getDirView(event) {
+      path = event.target.parentElement.getAttribute('data-path');
+
+      if (document.getElementById(path).classList.contains('clicked')){
+
+      var toggler = document.getElementById(path+"span");
+
+      if (toggler.classList.contains('files-tree-title')){
+          document.getElementById(path+"ul").classList.toggle("d-block");
+          document.getElementById(path+"span").classList.toggle("tree-caret-down");
+      }
+      return;
+    }else{
+    $.ajax({
+      type: "GET",
+      url: '/ajax/get_backup_dir?id='+server_id+'&path='+path,
+      dataType: 'text',
+      success: function(data){
+        console.log("got response:");
+
+        dataArr = data.split('\n');
+        serverDir = dataArr.shift(); // Remove & return first element (server directory)
+        text = dataArr.join('\n');
+
+        try{
+          document.getElementById(path+"span").classList.add('tree-caret-down');
+          document.getElementById(path).innerHTML += text;
+          document.getElementById(path).classList.add("clicked");
+        }catch{
+          console.log("Bad")
+        }
+
+        var toggler = document.getElementById(path);
+
+          if (toggler.classList.contains('files-tree-title')){
+          document.getElementById(path+"span").addEventListener("click", function caretListener() {
+            document.getElementById(path+"ul").classList.toggle("d-block");
+            document.getElementById(path+"span").classList.toggle("tree-caret-down");
+          });
+        }
+      },
+    });
+  }
+  }
+  function show_file_tree(){
+    $("#dir_select").modal();
+  }
+
 </script>
 
 {% end %}
\ No newline at end of file
diff --git a/app/frontend/templates/server/bedrock_wizard.html b/app/frontend/templates/server/bedrock_wizard.html
index 731032b5..e700b1a1 100644
--- a/app/frontend/templates/server/bedrock_wizard.html
+++ b/app/frontend/templates/server/bedrock_wizard.html
@@ -310,9 +310,6 @@
       message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
       closeButton: false
   });
-  setTimeout(function(){
-    dialog.modal('hide');
-}, 5000);
     $.ajax({
       type: "POST",
       headers: {'X-XSRFToken': token},
@@ -433,9 +430,20 @@ function hide(event) {
     }
     if (webSocket) {
       webSocket.on('send_temp_path', function (data) {
-        document.getElementById('main-tree-input').setAttribute('value', data.path)
-        getTreeView(data.path);
-        show_file_tree();
+        setTimeout(function(){
+          var x = document.querySelector('.bootbox');
+          if (x) {
+            x.remove()
+          }
+          var x = document.querySelector('.modal-backdrop');
+          if (x) {
+            x.remove()
+          }
+          document.getElementById('main-tree-input').setAttribute('value', data.path)
+          getTreeView(data.path);
+          show_file_tree();
+  
+      }, 5000);
       });
     }
 
diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html
index a36fe068..b159fc57 100644
--- a/app/frontend/templates/server/wizard.html
+++ b/app/frontend/templates/server/wizard.html
@@ -437,9 +437,6 @@
       message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
       closeButton: false
   });
-  setTimeout(function(){
-    dialog.modal('hide');
-}, 5000);
     $.ajax({
       type: "POST",
       headers: {'X-XSRFToken': token},
@@ -587,9 +584,20 @@ function hide(event) {
     }
     if (webSocket) {
       webSocket.on('send_temp_path', function (data) {
-        document.getElementById('main-tree-input').setAttribute('value', data.path)
-        getTreeView(data.path);
-        show_file_tree();
+        setTimeout(function(){
+          var x = document.querySelector('.bootbox');
+          if (x) {
+            x.remove()
+          }
+          var x = document.querySelector('.modal-backdrop');
+          if (x) {
+            x.remove()
+          }
+          document.getElementById('main-tree-input').setAttribute('value', data.path)
+          getTreeView(data.path);
+          show_file_tree();
+  
+      }, 5000);
       });
     }
 

From 4bcb91d1d5e6536abfa0eb2ecdcbd108db499d95 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sun, 27 Feb 2022 16:37:48 -0500
Subject: [PATCH 09/18] Add mostly functional front-end for backup exclusions

---
 .../controllers/management_controller.py      |  2 +-
 app/classes/models/management.py              |  4 ++--
 app/classes/shared/helpers.py                 | 19 +++++++++++++++++--
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/classes/controllers/management_controller.py b/app/classes/controllers/management_controller.py
index 1d1fdc8f..1cb99808 100644
--- a/app/classes/controllers/management_controller.py
+++ b/app/classes/controllers/management_controller.py
@@ -117,4 +117,4 @@ class Management_Controller:
 
     @staticmethod
     def del_excluded_backup_dir(server_id: int, dir_to_del: str):
-        management_helper.del_excluded_backup_dir(server_id, dir_to_del)
\ No newline at end of file
+        management_helper.del_excluded_backup_dir(server_id, dir_to_del)
diff --git a/app/classes/models/management.py b/app/classes/models/management.py
index 887b2d27..faafadfc 100644
--- a/app/classes/models/management.py
+++ b/app/classes/models/management.py
@@ -354,7 +354,7 @@ class helpers_management:
                     Servers.update(backup_path=backup_path).where(Servers.server_id == server_id)
                 Backups.create(**conf)
             logger.debug("Creating new backup record.")
-    
+
     @staticmethod
     def get_excluded_backup_dirs(server_id: int):
         excluded_dirs = helpers_management.get_backup_config(server_id)['excluded_dirs']
@@ -370,7 +370,7 @@ class helpers_management:
             management_helper.set_backup_config(server_id=server_id, excluded_dirs=excluded_dirs)
         else:
             logger.debug(f"Not adding {dir_to_add} to excluded directories - already in the excluded directory list for server ID {server_id}")
-    
+
     @staticmethod
     def del_excluded_backup_dir(server_id: int, dir_to_del: str):
         dir_list = management_helper.get_excluded_backup_dirs()
diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index 72a583a7..7978e678 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -756,11 +756,18 @@ class Helpers:
                     <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
                       <i class="far fa-folder"></i>
                       <i class="far fa-folder-open"></i>
-                      {filename}
+                      <strong>{filename}</strong>
                       </span>
                     </input></div><li>
                     \n"""\
 
+            else:
+                output += f"""<li
+                class="tree-item tree-ctx-item tree-file"
+                data-path="{dpath}"
+                data-name="{filename}"
+                onclick=""><input type='checkbox' name='root_path' value='{dpath}'><span style="margin-right: 6px;"><i class="far fa-file"></i></span></input>{filename}</li>"""
+
         return output
 
     @staticmethod
@@ -782,10 +789,18 @@ class Helpers:
                     <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
                       <i class="far fa-folder"></i>
                       <i class="far fa-folder-open"></i>
-                      {filename}
+                      <strong>{filename}</strong>
                       </span>
                     </input></div><li>"""\
 
+            else:
+                output += f"""<li
+                class="tree-item tree-ctx-item tree-file"
+                data-path="{dpath}"
+                data-name="{filename}"
+                onclick=""><input type='checkbox' name='root_path' value='{dpath}'><span style="margin-right: 6px;"><i class="far fa-file"></i></span></input>{filename}</li>"""
+
+
         return output
 
     @staticmethod

From 097d5689fc310a2ff4d4b088c82782f45d7d8737 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sun, 27 Feb 2022 16:41:08 -0500
Subject: [PATCH 10/18] Fix typo in server_backup.html

---
 app/frontend/templates/panel/server_backup.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/frontend/templates/panel/server_backup.html b/app/frontend/templates/panel/server_backup.html
index df305d3d..a7d64f81 100644
--- a/app/frontend/templates/panel/server_backup.html
+++ b/app/frontend/templates/panel/server_backup.html
@@ -340,7 +340,7 @@ const server_id = new URLSearchParams(document.location.search).get('id')
   document.getElementById("root_files_button").addEventListener("click", function(){
     if($("#root_files_button").data('server_path') != ""){
       if(document.getElementById('root_files_button').classList.contains('clicked')){
-        document.getElementById('main-tree-div').innerHTML = '<input type="radio" id="main-tree-input" name="root_path" value="" checked><span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate('serverFiles', 'files', data['lang']) }}</span></input>'
+        document.getElementById('main-tree-div').innerHTML = '<input type="checkbox" id="main-tree-input" name="root_path" value="" disabled><span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate('serverFiles', 'files', data['lang']) }}</span></input>'
       }else{
         document.getElementById('root_files_button').classList.add('clicked')
       }

From 008b7f4ade5ee48dd5506cf973a4dfb3a8019cad Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sun, 27 Feb 2022 19:29:30 -0500
Subject: [PATCH 11/18] Run file tree serving thorugh ajax handler alone

---
 app/classes/models/management.py |   5 +-
 app/classes/shared/helpers.py    |  66 -----------------
 app/classes/web/ajax_handler.py  | 117 +++++++++++++++++++++++++++++--
 3 files changed, 115 insertions(+), 73 deletions(-)

diff --git a/app/classes/models/management.py b/app/classes/models/management.py
index faafadfc..f57abe11 100644
--- a/app/classes/models/management.py
+++ b/app/classes/models/management.py
@@ -358,7 +358,10 @@ class helpers_management:
     @staticmethod
     def get_excluded_backup_dirs(server_id: int):
         excluded_dirs = helpers_management.get_backup_config(server_id)['excluded_dirs']
-        dir_list = excluded_dirs.split(",")
+        if excluded_dirs is not None:
+            dir_list = excluded_dirs.split(",")
+        else:
+            dir_list = []
         return dir_list
 
     @staticmethod
diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index 7978e678..f21963d0 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -737,72 +737,6 @@ class Helpers:
 
         return output
 
-    @staticmethod
-    def generate_backup_tree(folder, output=""):
-        file_list = os.listdir(folder)
-        file_list = sorted(file_list, key=str.casefold)
-        output += \
-    f"""<ul class="tree-nested d-block" id="{folder}ul">"""\
-
-        for raw_filename in file_list:
-            filename = html.escape(raw_filename)
-            rel = os.path.join(folder, raw_filename)
-            dpath = os.path.join(folder, filename)
-            if os.path.isdir(rel):
-                output += \
-                    f"""<li class="tree-item" data-path="{dpath}">
-                    \n<div id="{dpath}" data-path="{dpath}" data-name="{filename}" class="tree-caret tree-ctx-item tree-folder">
-                    <input type="checkbox" name="root_path" value="{dpath}">
-                    <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
-                      <i class="far fa-folder"></i>
-                      <i class="far fa-folder-open"></i>
-                      <strong>{filename}</strong>
-                      </span>
-                    </input></div><li>
-                    \n"""\
-
-            else:
-                output += f"""<li
-                class="tree-item tree-ctx-item tree-file"
-                data-path="{dpath}"
-                data-name="{filename}"
-                onclick=""><input type='checkbox' name='root_path' value='{dpath}'><span style="margin-right: 6px;"><i class="far fa-file"></i></span></input>{filename}</li>"""
-
-        return output
-
-    @staticmethod
-    def generate_backup_dir(folder, output=""):
-        file_list = os.listdir(folder)
-        file_list = sorted(file_list, key=str.casefold)
-        output += \
-    f"""<ul class="tree-nested d-block" id="{folder}ul">"""\
-
-        for raw_filename in file_list:
-            filename = html.escape(raw_filename)
-            rel = os.path.join(folder, raw_filename)
-            dpath = os.path.join(folder, filename)
-            if os.path.isdir(rel):
-                output += \
-                    f"""<li class="tree-item" data-path="{dpath}">
-                    \n<div id="{dpath}" data-path="{dpath}" data-name="{filename}" class="tree-caret tree-ctx-item tree-folder">
-                    <input type="checkbox" name="root_path" value="{dpath}">
-                    <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
-                      <i class="far fa-folder"></i>
-                      <i class="far fa-folder-open"></i>
-                      <strong>{filename}</strong>
-                      </span>
-                    </input></div><li>"""\
-
-            else:
-                output += f"""<li
-                class="tree-item tree-ctx-item tree-file"
-                data-path="{dpath}"
-                data-name="{filename}"
-                onclick=""><input type='checkbox' name='root_path' value='{dpath}'><span style="margin-right: 6px;"><i class="far fa-file"></i></span></input>{filename}</li>"""
-
-
-        return output
-
     @staticmethod
     def generate_zip_dir(folder, output=""):
         file_list = os.listdir(folder)
diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index 72f6ca08..b5be9826 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -148,18 +148,123 @@ class AjaxHandler(BaseHandler):
 
         elif page == "get_backup_tree":
             server_id = self.get_argument('id', None)
-            path = self.get_argument('path', None)
+            folder = self.get_argument('path', None)
 
-            self.write(helper.get_os_understandable_path(path) + '\n' +
-                        helper.generate_backup_tree(path, server_id))
+            output = ""
+
+            file_list = os.listdir(folder)
+            file_list = sorted(file_list, key=str.casefold)
+            output += \
+        f"""<ul class="tree-nested d-block" id="{folder}ul">"""\
+
+            for raw_filename in file_list:
+                filename = html.escape(raw_filename)
+                rel = os.path.join(folder, raw_filename)
+                dpath = os.path.join(folder, filename)
+                if str(dpath) in self.controller.management.get_excluded_backup_dirs(server_id):
+                    if os.path.isdir(rel):
+                        output += \
+                            f"""<li class="tree-item" data-path="{dpath}">
+                            \n<div id="{dpath}" data-path="{dpath}" data-name="{filename}" class="tree-caret tree-ctx-item tree-folder">
+                            <input type="checkbox" name="root_path" value="{dpath}" checked>
+                            <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
+                            <i class="far fa-folder"></i>
+                            <i class="far fa-folder-open"></i>
+                            <strong>{filename}</strong>
+                            </span>
+                            </input></div><li>
+                            \n"""\
+
+                    else:
+                        output += f"""<li
+                        class="tree-item tree-ctx-item tree-file"
+                        data-path="{dpath}"
+                        data-name="{filename}"
+                        onclick=""><input type='checkbox' name='root_path' value='{dpath}' checked><span style="margin-right: 6px;">
+                        <i class="far fa-file"></i></span></input>{filename}</li>"""
+
+                else:
+                    if os.path.isdir(rel):
+                        output += \
+                            f"""<li class="tree-item" data-path="{dpath}">
+                            \n<div id="{dpath}" data-path="{dpath}" data-name="{filename}" class="tree-caret tree-ctx-item tree-folder">
+                            <input type="checkbox" name="root_path" value="{dpath}">
+                            <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
+                            <i class="far fa-folder"></i>
+                            <i class="far fa-folder-open"></i>
+                            <strong>{filename}</strong>
+                            </span>
+                            </input></div><li>
+                            \n"""\
+
+                    else:
+                        output += f"""<li
+                        class="tree-item tree-ctx-item tree-file"
+                        data-path="{dpath}"
+                        data-name="{filename}"
+                        onclick=""><input type='checkbox' name='root_path' value='{dpath}'>
+                        <span style="margin-right: 6px;"><i class="far fa-file"></i></span></input>{filename}</li>"""
+            self.write(helper.get_os_understandable_path(folder) + '\n' +
+                        output)
             self.finish()
 
         elif page == "get_backup_dir":
             server_id = self.get_argument('id', None)
-            path = self.get_argument('path', None)
+            folder = self.get_argument('path', None)
+            output = ""
 
-            self.write(helper.get_os_understandable_path(path) + '\n' +
-                        helper.generate_backup_dir(path, server_id))
+            file_list = os.listdir(folder)
+            file_list = sorted(file_list, key=str.casefold)
+            output += \
+        f"""<ul class="tree-nested d-block" id="{folder}ul">"""\
+
+            for raw_filename in file_list:
+                filename = html.escape(raw_filename)
+                rel = os.path.join(folder, raw_filename)
+                dpath = os.path.join(folder, filename)
+                if str(dpath) in self.controller.management.get_excluded_backup_dirs(server_id):
+                    if os.path.isdir(rel):
+                        output += \
+                            f"""<li class="tree-item" data-path="{dpath}">
+                            \n<div id="{dpath}" data-path="{dpath}" data-name="{filename}" class="tree-caret tree-ctx-item tree-folder">
+                            <input type="checkbox" name="root_path" value="{dpath}">
+                            <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
+                            <i class="far fa-folder"></i>
+                            <i class="far fa-folder-open"></i>
+                            <strong>{filename}</strong>
+                            </span>
+                            </input></div><li>"""\
+
+                    else:
+                        output += f"""<li
+                        class="tree-item tree-ctx-item tree-file"
+                        data-path="{dpath}"
+                        data-name="{filename}"
+                        onclick=""><input type='checkbox' name='root_path' value='{dpath}'><span style="margin-right: 6px;">
+                        <i class="far fa-file"></i></span></input>{filename}</li>"""
+
+                else:
+                    if os.path.isdir(rel):
+                        output += \
+                            f"""<li class="tree-item" data-path="{dpath}">
+                            \n<div id="{dpath}" data-path="{dpath}" data-name="{filename}" class="tree-caret tree-ctx-item tree-folder">
+                            <input type="checkbox" name="root_path" value="{dpath}">
+                            <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
+                            <i class="far fa-folder"></i>
+                            <i class="far fa-folder-open"></i>
+                            <strong>{filename}</strong>
+                            </span>
+                            </input></div><li>"""\
+
+                    else:
+                        output += f"""<li
+                        class="tree-item tree-ctx-item tree-file"
+                        data-path="{dpath}"
+                        data-name="{filename}"
+                        onclick=""><input type='checkbox' name='root_path' value='{dpath}'><span style="margin-right: 6px;"><i class="far fa-file"></i></span></input>{filename}</li>"""
+
+            self.write(helper.get_os_understandable_path(folder) + '\n' +
+                        output)
             self.finish()
 
         elif page == "get_dir":

From 2bf2902754bf57fc20f8804d9de37ff2e9001002 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sun, 27 Feb 2022 21:40:05 -0500
Subject: [PATCH 12/18] Working backup exclusions

---
 .../controllers/management_controller.py      |  4 ++--
 app/classes/models/management.py              |  3 +++
 app/classes/web/ajax_handler.py               | 11 +++++----
 app/classes/web/panel_handler.py              |  4 +++-
 .../templates/panel/server_backup.html        | 23 ++++++++-----------
 5 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/app/classes/controllers/management_controller.py b/app/classes/controllers/management_controller.py
index 1cb99808..6efe492a 100644
--- a/app/classes/controllers/management_controller.py
+++ b/app/classes/controllers/management_controller.py
@@ -104,8 +104,8 @@ class Management_Controller:
         return management_helper.get_backup_config(server_id)
 
     @staticmethod
-    def set_backup_config(server_id: int, backup_path: str = None, max_backups: int = None):
-        return management_helper.set_backup_config(server_id, backup_path, max_backups)
+    def set_backup_config(server_id: int, backup_path: str = None, max_backups: int = None, excluded_dirs: list = None):
+        return management_helper.set_backup_config(server_id, backup_path, max_backups, excluded_dirs)
 
     @staticmethod
     def get_excluded_backup_dirs(server_id: int):
diff --git a/app/classes/models/management.py b/app/classes/models/management.py
index f57abe11..e197add6 100644
--- a/app/classes/models/management.py
+++ b/app/classes/models/management.py
@@ -339,6 +339,9 @@ class helpers_management:
             new_row = True
         if max_backups is not None:
             conf['max_backups'] = max_backups
+        if excluded_dirs is not None:
+            dirs_to_exclude = ",".join(excluded_dirs)
+            conf['excluded_dirs'] = dirs_to_exclude
         if not new_row:
             with database.atomic():
                 if backup_path is not None:
diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index b5be9826..46ff3372 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -166,7 +166,7 @@ class AjaxHandler(BaseHandler):
                         output += \
                             f"""<li class="tree-item" data-path="{dpath}">
                             \n<div id="{dpath}" data-path="{dpath}" data-name="{filename}" class="tree-caret tree-ctx-item tree-folder">
-                            <input type="checkbox" name="root_path" value="{dpath}" checked>
+                            <input type="checkbox" class="checkBoxClass" name="root_path" value="{dpath}" checked>
                             <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
                             <i class="far fa-folder"></i>
                             <i class="far fa-folder-open"></i>
@@ -180,7 +180,7 @@ class AjaxHandler(BaseHandler):
                         class="tree-item tree-ctx-item tree-file"
                         data-path="{dpath}"
                         data-name="{filename}"
-                        onclick=""><input type='checkbox' name='root_path' value='{dpath}' checked><span style="margin-right: 6px;">
+                        onclick=""><input type='checkbox' class="checkBoxClass" name='root_path' value="{dpath}" checked><span style="margin-right: 6px;">
                         <i class="far fa-file"></i></span></input>{filename}</li>"""
 
                 else:
@@ -188,7 +188,7 @@ class AjaxHandler(BaseHandler):
                         output += \
                             f"""<li class="tree-item" data-path="{dpath}">
                             \n<div id="{dpath}" data-path="{dpath}" data-name="{filename}" class="tree-caret tree-ctx-item tree-folder">
-                            <input type="checkbox" name="root_path" value="{dpath}">
+                            <input type="checkbox" class="checkBoxClass" name="root_path" value="{dpath}">
                             <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
                             <i class="far fa-folder"></i>
                             <i class="far fa-folder-open"></i>
@@ -202,7 +202,7 @@ class AjaxHandler(BaseHandler):
                         class="tree-item tree-ctx-item tree-file"
                         data-path="{dpath}"
                         data-name="{filename}"
-                        onclick=""><input type='checkbox' name='root_path' value='{dpath}'>
+                        onclick=""><input type='checkbox' class="checkBoxClass" name='root_path' value="{dpath}">
                         <span style="margin-right: 6px;"><i class="far fa-file"></i></span></input>{filename}</li>"""
             self.write(helper.get_os_understandable_path(folder) + '\n' +
                         output)
@@ -261,7 +261,8 @@ class AjaxHandler(BaseHandler):
                         class="tree-item tree-ctx-item tree-file"
                         data-path="{dpath}"
                         data-name="{filename}"
-                        onclick=""><input type='checkbox' name='root_path' value='{dpath}'><span style="margin-right: 6px;"><i class="far fa-file"></i></span></input>{filename}</li>"""
+                        onclick=""><input type='checkbox' name='root_path' value='{dpath}'>
+                        <span style="margin-right: 6px;"><i class="far fa-file"></i></span></input>{filename}</li>"""
 
             self.write(helper.get_os_understandable_path(folder) + '\n' +
                         output)
diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 5430e7ab..814379d9 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -17,6 +17,7 @@ from tornado.ioloop import IOLoop
 #TZLocal is set as a hidden import on win pipeline
 from tzlocal import get_localzone
 from cron_validator import CronValidator
+from app.classes.controllers.management_controller import Management_Controller
 
 from app.classes.models.server_permissions import Enum_Permissions_Server
 from app.classes.models.crafty_permissions import Enum_Permissions_Crafty
@@ -1027,6 +1028,7 @@ class PanelHandler(BaseHandler):
             logger.debug(self.request.arguments)
             server_id = self.get_argument('id', None)
             server_obj = self.controller.servers.get_server_obj(server_id)
+            checked = self.get_body_arguments('root_path')
             if superuser:
                 backup_path = bleach.clean(self.get_argument('backup_path', None))
                 if helper.is_os_windows():
@@ -1052,7 +1054,7 @@ class PanelHandler(BaseHandler):
             server_obj = self.controller.servers.get_server_obj(server_id)
             server_obj.backup_path = backup_path
             self.controller.servers.update_server(server_obj)
-            self.controller.management.set_backup_config(server_id, max_backups=max_backups)
+            self.controller.management.set_backup_config(server_id, max_backups=max_backups, excluded_dirs=checked)
 
             self.controller.management.add_to_audit_log(exec_user['user_id'],
                                        f"Edited server {server_id}: updated backups",
diff --git a/app/frontend/templates/panel/server_backup.html b/app/frontend/templates/panel/server_backup.html
index a7d64f81..89a2c198 100644
--- a/app/frontend/templates/panel/server_backup.html
+++ b/app/frontend/templates/panel/server_backup.html
@@ -54,24 +54,16 @@
                         <label for="server_path">{{ translate('serverBackups', 'maxBackups', data['lang']) }} <small class="text-muted ml-1"> - {{ translate('serverBackups', 'maxBackupsDesc', data['lang']) }}</small> </label>
                         <input type="text" class="form-control" name="max_backups" id="max_backups" value="{{ data['backup_config']['max_backups']  }}" placeholder="{{ translate('serverBackups', 'maxBackups', data['lang']) }}" >
                       </div>
-
-                      <div class="col-sm-12">
                         <div class="form-group">
-                          <label for="server">{{ translate('serverWizard', 'selectRoot', data['lang']) }} <small>{{ translate('serverWizard', 'explainRoot', data['lang']) }}</small></label>
+                          <label for="server">{{ translate('serverBackups', 'exclusionsTitle', data['lang']) }} <small> - {{ translate('serverBackups', 'excludedChoose', data['lang']) }}</small></label>
                           <br>
-                          <button class="btn btn-primary mr-2" id="root_files_button" data-server_path="{{ data['server_stats']['server_id']['path']}}" type="button">{{ translate('serverWizard', 'clickRoot', data['lang']) }}</button>
+                          <button class="btn btn-primary mr-2" id="root_files_button" data-server_path="{{ data['server_stats']['server_id']['path']}}" type="button">{{ translate('serverBackups', 'clickExclude', data['lang']) }}</button>
                         </div>
-                      </div>
-                      <div class="col-sm-12" style="visibility: hidden;">
-                        <div class="form-group">
-                          <input type="text" class="form-control" id="zip_root_path" name="zip_root_path">
-                        </div>
-                      </div>
                       <div class="modal fade" id="dir_select" tabindex="-1" role="dialog" aria-labelledby="dir_select" aria-hidden="true">
                         <div class="modal-dialog" role="document">
                           <div class="modal-content">
                             <div class="modal-header">
-                              <h5 class="modal-title" id="exampleModalLongTitle">{{ translate('serverWizard', 'selectZipDir', data['lang']) }}</h5>
+                              <h5 class="modal-title" id="exampleModalLongTitle">{{ translate('serverBackups', 'excludedChoose', data['lang']) }}</h5>
                               <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                                 <span aria-hidden="true">&times;</span>
                               </button>
@@ -88,7 +80,7 @@
                               </div>
                             </div>
                             <div class="modal-footer">
-                              <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ translate('serverWizard', 'close', data['lang']) }}</button>
+                              <button type="button" id="modal-cancel" class="btn btn-secondary" data-dismiss="modal">{{ translate('serverBackups', 'cancel', data['lang']) }}</button>
                               <button type="button" id="modal-okay" data-dismiss="modal" class="btn btn-primary">{{ translate('serverWizard', 'save', data['lang']) }}</button>
                             </div>
                           </div>
@@ -336,11 +328,16 @@ const server_id = new URLSearchParams(document.location.search).get('id')
 
   });
 
+document.getElementById("modal-cancel").addEventListener("click", function(){
+  document.getElementById("root_files_button").classList.remove('clicked');
+  document.getElementById("main-tree-div").innerHTML = '<input type="checkbox" id="main-tree-input" name="root_path" value="" disabled><span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate("serverFiles", "files", data["lang"]) }}</span></input>'
+})
 
   document.getElementById("root_files_button").addEventListener("click", function(){
     if($("#root_files_button").data('server_path') != ""){
       if(document.getElementById('root_files_button').classList.contains('clicked')){
-        document.getElementById('main-tree-div').innerHTML = '<input type="checkbox" id="main-tree-input" name="root_path" value="" disabled><span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate('serverFiles', 'files', data['lang']) }}</span></input>'
+        show_file_tree();
+        return;
       }else{
         document.getElementById('root_files_button').classList.add('clicked')
       }

From 70ba8cceec5e84555632eb99eb8e887250f50e09 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sun, 27 Feb 2022 21:49:26 -0500
Subject: [PATCH 13/18] Add fully working backups

---
 app/classes/web/panel_handler.py              |  1 +
 .../templates/panel/server_backup.html        | 23 ++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 814379d9..b8a3739b 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -429,6 +429,7 @@ class PanelHandler(BaseHandler):
                         return
                 server_info = self.controller.servers.get_server_data_by_id(server_id)
                 page_data['backup_config'] = self.controller.management.get_backup_config(server_id)
+                page_data['exclusions'] = self.controller.management.get_excluded_backup_dirs(server_id)
                 self.controller.refresh_server_settings(server_id)
                 try:
                     page_data['backup_list'] = server.list_backups()
diff --git a/app/frontend/templates/panel/server_backup.html b/app/frontend/templates/panel/server_backup.html
index 89a2c198..2a1840ed 100644
--- a/app/frontend/templates/panel/server_backup.html
+++ b/app/frontend/templates/panel/server_backup.html
@@ -35,6 +35,8 @@
 
             <div class="row">
                 <div class="col-md-6 col-sm-12">
+                  <br>
+                  <br>
                     <form class="forms-sample" method="post" action="/panel/server_backup">
                       {% raw xsrf_form_html() %}
                       <input type="hidden" name="id" value="{{ data['server_stats']['server_id']['server_id'] }}">
@@ -93,15 +95,10 @@
                 </div>
 
                 <div class="col-md-6 col-sm-12">
-                    <div class="card">
-                      <div class="card-body">
-                        <h4 class="card-title">{{ translate('serverBackups', 'currentBackups', data['lang']) }}</h4>
-
-                      </div>
-                    </div>
                     <div class="text-center">
 
                       <table class="table table-responsive dataTable" id="backup_table">
+                        <h4 class="card-title">{{ translate('serverBackups', 'currentBackups', data['lang']) }}</h4>
                         <thead>
                         <tr>
                             <th width="10%">{{ translate('serverBackups', 'options', data['lang']) }}</th>
@@ -139,6 +136,20 @@
                     </div>
                 </div>
             </div>
+            <div class="col-md-12 col-sm-12">
+              <br>
+              <br>
+              <div class="card-header header-sm d-flex justify-content-between align-items-center">
+                <h4 class="card-title"><i class="fas fa-server"></i> {{ translate('serverBackups', 'excludedBackups', data['lang']) }}  <small class="text-muted ml-1"></small> </h4>
+              </div>
+              <br>
+              <ul>
+                {% for item in data['exclusions'] %}
+                <li>{{item}}</li>
+                <br>
+                {% end %}
+              </ul>
+            </div>
 
         </div>
       </div>

From fd22519ae17d0b293b7dccd3e4e6eb7f4b0219d4 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sun, 27 Feb 2022 21:57:45 -0500
Subject: [PATCH 14/18] Update english translation

---
 app/translations/en_EN.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/translations/en_EN.json b/app/translations/en_EN.json
index 60bfd4c2..6b210818 100644
--- a/app/translations/en_EN.json
+++ b/app/translations/en_EN.json
@@ -235,7 +235,11 @@
         "options": "Options",
         "restoring": "Restoring Backup. This may take a while. Please be patient.",
         "restore": "Restore",
-        "confirmRestore": "Are you sure you want to restore from this backup. All current server files will changed to backup state and will be unrecoverable."
+        "confirmRestore": "Are you sure you want to restore from this backup. All current server files will changed to backup state and will be unrecoverable.",
+        "excludedBackups": "Excluded Paths: ",
+        "excludedChoose": "Choose the paths you wish to exclude from your backups",
+        "clickExclude": "Click to select Exclusions",
+        "exclusionsTitle": "Backup Exclusions"
     },
     "serverFiles": {
         "noscript": "The file manager does not work without JavaScript",

From 3621672e81e22148815e2b38475c785d8fbd3d88 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sun, 27 Feb 2022 22:03:19 -0500
Subject: [PATCH 15/18] appease the linter

---
 app/classes/shared/server.py     | 8 ++++----
 app/classes/web/panel_handler.py | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 06d6b453..4e96cb81 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -569,16 +569,16 @@ class Server:
             backup_filename = f"{self.settings['backup_path']}/{datetime.datetime.now().strftime('%Y-%m-%d_%H-%M-%S')}"
             logger.info(f"Creating backup of server '{self.settings['server_name']}'" +
                         f" (ID#{self.server_id}, path={self.server_path}) at '{backup_filename}'")
-            
+
             tempDir = tempfile.mkdtemp()
             shutil.copytree(self.server_path, tempDir, dirs_exist_ok=True)
             excluded_dirs = management_helper.get_excluded_backup_dirs(self.server_id)
             server_dir = helper.get_os_understandable_path(self.settings['path'])
 
-            for dir in excluded_dirs:
+            for my_dir in excluded_dirs:
                 # Take the full path of the excluded dir and replace the server path with the temp path
                 # This is so that we're only deleting excluded dirs from the temp path and not the server path
-                excluded_dir = helper.get_os_understandable_path(dir).replace(server_dir, helper.get_os_understandable_path(tempDir))
+                excluded_dir = helper.get_os_understandable_path(my_dir).replace(server_dir, helper.get_os_understandable_path(tempDir))
                 # Next, check to see if it is a directory
                 if os.path.isdir(excluded_dir):
                     # If it is a directory, recursively delete the entire directory from the backup
@@ -586,7 +586,7 @@ class Server:
                 else:
                     # If not, just remove the file
                     os.remove(excluded_dir)
-            
+
             shutil.make_archive(helper.get_os_understandable_path(backup_filename), 'zip', tempDir)
 
             while len(self.list_backups()) > conf["max_backups"] and conf["max_backups"] > 0:
diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index b8a3739b..afccea7a 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -17,7 +17,6 @@ from tornado.ioloop import IOLoop
 #TZLocal is set as a hidden import on win pipeline
 from tzlocal import get_localzone
 from cron_validator import CronValidator
-from app.classes.controllers.management_controller import Management_Controller
 
 from app.classes.models.server_permissions import Enum_Permissions_Server
 from app.classes.models.crafty_permissions import Enum_Permissions_Crafty

From 7f98e39503c1d1b08251a1fc3eca7333b56e3a01 Mon Sep 17 00:00:00 2001
From: xithical <86810816+xithical@users.noreply.github.com>
Date: Sun, 27 Feb 2022 21:25:00 -0600
Subject: [PATCH 16/18] Appease the linter

---
 app/classes/shared/server.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index f1b52b11..7b902296 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -583,6 +583,7 @@ class Server:
                         f" (ID#{self.server_id}, path={self.server_path}) at '{backup_filename}'")
 
             tempDir = tempfile.mkdtemp()
+            # pylint: disable=unexpected-keyword-arg
             shutil.copytree(self.server_path, tempDir, dirs_exist_ok=True)
             excluded_dirs = management_helper.get_excluded_backup_dirs(self.server_id)
             server_dir = helper.get_os_understandable_path(self.settings['path'])

From f563ceb8adb033ca31f381c6711b5be78590f417 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sun, 27 Feb 2022 22:45:22 -0500
Subject: [PATCH 17/18] Fix delete backup

---
 app/frontend/templates/panel/server_backup.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/frontend/templates/panel/server_backup.html b/app/frontend/templates/panel/server_backup.html
index 59f2cfcf..4ee705c7 100644
--- a/app/frontend/templates/panel/server_backup.html
+++ b/app/frontend/templates/panel/server_backup.html
@@ -309,7 +309,7 @@ const server_id = new URLSearchParams(document.location.search).get('id')
           console.log(result);
           if (result == true) {
             var full_path = backup_path + '/' + file_to_del;
-            del_backup(full_path, serverId);
+            del_backup(full_path, server_id);
           }
         }
       });
@@ -333,7 +333,7 @@ const server_id = new URLSearchParams(document.location.search).get('id')
         callback: function (result) {
           console.log(result);
           if (result == true) {
-            restore_backup(file_to_restore, serverId);
+            restore_backup(file_to_restore, server_id);
           }
         }
       });

From 10bf19bdf1f93c047d061345e78783f13d933b1b Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sun, 27 Feb 2022 23:02:07 -0500
Subject: [PATCH 18/18] QOL changes for markup

---
 app/frontend/templates/panel/parts/details_stats.html | 7 -------
 app/frontend/templates/panel/server_backup.html       | 3 ++-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/app/frontend/templates/panel/parts/details_stats.html b/app/frontend/templates/panel/parts/details_stats.html
index f05c4336..aa199340 100644
--- a/app/frontend/templates/panel/parts/details_stats.html
+++ b/app/frontend/templates/panel/parts/details_stats.html
@@ -136,15 +136,8 @@
 
     /* TODO Update each element */
     if (server.running){
-      if (server['stats']['waiting_start']){
-        server_status.setAttribute("class", "text-warning");
-        server_status.innerHTML = `{{ translate('serverStats', 'starting', data['lang']) }}`;
-      }
-      else
-      {
         server_status.setAttribute("class", "text-success");
         server_status.innerHTML = `{{ translate('serverStats', 'online', data['lang']) }}`;
-      }
 
       startedUTC = server.started;
       startedUTC = moment.utc(startedUTC, 'YYYY-MM-DD HH:mm:ss');
diff --git a/app/frontend/templates/panel/server_backup.html b/app/frontend/templates/panel/server_backup.html
index 4ee705c7..5c827d54 100644
--- a/app/frontend/templates/panel/server_backup.html
+++ b/app/frontend/templates/panel/server_backup.html
@@ -327,7 +327,8 @@ const server_id = new URLSearchParams(document.location.search).get('id')
             label: '<i class="fas fa-times"></i> {{ translate("serverBackups", "cancel", data['lang']) }}'
           },
           confirm: {
-            label: '<i class="fas fa-check"></i> {{ translate("serverBackups", "restore", data['lang']) }}'
+            label: '<i class="fas fa-check"></i> {{ translate("serverBackups", "restore", data['lang']) }}',
+          className: 'btn-outline-danger'
           }
         },
         callback: function (result) {