Commit Graph

750 Commits

Author SHA1 Message Date
Andrew
d4a1efba78 Appease the linter 2022-03-13 09:26:38 -04:00
Andrew
3a8174cc22 Add status bar for support log archive 2022-03-13 08:29:26 -04:00
Andrew
6e4435c86f Add Full support for backup status 2022-03-13 06:36:44 -04:00
Andrew
33cad6afa8 Add percentage to backups page
Helper designed to be used for support logs as well.
2022-03-11 00:19:05 -05:00
Andrew
8858780d41 Move backups to ajax request 2022-03-11 00:18:22 -05:00
Andrew
319e06cd10 Add backend percentage to backups 2022-03-09 23:45:49 -05:00
Zedifus
affcc14245 Fix circular imports
I'm a silly
2022-03-08 05:44:26 +00:00
Iain Powrie
4cc617fd0d Merge branch 'tweak/fix-imports' into 'dev'
Tidy imports & dep auto-installer

See merge request crafty-controller/crafty-commander!199
2022-03-08 04:50:21 +00:00
Zedifus
b306d1f313 Tidy imports & dep auto-installer 2022-03-08 04:40:44 +00:00
Andrew
b9f6aad33d Merge branch 'enhancement/security-machine' into 'dev'
Attempt to appease Iain and the security machine

See merge request crafty-controller/crafty-commander!198
2022-03-08 03:21:50 +00:00
amcmanu3
7629f9a3ff Attempt to appease Iain and the security machine 2022-03-07 22:12:56 -05:00
Andrew
eda9f44b5f Merge branch 'bug/backups-restore/download' into 'dev'
Bug/backups restore/download

See merge request crafty-controller/crafty-commander!197
2022-03-08 02:56:52 +00:00
amcmanu3
abdefc3e43 Ensure stats schedule is removed on server start 2022-03-07 21:48:06 -05:00
amcmanu3
9520858c22 Fix backup restore 2022-03-07 21:36:23 -05:00
Iain Powrie
9c99346bbe 3.5 Translations (Squashed)
Thank you translators <3 you're all amazing!
2022-03-08 01:22:30 +00:00
Andrew
344348fafc Merge branch 'sync-symbol' into 'dev'
Add sync symbol to status page

See merge request crafty-controller/crafty-commander!196
2022-03-08 01:08:28 +00:00
amcmanu3
f2cc0e89fb Add sync symbol to status page 2022-03-07 19:57:52 -05:00
Silversthorn
506129729e Update Translation
- Adding Translation for Credits Page
 - Adding detection support for webpage
2022-03-05 12:01:36 +01:00
Andrew
ff3da27333 Merge branch 'bug/host-stats' into 'dev'
Fix task update polling

See merge request crafty-controller/crafty-commander!187
2022-03-05 01:56:19 +00:00
Andrew
1bf40ffda9 Fix task update polling
Fix task update polling after a change while linting broke it :/
2022-03-04 20:41:27 -05:00
Andrew
d36a06667e Merge branch 'bug/files-cursor' into 'dev'
Fix cursor showing as text highlight not hand

See merge request crafty-controller/crafty-commander!186
2022-03-04 23:53:36 +00:00
Iain Powrie
7f8960aed3 Merge branch 'staff/credits-update-leo' into 'dev'
Staff/credits update leo

See merge request crafty-controller/crafty-commander!184
2022-03-04 23:53:14 +00:00
Zedifus
a3656536b5 Remove '*' Prefix from joke languages
Co-authored-by: Andrew McManus <amcmanus@arcadiatech.org>
2022-03-04 23:38:36 +00:00
Andrew
55852de3d9 Fix cursor showing as text highlight not hand 2022-03-04 17:58:18 -05:00
Andrew
0775e28e56 Fix error thrown when no icon is available 2022-03-04 17:30:17 -05:00
Silversthorn
843c16bbd7 Fixing icon bug 2022-03-04 21:09:13 +01:00
Andrew
a76833b409 Optimize looping for server list nav 2022-03-04 12:42:12 -05:00
amcmanu3
db06eca12e ensure icon key exists to prevent stack 2022-03-03 23:59:17 -05:00
amcmanu3
0a08324963 Fix server reordering 2022-03-03 22:25:30 -05:00
amcmanu3
bbd4335d79 Merge branch 'dev' of gitlab.com:crafty-controller/crafty-commander into dev 2022-03-03 22:22:08 -05:00
amcmanu3
4a32744211 Fix indent causing server ordering to not work 2022-03-03 22:22:05 -05:00
amcmanu3
d5c623b928 Merge branch 'dev' into dev-RefreshStats_Threading 2022-03-03 19:57:06 -05:00
amcmanu3
dfa9ab40ca Appease the linter 2022-03-03 19:47:49 -05:00
amcmanu3
ab7889914f Bug fixes to ensure player stats display correctly
Add sync indicator to dashboard
2022-03-03 19:41:30 -05:00
Andrew
d73316119b Add server download status indicator 2022-03-04 00:36:36 +00:00
Silversthorn
cb1679806e Seperate refresh statistics for each server
Fixing Broken Things
2022-03-03 23:13:40 +01:00
Silversthorn
d016e0a59a Broke Things 2022-03-03 22:01:12 +01:00
Andrew
6bc5e5b51f Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev 2022-03-02 18:35:58 -05:00
Andrew
761653ac25 Increase realtime stats frequency 2022-03-02 18:35:53 -05:00
Iain Powrie
8da2bcae17 Merge branch 'devops/userns-rootless-container' into 'dev'
Convert container to run as non-root

See merge request crafty-controller/crafty-commander!172
2022-03-02 19:47:41 +00:00
Andrew
6cf778f068 appease the linter 2022-03-02 13:07:00 -05:00
Andrew
61ac97c02e Add unexecuted clear. Add option to compress backups 2022-03-02 12:55:49 -05:00
Zedifus
69e85faa1a Merge branch 'dev' into devops/userns-rootless-container
[RESOLVED CONFLICTS]
2022-03-02 16:58:48 +00:00
Andrew
e0b8fb35fe Add option to compress backups 2022-03-02 11:34:26 -05:00
Zedifus
8f0ac0d025 Fix permissions setting on bedrock imports
This is not an issue on java as we dont need the execute perm on .jar's
Requires to be prefix'd octal intager for mask not decimal
2022-03-02 16:22:53 +00:00
Andrew
15610210b9 Fix bug in schedule creation where if interval was days an execption would be thrown for a missing key 2022-03-02 10:49:03 -05:00
Andrew
7707940743 Appease the linter 2022-03-02 10:36:24 -05:00
Andrew
8e874ca997 Add option to disable language files through config.json 2022-03-02 10:30:40 -05:00
Andrew
826d4d081f Improve session.lock checking. 2022-03-02 09:48:03 -05:00
Andrew
23641f4033 Fix for keyerror when mc server can't be polled early enough 2022-03-01 22:45:44 -05:00
Andrew
c8267bee80 Catch key error players for stats - silently log it. Fix for human readable file size 2022-03-01 22:30:53 -05:00
Andrew
983022c5bb make file size calc more efficient 2022-03-01 22:14:50 -05:00
Andrew
322134506b Remove minecraft specific naming/stats 2022-03-01 21:43:36 -05:00
amcmanu3
e99f06ba9f remove print statement 2022-03-01 19:57:02 -05:00
amcmanu3
de3ec1fa3b Expand except to be more general to catch windows connection forcibly closed error 2022-03-01 19:47:29 -05:00
Andrew
00db762c51 Add check in server import so we don't stack if jar doesn't exist. 2022-03-01 19:29:08 -05:00
Andrew
19f8775b32 Fix traceback when importing regular server 2022-03-01 18:49:16 -05:00
Andrew
c8c1f301c0 Fix server importing for bedrock that's not a zip 2022-03-01 18:31:38 -05:00
Andrew
e1340d61ff Appease the linter 2022-03-01 17:10:04 -05:00
Andrew
5d6ada23a4 Fix visual file loading order. Fix zip imports where directories were not being copied 2022-03-01 16:54:06 -05:00
Andrew
10d3afab58 Fix bug where int mc ping was not defined for bedrock servers 2022-03-01 13:52:57 -05:00
Andrew
11bf44b35e Add user feedback for wrong unzip path 2022-03-01 13:27:41 -05:00
Andrew
22d519b4df Remove print statements 2022-03-01 12:59:08 -05:00
Andrew
bbddbbf646 Patch issue where guid was a string trying to be made into bytes 2022-03-01 12:58:39 -05:00
Andrew
d760fcb010 Appease the linter 2022-03-01 01:14:26 -05:00
Andrew
11278ebe5f Added translation for backup start/end messages. Finalize bedrock support. Removed confusion so server stats won't be shown if server isn't running. 2022-03-01 00:33:09 -05:00
Andrew
fbe9a7659d Few updates to MC bedrock ping 2022-02-28 22:57:16 -05:00
Andrew
3c48364998 BEDROCK SUPPORT. Ping works. Add notification for backups starting and completing. 2022-02-28 22:40:11 -05:00
xithical
c4f706d415 Rework of files handling and added exclusions selection for backups. 2022-03-01 01:02:30 +00:00
xithical
26014d0e86 Revert "Merge branch 'xithical-fixes' into 'dev'"
This reverts merge request !173
2022-02-28 04:40:33 +00:00
xithical
7f98e39503 Appease the linter 2022-02-27 21:25:00 -06:00
xithical
5758d64e96 Merge branch 'dev' into 'xithical-fixes'
# Conflicts:
#   app/classes/web/ajax_handler.py
#   app/frontend/templates/panel/server_backup.html
2022-02-28 03:04:23 +00:00
Andrew
3621672e81 appease the linter 2022-02-27 22:03:19 -05:00
Andrew
70ba8cceec Add fully working backups 2022-02-27 21:49:26 -05:00
Andrew
2bf2902754 Working backup exclusions 2022-02-27 21:40:05 -05:00
Andrew
008b7f4ade Run file tree serving thorugh ajax handler alone 2022-02-27 19:29:30 -05:00
Andrew
4bcb91d1d5 Add mostly functional front-end for backup exclusions 2022-02-27 16:37:48 -05:00
Andrew
23a5c228cd Merge branch 'xithical-fixes' of https://gitlab.com/crafty-controller/crafty-commander into xithical-fixes 2022-02-27 16:15:46 -05:00
Andrew
e7d78cadd4 Initial frontend for backup omissions 2022-02-27 16:15:40 -05:00
xithical
6d7ddf8494 Add controllers for backup exclusion logic 2022-02-27 15:08:03 -06:00
xithical
4b484782c6 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
2022-02-27 13:38:16 -06:00
xithical
cf5bfe88c1 Better documentation for backup logic 2022-02-27 13:21:54 -06:00
xithical
eaca8acf72 Clean up backup server method for readability 2022-02-27 13:17:14 -06:00
xithical
7c5bb0984c 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
2022-02-27 13:11:22 -06:00
xithical
29800eee3c Add methods for excluded backup directories
Adds get, add, and delete methods for excluded backup directories
2022-02-27 12:35:48 -06:00
Lukas ‎‎‎‎
67c76f1d1c Merge branch 'lukas-noinjection' into 'dev'
Reduced the amount of injection in JavaScript.

See merge request crafty-controller/crafty-commander!170
2022-02-27 18:17:06 +00:00
luukas
154b99792f Fix code quality :) 2022-02-27 19:45:32 +02:00
luukas
92c2af926a Reduced the amount of injection in JavaScript.
* Moved file endpoints to file_handler.py
* Added a global `serverId` for some pages
* Fixed fi_FI translations
* Some other stuff I don't remember
2022-02-27 19:26:54 +02:00
Andrew
dfed1cbedc Add check to make sure server file is downloaded before attempting to start 2022-02-27 12:22:52 -05:00
Andrew
6b5f4bcc21 Remove outdated exit code 2022-02-26 22:14:19 -05:00
Andrew
211214a38a Work around for servers not shutting down on crafty shutdown 2022-02-26 22:09:59 -05:00
Andrew
71769d9d23 Appease the linter 2022-02-26 21:11:33 -05:00
Andrew
5fa04d5ccc Refactor tasks.html to schedules.html to match naming scheme 2022-02-26 20:23:20 -05:00
Andrew
09335fc3d9 Add ability to reorder servers based on user 2022-02-26 18:00:54 -05:00
Andrew
1ab4ffd8f7 Add execution command for bedrock server jar 2022-02-26 12:42:01 -05:00
Andrew
59ea0a326d Add a / for execution 2022-02-26 12:35:23 -05:00
Andrew
879197a3e9 Fix typo in server.py 2022-02-26 12:31:55 -05:00
Andrew
18e2ac8328 Change zip import execution string to the correct one
Fix front end for bedrock imports
Add server type to details
2022-02-26 12:29:07 -05:00
Andrew
c625781da8 Fix typo in main_controller 2022-02-26 12:14:41 -05:00
Andrew
f3d5f4f454 Fix Bedrock for linux 2022-02-26 12:12:02 -05:00
Andrew
733b5c9a2c Add the right env variable for bedrock on linux 2022-02-26 11:59:19 -05:00
Andrew
92f9bceaf9 Revert to original popen scheme 2022-02-26 11:51:28 -05:00
Andrew
b6b8a1c14a Add env parameter to popen 2022-02-26 11:29:36 -05:00
Andrew
e3669a2483 Add check for non-windows running bedrock to set env variable 2022-02-26 11:25:08 -05:00
Andrew
48b9963a27 Add check so chain-reaction schedule cannot be assigned to itself. 2022-02-25 21:18:15 -05:00
Andrew
96d52376f3 Fix bug where new schedules could not be created 2022-02-25 20:50:07 -05:00
Andrew
58c9321c8f fix bug where schedules would not be able to be created. 2022-02-25 20:43:33 -05:00
Andrew
45ae49e84e Add features to child tasks 2022-02-25 19:53:38 -05:00
Andrew
31cb2793fd Fix a couple bugs with chain reactions 2022-02-24 00:19:54 -05:00
Andrew
8b981f3f27 appease the linter 2022-02-23 23:47:10 -05:00
Andrew
af16834419 Working chain reactions 2022-02-23 22:59:16 -05:00
Andrew
c1020ff3d1 Working chain reaction tasks 2022-02-23 22:58:48 -05:00
Andrew
a908a3a7ac Remove un-needed print statement 2022-02-22 18:03:47 -05:00
Andrew
9f360eed38 Merge branch 'pretzel-fixes' of https://gitlab.com/crafty-controller/crafty-commander into pretzel-fixes 2022-02-11 01:17:08 -05:00
Andrew
c263a4a22b Fix /stop /restart issue. /restart does not actually restart the server right now 2022-02-11 01:16:45 -05:00
amcmanu3
311d3e7411 Inital changes for bedrock stats recording 2022-02-10 20:28:40 -05:00
Andrew
569876e377 Remove useless print statement 2022-02-10 18:46:26 -05:00
Andrew
b55af70d11 Appease the linter 2022-02-10 18:29:43 -05:00
Andrew
540584990e Inital bedrock support 2022-02-10 18:20:36 -05:00
Andrew
5adc48c524 Merge branch 'pretzel-bedrock' into 'pretzel-fixes'
# Conflicts:
#   app/frontend/templates/server/bedrock_wizard.html
#   app/frontend/templates/server/wizard.html
2022-02-10 20:57:31 +00:00
Andrew
b025899aee Inital bedrock support 2022-02-10 15:54:00 -05:00
Andrew
260c3b0059 Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev 2022-02-10 15:27:51 -05:00
Andrew
c89609ae61 Inital bedrock support 2022-02-10 15:27:40 -05:00
Andrew
a084b95426 Merge branch 'dev' into 'pretzel-fixes'
Merge Dev to pretzel

See merge request crafty-controller/crafty-commander!165
2022-02-10 19:32:59 +00:00
Zedifus
1596c720cb Add ability to load credits from remote 2022-02-10 06:13:52 +00:00
Andrew
a17b57cd30 Appease the linter 2022-01-31 20:58:38 -05:00
Andrew
d592dcd422 Initial commit for adding multiple server types 2022-01-31 20:50:25 -05:00
Andrew
3e822ea076 Create fallback for audit entires 2022-01-31 18:09:23 -05:00
Andrew
2e96c40d62 Make audit entries configurable 2022-01-31 17:58:02 -05:00
Andrew
3995560ba2 Enable/disable crash detection on setting change in config 2022-01-30 21:04:08 -05:00
Andrew
ac19c86089 Appease the linter 2022-01-30 15:34:09 -05:00
Andrew
e69a3be381 Fix bug where stopping a server without crash detection would crash crafty...ironic, I know. 2022-01-30 15:28:48 -05:00
Andrew
7aebd8bd5b Merge branch 'pretzel-fixes' of https://gitlab.com/crafty-controller/crafty-commander into pretzel-fixes 2022-01-29 16:38:16 -05:00
Andrew
37ccc447c4 Fix backup config bug 2022-01-29 16:37:00 -05:00
Andrew
184a042e2a Delete audit logs when they exceed 300 entries 2022-01-29 01:37:28 -05:00
Andrew
7889ca3153 Delete audit logs when they exceed 100 entries 2022-01-29 01:36:37 -05:00
Andrew
453da9cc24 Fix more things linting broke 2022-01-29 00:08:55 -05:00
Andrew
8000acd74d Fix bug where server_obj method was not defined 2022-01-28 19:12:57 -05:00
Andrew
d1db65dc9c Fix typo when messages from players are written 2022-01-28 19:00:14 -05:00
Andrew
51a07a1f0d Fix for server reporting updating when it's not 2022-01-27 22:29:18 -05:00
Andrew
a1d5f9c084 Fix for server reporting updating when it's not 2022-01-27 22:27:24 -05:00
Andrew
350ffcba63 Lint ignore migrations 2022-01-27 22:13:01 -05:00
Andrew
4db034c39b Fix revert. Somehow migrations file was destroyed 2022-01-27 22:06:44 -05:00
Andrew
b8c19a9c16 Merge branch 'dev' into 'pretzel-fixes'
# Conflicts:
#   app/classes/shared/migration.py
2022-01-28 02:57:46 +00:00
Andrew
45ab07eb77 Revert migrations 2022-01-27 21:53:07 -05:00
Andrew
8a5a7cb13f Merge branch 'pretzel-fixes' into 'dev'
Pretzel fixes

See merge request crafty-controller/crafty-commander!151
2022-01-28 02:25:59 +00:00
Andrew
005ac1216e Add crash detection 2022-01-27 20:43:23 -05:00
Andrew
85eef71b9e Add max player/total player to stats keeping on dashboard 2022-01-27 18:16:27 -05:00
Iain Powrie
d884cac5d7 Merge branch 'bugfix/open-method-typeerror-win' into 'dev'
Fix duplicate encoding argument on windows migration read

See merge request crafty-controller/crafty-commander!149
2022-01-26 02:47:06 +00:00
Zedifus
39edd9c850 Fix Duplicate encoding argument
on windows migration read
2022-01-26 02:42:37 +00:00