Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add option to run command before backup

Browse Source
This commit is contained in:
Andrew 2023-01-20 17:35:30 -05:00
parent d7d27b00c4
commit cf9ad77879
6 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/classes/controllers/management_controller.py
View File

@ -145,9 +145,16 @@ class ManagementController:
excluded_dirs: list = None,
compress: bool = False,
shutdown: bool = False,
command: str = "",
):
return self.management_helper.set_backup_config(
server_id, backup_path, max_backups, excluded_dirs, compress, shutdown
server_id,
backup_path,
max_backups,
excluded_dirs,
compress,
shutdown,
command,
)
@staticmethod

6
app/classes/models/management.py
View File

@ -131,6 +131,7 @@ class Backups(BaseModel):
server_id = ForeignKeyField(Servers, backref="backups_server")
compress = BooleanField(default=False)
shutdown = BooleanField(default=False)
command = CharField(default="")
class Meta:
table_name = "backups"
@ -369,6 +370,7 @@ class HelpersManagement:
"server_id": row.server_id_id,
"compress": row.compress,
"shutdown": row.shutdown,
"command": row.command,
}
except IndexError:
conf = {
@ -378,6 +380,7 @@ class HelpersManagement:
"server_id": server_id,
"compress": False,
"shutdown": False,
"command": "",
}
return conf
@ -393,6 +396,7 @@ class HelpersManagement:
excluded_dirs: list = None,
compress: bool = False,
shutdown: bool = False,
command: str = "",
):
logger.debug(f"Updating server {server_id} backup config with {locals()}")
if Backups.select().where(Backups.server_id == server_id).exists():
@ -405,6 +409,7 @@ class HelpersManagement:
"server_id": server_id,
"compress": False,
"shutdown": False,
"command": "",
}
new_row = True
if max_backups is not None:
@ -414,6 +419,7 @@ class HelpersManagement:
conf["excluded_dirs"] = dirs_to_exclude
conf["compress"] = compress
conf["shutdown"] = shutdown
conf["command"] = command
if not new_row:
with self.database.atomic():
if backup_path is not None:

8
app/classes/shared/server.py
View File

@ -1024,6 +1024,14 @@ class ServerInstance:
)
time.sleep(3)
conf = HelpersManagement.get_backup_config(self.server_id)
if conf["command"]:
if self.check_running():
logger.debug(
"Found running server and send command option. Sending command"
)
self.send_command(conf["command"])
# pause to let people read message.
time.sleep(5)
if conf["shutdown"]:
logger.info(
"Found shutdown preference. Delaying"

2
app/classes/web/panel_handler.py
View File

@ -1678,6 +1678,7 @@ class PanelHandler(BaseHandler):
compress = self.get_argument("compress", False)
shutdown = self.get_argument("shutdown", False)
check_changed = self.get_argument("changed")
command = self.get_argument("backup_command", "")
if str(check_changed) == str(1):
checked = self.get_body_arguments("root_path")
else:
@ -1701,6 +1702,7 @@ class PanelHandler(BaseHandler):
excluded_dirs=checked,
compress=bool(compress),
shutdown=bool(shutdown),
command=command,
)
self.controller.management.add_to_audit_log(

27
app/frontend/templates/panel/server_backup.html
View File

@ -107,6 +107,23 @@
translate('serverBackups', 'shutdown', data['lang']) }}
{% end %}
</div>
<div class="form-group">
<label for="command-check" class="form-check-label ml-4 mb-4"></label>
{% if data['backup_config']['command'] %}
<input type="checkbox" class="form-check-input" id="command-check" name="command-check" checked>Run
Command Before Backup
<br>
<input type="text" class="form-control" name="backup_command" id="backup_command"
value="{{ data['backup_config']['command'] }}" placeholder="We enter the / for you"
style="display: inline-block;">
{% else %}
<input type="checkbox" class="form-check-input" id="command-check" name="command-check">Run Command
Before Backup
<br>
<input type="text" class="form-control" name="backup_command" id="backup_command" value=""
placeholder="We enter the / for you." style="display: none;">
{% end %}
</div>
<div class="form-group">
<label for="server">{{ translate('serverBackups', 'exclusionsTitle', data['lang']) }} <small> - {{
translate('serverBackups', 'excludedChoose', data['lang']) }}</small></label>
@ -344,6 +361,16 @@
});
}
$("#command-check").on("click", function () {
console.log("in command-check")
if ($("#command-check:checked").val()) {
$("#backup_command").css("display", "inline-block");
console.log("in if")
} else {
$("#backup_command").css("display", "none");
$("#backup_command").val("");
}
});
$(document).ready(function () {
try {

16
app/migrations/20230120_backup_command.py Normal file
View File

@ -0,0 +1,16 @@
# Generated by database migrator
import peewee
def migrate(migrator, database, **kwargs):
migrator.add_columns("backups", command=peewee.CharField(default=""))
"""
Write your migrations here.
"""
def rollback(migrator, database, **kwargs):
migrator.drop_columns("backups", ["command"])
"""
Write your rollback migrations here.
"""