From e42af36103f393cf65bc6d8ddb43495c0723f5bb Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sat, 19 Nov 2022 14:41:15 -0500
Subject: [PATCH] Make sure import status persists through install

---
 app/classes/controllers/servers_controller.py |  3 +-
 app/classes/shared/server.py                  |  9 +++++-
 app/frontend/templates/panel/dashboard.html   | 31 +++++++++----------
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/app/classes/controllers/servers_controller.py b/app/classes/controllers/servers_controller.py
index 934ad328..709ea8ce 100644
--- a/app/classes/controllers/servers_controller.py
+++ b/app/classes/controllers/servers_controller.py
@@ -121,12 +121,13 @@ class ServersController(metaclass=Singleton):
     @staticmethod
     def finish_import(server_id, forge=False):
         srv = ServersController().get_server_instance_by_id(server_id)
-        srv.stats_helper.finish_import()
         # This is where we start the forge installerr
         if forge:
             srv.run_threaded_server(
                 HelperUsers.get_user_id_by_name("system"), forge_install=True
             )
+        else:
+            srv.stats_helper.finish_import()
         return
 
     @staticmethod
diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 4febf4ac..f723af33 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -301,7 +301,7 @@ class ServerInstance:
         else:
             user_lang = HelperUsers.get_user_lang_by_id(user_id)
 
-        if self.stats_helper.get_import_status():
+        if self.stats_helper.get_import_status() and not forge_install:
             if user_id:
                 self.helper.websocket_helper.broadcast_user(
                     user_id,
@@ -604,6 +604,13 @@ class ServerInstance:
 
                 # We'll update the server with the new information now.
                 HelperServers.update_server(server_obj)
+                self.stats_helper.finish_import()
+                server_users = PermissionsServers.get_server_user_list(self.server_id)
+
+                for user in server_users:
+                    self.helper.websocket_helper.broadcast_user(
+                        user, "send_start_reload", {}
+                    )
                 break
 
     def stop_crash_detection(self):
diff --git a/app/frontend/templates/panel/dashboard.html b/app/frontend/templates/panel/dashboard.html
index c89d00b2..fbeb3fca 100644
--- a/app/frontend/templates/panel/dashboard.html
+++ b/app/frontend/templates/panel/dashboard.html
@@ -168,7 +168,21 @@
 
                   <td draggable="false" id="controls{{server['server_data']['server_id']}}" class="actions_serverlist">
                     {% if server['user_command_permission'] %}
-                    {% if server['stats']['running'] %}
+                    {% if server['stats']['updating']%}
+                    <!-- WHAT HAPPENED HERE -->
+                    <a data-id="{{server['server_data']['server_id']}}" class=""><i
+                        class="fa fa-spinner fa-spin"></i>&nbsp;{{ translate('serverTerm', 'updating',
+                      data['lang']) }}</i></a>
+                    {% elif server['stats']['waiting_start']%}
+                    <!-- WHAT HAPPENED HERE -->
+                    <a data-id="{{server['server_data']['server_id']}}" class="" title="{{
+                      translate('dashboard', 'delay-explained' , data['lang'])}}">{{ translate('dashboard', 'starting',
+                      data['lang']) }}</i></a>
+                    {% elif server['stats']['importing']%}
+                    <a data-id="{{server['server_data']['server_id']}}" class=""><i class="fa fa-spinner fa-spin"></i>
+                      {{ translate('serverTerm', 'importing',
+                      data['lang']) }}</a>
+                    {% elif server['stats']['running'] %}
                     <a data-id="{{server['server_data']['server_id']}}" class="stop_button" data-toggle="tooltip"
                       title="{{ translate('dashboard', 'stop' , data['lang']) }}">
                       <i class="fas fa-stop"></i>
@@ -183,21 +197,6 @@
                       title="{{ translate('dashboard', 'kill' , data['lang']) }}">
                       <i class="fas fa-skull"></i>
                     </a> &nbsp;
-
-                    {% elif server['stats']['updating']%}
-                    <!-- WHAT HAPPENED HERE -->
-                    <a data-id="{{server['server_data']['server_id']}}" class=""><i
-                        class="fa fa-spinner fa-spin"></i>&nbsp;{{ translate('serverTerm', 'updating',
-                      data['lang']) }}</i></a>
-                    {% elif server['stats']['waiting_start']%}
-                    <!-- WHAT HAPPENED HERE -->
-                    <a data-id="{{server['server_data']['server_id']}}" class="" title="{{
-                      translate('dashboard', 'delay-explained' , data['lang'])}}">{{ translate('dashboard', 'starting',
-                      data['lang']) }}</i></a>
-                    {% elif server['stats']['importing']%}
-                    <a data-id="{{server['server_data']['server_id']}}" class=""><i class="fa fa-spinner fa-spin"></i>
-                      {{ translate('serverTerm', 'importing',
-                      data['lang']) }}</a>
                     {% else %}
                     <a data-id="{{server['server_data']['server_id']}}" class="play_button" data-toggle="tooltip"
                       title="{{ translate('dashboard', 'start' , data['lang']) }}">