Commit Graph

131 Commits

Author SHA1 Message Date
amcmanu3
eea5e329af Refactor and add import_helpers.
Working jar imports
2022-08-17 17:22:03 -04:00
Zedifus
99ae7e01a1 Tidy import naming
This will allow for previous variable naming
2022-07-21 00:39:29 +01:00
Zedifus
e01a0d5f65 Add update available notice to crafty startup
I tried displaying just under do_intro(),
but looked visually better just before user prompt
2022-07-20 23:56:09 +01:00
amcmanu3
f1d11bfb0d Remove tempdir from packaging logs. 2022-07-05 21:35:43 -04:00
Andrew
7d286e60e0 Backup/Config.json rework for API key hardening
See merge request crafty-controller/crafty-4!369
2022-06-20 19:26:21 +00:00
amcmanu3
f1f5f820b7 Add print for ordering purposes 2022-06-12 20:13:05 -04:00
amcmanu3
ef02b5a450 Change ordering 2022-06-12 20:11:56 -04:00
amcmanu3
1655818afc Define the prompt after the init is complete 2022-06-12 20:09:46 -04:00
Zedifus
417a62884c Tweak class import order
>Sorry I'm particular 😭
2022-06-05 21:17:23 +01:00
amcmanu3
3c39d421fc Appease the liner 2022-06-05 16:08:58 -04:00
amcmanu3
e0fb4c6442 Fix version3 imports 2022-06-05 16:02:52 -04:00
Silversthorn
f597a26e5b Trying to fix stuff 2022-05-30 22:05:36 +02:00
Silversthorn
8423cc24c1 I'm breaking/fixing stuff 2022-05-26 14:50:20 +02:00
luukas
b724fc500d
Improve the startup process 2022-05-21 01:53:17 +03:00
luukas
02f5318f76
Merge branch 'dev' into merge/pretzel-lukas-cleanup-nosquash 2022-05-20 22:04:41 +03:00
luukas
42af86b6f7 Merge branch 'dev' into experimental/lukas-cleanup 2022-05-17 21:21:47 +03:00
amcmanu3
a2b711b5ac Add password reset to Crafty Console 2022-05-16 15:39:10 -04:00
luukas
4a2396f45a Make improvements to main.py
* Make propmpt appear earlier (threads)
* Make SIGTERM handler start earlier
* Put task manager on a thread
* Put internet check on a thread
2022-05-16 01:33:31 +03:00
Silversthorn
16bbac7fd6 Moving Server Stats DB to Server Folder 2022-04-28 22:40:15 +02:00
Zedifus
92c8fc04f3 Refactor to standardize class/variable naming 2022-04-14 03:10:25 +01:00
computergeek125
d417950eae fix fstrings, refactored console to static 2022-04-11 20:34:46 -05:00
Zedifus
19f2429a4c Fix formatting to comply with Black 2022-04-11 11:08:36 +01:00
computergeek125
42ca4bb973 Refactored the yes to not pass objects in import
Merge Conflicts ᴙ Us
2022-04-11 00:23:55 -05:00
Zedifus
09bba7fdb0 Further fix files to conform with Black pylintrc
Mostly just breaking up strings and comments into new lines
Some strings dont require 'f' but keeping in for readability
with the rest of the concatinated string
2022-03-23 06:16:22 +00:00
Zedifus
e06fe8a52a Black codebase
Apply black formatting to codebase
2022-03-23 02:50:12 +00:00
Andrew
3a8174cc22 Add status bar for support log archive 2022-03-13 08:29:26 -04:00
Zedifus
cb3379a316 Fix signal logging 2022-03-08 05:26:13 +00: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
61ac97c02e Add unexecuted clear. Add option to compress backups 2022-03-02 12:55:49 -05:00
Zedifus
3e39463e27 Fix sighandler args > sig, args defined elsewhere 2022-03-02 16:50:44 +00:00
Zedifus
a871e09994 Appease lint
User args for something
2022-03-02 16:44:30 +00:00
Andrew
e711856cc9 Remove docker exemption from root check 2022-03-02 08:12:03 -05:00
Andrew
e2f226a6c3 Attempted fix for daemon sigterm by accepting all args in the sigterm handler 2022-03-02 08:10:49 -05:00
Andrew
4db034c39b Fix revert. Somehow migrations file was destroyed 2022-01-27 22:06:44 -05:00
Andrew
32ea620ede Appease the linter in main 2022-01-27 22:01:08 -05:00
Andrew
eeaceb61fc Add fix for ensure logging to main 2022-01-25 21:00:40 -05:00
Iain Powrie
e0ce1d118c Create pylintrc, code review pipeline & correct codebase errors
Fix uploads,
Only send server stats to user page when they have access to servers
2022-01-26 01:45:30 +00:00
Andrew
c736c2eec1 Fix for tzdata 2022-01-14 14:59:06 -05:00
Andrew
64b62f0f4f fix critical bug to support relative path for crafty logs. Crafty's root path is set by main.py and saved in controller. 2022-01-13 23:01:18 -05:00
Andrew
3e90210f3b Remove port checker for a port reminder on first run
Add DB column to track a server's first run
Send port reminder for crafty on fresh install.
Remove http server message from startup/logs - don't want to promote that it's running.
2022-01-09 13:14:59 -05:00
Andrew
7dd24b6b15 Improved File Loading, Fixed Port checking 2022-01-08 23:03:45 +00:00
Andrew
58d1ffea54 Fix error with scheduled tasks by system
Create a system user
2021-12-20 20:17:28 -05:00
Andrew
8999a9a5c3 Fix bug where terminal will not exit 2021-12-09 18:35:00 -05:00
Andrew
49893ea5a6 Merge branch 'pretzels-fixes' into 'dev'
Pretzels fixes

See merge request crafty-controller/crafty-commander!110
2021-12-09 22:39:40 +00:00
Quentin
12153b1207 Merge branch 'fix/exit-code-tweak' into 'dev'
removed old exit handling logic

See merge request crafty-controller/crafty-commander!109
2021-12-06 05:50:48 +00:00
Quentin B
b2dc1521d6 removed old exit handling logic 2021-12-05 23:01:44 -05:00
Andrew
33ab2583da Fix security issues 2021-11-30 14:37:45 -05:00
Andrew
a19ba7dbb6 Backup Restore/Root Disable 2021-11-29 21:22:46 +00:00
luukas
dba72ea194 Improve startup banner 2021-11-02 16:08:27 +02:00
Silversthorn
186dcdc616 Merge branch 'dev-Silversthorn' into dev-Silversthorn-MVC 2021-09-21 21:12:56 +02:00
Andrew
c93ce1613d Adds check message for internet as it may take a minute. 2021-09-13 17:08:02 -04:00
Andrew
2528c123f2 Adds port/internet connection checks.
Checks when crafty starts for internet and a port forward for Crafty's https port.
Checks on server launch for internet connection and for port forwarding for executed server.
2021-09-13 13:10:34 -04:00
Silversthorn
70ca82a086 Rework architecture for better MVC 2021-09-09 00:01:10 +02:00
Andrew
c1ce2b985a Fixed bugs from pretzel merge 2021-08-18 12:50:13 -04:00
Andrew
0ab8f11a60 Merge branch 'dev' into 'pretzel'
# Conflicts:
#   app/classes/shared/server.py
#   app/classes/web/panel_handler.py
#   main.py
2021-08-18 16:34:41 +00:00
luukas
f8aad8b33d Add database migrations! 2021-08-18 18:11:53 +03:00
luukas
344c2219ec Handle SIGTERM 2021-06-02 21:30:12 +03:00
luukas
11a004ea74 Handle KeyboardInterrupt in prompt (non-daemon) mode 2021-06-02 19:53:01 +03:00
luukas
23ce45724a Create universal exit function so exiting code can be in one place. 2021-04-18 00:24:54 +03:00
computergeek125
976bf0ff48 should be SIGINT, not SIGTERM (CRAFTY-CONTROLLER-T-89) 2021-04-03 14:12:03 -05:00
computergeek125
c5f8afebb2 whoops forgot to merge something 2021-03-21 23:35:17 -05:00
computergeek125
506c9bb3c3 Merge branch 'backups-and-stuff' into dev 2021-03-21 23:32:48 -05:00
computergeek125
1d3880207f Merge branch 'mcmanus-ping-port-patched' into dev 2021-03-21 23:23:27 -05:00
computergeek125
81c60d6dac One monster truck commit for rework and backups 2021-03-21 23:02:18 -05:00
Andrew
58f6949fad Port/ip-get patched
Working issue is the socket will only work for 25565.

!!CAUTION LOTS OF PRINT STATEMENTS!!
2021-03-08 22:01:42 -05:00
computergeek125
a0448f5408 Theoretically this fixes tasks scheduler 2021-03-06 14:48:02 -06:00
Phillip
19e4a31bf7 fixed console.debug printing - added module auto-installer 2021-01-19 08:56:00 -05:00
Phillip Tarrant
2eeee9d6c4 fixed bug where tables/default settings were firing each restart 2020-09-22 15:00:05 -04:00
Phillip Tarrant
d6c894c3d9 Creation of Command model, moved controler to shared in prep for plugins 2020-08-31 13:46:25 -04:00
Phillip Tarrant
cbb4ac72cc added command prompt, changed main loop to our do_exit in cmd 2020-08-27 18:53:04 -04:00
Phillip Tarrant
637407cc78 adding memory percent 2020-08-25 09:29:11 -04:00
Phillip Tarrant
7d91c9b636 fixed delay in stats recording on load 2020-08-24 19:16:33 -04:00
Phillip Tarrant
a0fcda018c Fixed errand print statement
Re-init all servers when adding a server
server builder tested well. Next is importing a server
2020-08-23 22:17:36 -04:00
Phillip Tarrant
6ec2f1c6ac part 1 of the server builder complete 2020-08-23 18:43:28 -04:00
Phillip Tarrant
81d5ff05e8 fixed endless redirect issue on non-existant paths 2020-08-19 13:21:19 -04:00
Phillip Tarrant
203441045f Added crafty specific stuff to config.ini 2020-08-18 21:04:43 -04:00
Phillip Tarrant
ad541347af scheduler, version change, database work, controller init servers, etc etc 2020-08-16 22:47:53 -04:00
Phillip Tarrant
25affba2e6 got login working 2020-08-13 10:38:36 -04:00
Phillip Tarrant
85a69954ea building out databases and config files 2020-08-12 21:33:36 -04:00
Phillip Tarrant
2f12f95ab2 first huge commit 2020-08-11 20:36:09 -04:00
Phillip Tarrant
9b671ebfed Initial commit 2020-08-09 10:21:05 -04:00