public/dropshell
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 44 Wiki Activity

Compare commits

base: public:2025.0518.1300
Branches Tags
public:main public:exec public:revert-to-19d528e
public:2025.0601.1821 public:2025.0601.1754 public:2025.0601.1752 public:2025.0527.2201 public:2025.0526.2310 public:2025.0526.2234 public:2025.0526.2226 public:2025.0524.2127 public:2025.0524.2044 public:2025.0524.2033 public:2025.0524.1933 public:2025.0524.1700 public:2025.0524.1314 public:2025.0524.1149 public:2025.0521.2138 public:2025.0521.2125 public:2025.0521.1908 public:2025.0521.1906 public:2025.0519.2309 public:2025.0519.1727 public:2025.0519.0021 public:2025.0518.2308 public:2025.0518.2245 public:2025.0518.2236 public:2025.0518.1558 public:2025.0518.1451 public:2025.0518.1356 public:2025.0518.1355 public:2025.0518.1300 public:2025.0518.1218 public:2025.0518.1150 public:2025.0518.1145 public:2025.0517.2231 public:2025.0517.2027 public:DEV public:2025.0514.2229 public:2025.0514.2226 public:2025.0514.2225 public:2025.0514.2222 public:2025.0513.2220 public:2025.0513.2200 public:2025.0513.2157 public:2025.0513.2151 public:2025.0513.2147
...
compare: public:2025.0518.1451
Branches Tags
public:main public:exec public:revert-to-19d528e
public:2025.0601.1821 public:2025.0601.1754 public:2025.0601.1752 public:2025.0527.2201 public:2025.0526.2310 public:2025.0526.2234 public:2025.0526.2226 public:2025.0524.2127 public:2025.0524.2044 public:2025.0524.2033 public:2025.0524.1933 public:2025.0524.1700 public:2025.0524.1314 public:2025.0524.1149 public:2025.0521.2138 public:2025.0521.2125 public:2025.0521.1908 public:2025.0521.1906 public:2025.0519.2309 public:2025.0519.1727 public:2025.0519.0021 public:2025.0518.2308 public:2025.0518.2245 public:2025.0518.2236 public:2025.0518.1558 public:2025.0518.1451 public:2025.0518.1356 public:2025.0518.1355 public:2025.0518.1300 public:2025.0518.1218 public:2025.0518.1150 public:2025.0518.1145 public:2025.0517.2231 public:2025.0517.2027 public:DEV public:2025.0514.2229 public:2025.0514.2226 public:2025.0514.2225 public:2025.0514.2222 public:2025.0513.2220 public:2025.0513.2200 public:2025.0513.2157 public:2025.0513.2151 public:2025.0513.2147

6 Commits
2025.0518. ... 2025.0518.

Author SHA1 Message Date
Your Name
f89d90c12b dropshell release 2025.0518.1451
Some checks failed
Dropshell Test / Build_and_Test (push) Has been cancelled
Details
2025-05-18 14:51:53 +12:00
Your Name
5883c62c54 Tidy output
Some checks failed
Dropshell Test / Build_and_Test (push) Has been cancelled
Details
2025-05-18 14:29:51 +12:00
Your Name
b278e81533 info for table print
Some checks failed
Dropshell Test / Build_and_Test (push) Has been cancelled
Details
2025-05-18 14:03:12 +12:00
Your Name
6c99b429b9 dropshell release 2025.0518.1356
Some checks failed
Dropshell Test / Build_and_Test (push) Has been cancelled
Details
2025-05-18 13:56:52 +12:00
Your Name
2b446f80a3 dropshell release 2025.0518.1355
Some checks failed
Dropshell Test / Build_and_Test (push) Has been cancelled
Details
2025-05-18 13:55:39 +12:00
Your Name
314a5fe96a Trying new approach 2025-05-18 13:07:09 +12:00
25 changed files with 425 additions and 395 deletions
Expand all files Collapse all files

5
source/agent/_allservicesstatus.sh
View File

@ -73,6 +73,7 @@ function run_command() {
# update the main variables. # update the main variables.
CONFIG_PATH="${service_path}/config" CONFIG_PATH="${service_path}/config"
SERVICE="${SERVICE_NAME}" SERVICE="${SERVICE_NAME}"
DOCKER_CLI_HINTS=false
set +a set +a
@ -99,6 +100,10 @@ function command_exists() {
} }
if [ ! -d "${SERVICES_PATH}" ]; then
echo "Services path does not exist: ${SERVICES_PATH}"
exit 0
fi
# Get all service names # Get all service names
SERVICE_NAMES=$(ls "${SERVICES_PATH}") SERVICE_NAMES=$(ls "${SERVICES_PATH}")

65
source/src/autogen/_agent.cpp
View File

@ -281,36 +281,39 @@ bool recreate_tree(std::string destination_folder) {
"YXRofS9jb25maWcvc2VydmljZS5lbnYiCiAgICAgICAgbG9hZF9kb3RlbnYgIiR7c2VydmljZV9w"\ "YXRofS9jb25maWcvc2VydmljZS5lbnYiCiAgICAgICAgbG9hZF9kb3RlbnYgIiR7c2VydmljZV9w"\
"YXRofS9jb25maWcvLnRlbXBsYXRlX2luZm8uZW52IgoKICAgICAgICAjIHVwZGF0ZSB0aGUgbWFp"\ "YXRofS9jb25maWcvLnRlbXBsYXRlX2luZm8uZW52IgoKICAgICAgICAjIHVwZGF0ZSB0aGUgbWFp"\
"biB2YXJpYWJsZXMuCiAgICAgICAgQ09ORklHX1BBVEg9IiR7c2VydmljZV9wYXRofS9jb25maWci"\ "biB2YXJpYWJsZXMuCiAgICAgICAgQ09ORklHX1BBVEg9IiR7c2VydmljZV9wYXRofS9jb25maWci"\
"CiAgICAgICAgU0VSVklDRT0iJHtTRVJWSUNFX05BTUV9IgoKICAgICAgICBzZXQgK2EKCiAgICAg"\ "CiAgICAgICAgU0VSVklDRT0iJHtTRVJWSUNFX05BTUV9IgogICAgICAgIERPQ0tFUl9DTElfSElO"\
"ICAgX2NoZWNrX3JlcXVpcmVkX2Vudl92YXJzX2FsbHNlcnZpY2Vzc3RhdHVzICJDT05GSUdfUEFU"\ "VFM9ZmFsc2UKCiAgICAgICAgc2V0ICthCgogICAgICAgIF9jaGVja19yZXF1aXJlZF9lbnZfdmFy"\
"SCIgIlNFUlZFUiIgIlNFUlZJQ0UiICJBR0VOVF9QQVRIIiAiSE9TVF9OQU1FIiAiVEVNUExBVEUi"\ "c19hbGxzZXJ2aWNlc3N0YXR1cyAiQ09ORklHX1BBVEgiICJTRVJWRVIiICJTRVJWSUNFIiAiQUdF"\
"CgogICAgICAgIGlmIFsgIiRjYXB0dXJlX291dHB1dCIgPSAidHJ1ZSIgXTsgdGhlbgogICAgICAg"\ "TlRfUEFUSCIgIkhPU1RfTkFNRSIgIlRFTVBMQVRFIgoKICAgICAgICBpZiBbICIkY2FwdHVyZV9v"\
"ICAgICAjIENhcHR1cmUgYW5kIHJldHVybiBvdXRwdXQKICAgICAgICAgICAgYmFzaCAiJHtzZXJ2"\ "dXRwdXQiID0gInRydWUiIF07IHRoZW4KICAgICAgICAgICAgIyBDYXB0dXJlIGFuZCByZXR1cm4g"\
"aWNlX3BhdGh9L3RlbXBsYXRlLyR7Y29tbWFuZH0uc2giIDI+JjEKICAgICAgICBlbHNlCiAgICAg"\ "b3V0cHV0CiAgICAgICAgICAgIGJhc2ggIiR7c2VydmljZV9wYXRofS90ZW1wbGF0ZS8ke2NvbW1h"\
"ICAgICAgICMgUnVuIHNpbGVudGx5IGFuZCByZXR1cm4gZXhpdCBjb2RlCiAgICAgICAgICAgIGJh"\ "bmR9LnNoIiAyPiYxCiAgICAgICAgZWxzZQogICAgICAgICAgICAjIFJ1biBzaWxlbnRseSBhbmQg"\
"c2ggIiR7c2VydmljZV9wYXRofS90ZW1wbGF0ZS8ke2NvbW1hbmR9LnNoIiA+IC9kZXYvbnVsbCAy"\ "cmV0dXJuIGV4aXQgY29kZQogICAgICAgICAgICBiYXNoICIke3NlcnZpY2VfcGF0aH0vdGVtcGxh"\
"PiYxCiAgICAgICAgZmkKICAgICkKICAgIENVUlJFTlRfRVhJVF9DT0RFPSQ/Cn0KCmZ1bmN0aW9u"\ "dGUvJHtjb21tYW5kfS5zaCIgPiAvZGV2L251bGwgMj4mMQogICAgICAgIGZpCiAgICApCiAgICBD"\
"IGNvbW1hbmRfZXhpc3RzKCkgewogICAgbG9jYWwgc2VydmljZV9wYXRoPSQxCiAgICBsb2NhbCBj"\ "VVJSRU5UX0VYSVRfQ09ERT0kPwp9CgpmdW5jdGlvbiBjb21tYW5kX2V4aXN0cygpIHsKICAgIGxv"\
"b21tYW5kPSQyCiAgICBpZiBbICEgLWYgIiR7c2VydmljZV9wYXRofS90ZW1wbGF0ZS8ke2NvbW1h"\ "Y2FsIHNlcnZpY2VfcGF0aD0kMQogICAgbG9jYWwgY29tbWFuZD0kMgogICAgaWYgWyAhIC1mICIk"\
"bmR9LnNoIiBdOyB0aGVuCiAgICAgICAgcmV0dXJuIDEKICAgIGZpCiAgICByZXR1cm4gMAp9CgoK"\ "e3NlcnZpY2VfcGF0aH0vdGVtcGxhdGUvJHtjb21tYW5kfS5zaCIgXTsgdGhlbgogICAgICAgIHJl"\
"CiMgR2V0IGFsbCBzZXJ2aWNlIG5hbWVzClNFUlZJQ0VfTkFNRVM9JChscyAiJHtTRVJWSUNFU19Q"\ "dHVybiAxCiAgICBmaQogICAgcmV0dXJuIDAKfQoKCmlmIFsgISAtZCAiJHtTRVJWSUNFU19QQVRI"\
"QVRIfSIpCgojIEl0ZXJhdGUgb3ZlciBhbGwgc2VydmljZSBuYW1lcwpmb3IgU0VSVklDRV9OQU1F"\ "fSIgXTsgdGhlbgogICAgZWNobyAiU2VydmljZXMgcGF0aCBkb2VzIG5vdCBleGlzdDogJHtTRVJW"\
"IGluICR7U0VSVklDRV9OQU1FU307IGRvCgogICAgU0VSVklDRV9QQVRIPSQocmVhbHBhdGggIiR7"\ "SUNFU19QQVRIfSIKICAgIGV4aXQgMApmaQoKIyBHZXQgYWxsIHNlcnZpY2UgbmFtZXMKU0VSVklD"\
"U0VSVklDRVNfUEFUSH0vJHtTRVJWSUNFX05BTUV9IikKCiAgICAjLS0tLS0tLS0tLS0tLS0tLS0t"\ "RV9OQU1FUz0kKGxzICIke1NFUlZJQ0VTX1BBVEh9IikKCiMgSXRlcmF0ZSBvdmVyIGFsbCBzZXJ2"\
"LS0tLS0tLS0tLS0tLS0KICAgICMgR2V0IHRoZSBzZXJ2aWNlIGhlYWx0aAogICAgaWYgISBjb21t"\ "aWNlIG5hbWVzCmZvciBTRVJWSUNFX05BTUUgaW4gJHtTRVJWSUNFX05BTUVTfTsgZG8KCiAgICBT"\
"YW5kX2V4aXN0cyAiJHtTRVJWSUNFX1BBVEh9IiAic3RhdHVzIjsgdGhlbgogICAgICAgIFNFUlZJ"\ "RVJWSUNFX1BBVEg9JChyZWFscGF0aCAiJHtTRVJWSUNFU19QQVRIfS8ke1NFUlZJQ0VfTkFNRX0i"\
"Q0VfSEVBTFRIPSJ1bmtub3duIgogICAgZWxzZQogICAgICAgIHJ1bl9jb21tYW5kICIke1NFUlZJ"\ "KQoKICAgICMtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogICAgIyBHZXQgdGhlIHNl"\
"Q0VfUEFUSH0iICJzdGF0dXMiICJmYWxzZSIKICAgICAgICBpZiBbICIke0NVUlJFTlRfRVhJVF9D"\ "cnZpY2UgaGVhbHRoCiAgICBpZiAhIGNvbW1hbmRfZXhpc3RzICIke1NFUlZJQ0VfUEFUSH0iICJz"\
"T0RFfSIgLWVxIDAgXTsgdGhlbgogICAgICAgICAgICBTRVJWSUNFX0hFQUxUSD0iaGVhbHRoeSIK"\ "dGF0dXMiOyB0aGVuCiAgICAgICAgU0VSVklDRV9IRUFMVEg9InVua25vd24iCiAgICBlbHNlCiAg"\
"ICAgICAgICBlbHNlCiAgICAgICAgICAgIFNFUlZJQ0VfSEVBTFRIPSJ1bmhlYWx0aHkiCiAgICAg"\ "ICAgICAgcnVuX2NvbW1hbmQgIiR7U0VSVklDRV9QQVRIfSIgInN0YXR1cyIgImZhbHNlIgogICAg"\
"ICAgZmkKICAgIGZpCgogICAgIy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgICAj"\ "ICAgIGlmIFsgIiR7Q1VSUkVOVF9FWElUX0NPREV9IiAtZXEgMCBdOyB0aGVuCiAgICAgICAgICAg"\
"IEdldCB0aGUgc2VydmljZSBwb3J0cwogICAgaWYgISBjb21tYW5kX2V4aXN0cyAiJHtTRVJWSUNF"\ "IFNFUlZJQ0VfSEVBTFRIPSJoZWFsdGh5IgogICAgICAgIGVsc2UKICAgICAgICAgICAgU0VSVklD"\
"X1BBVEh9IiAicG9ydHMiOyB0aGVuCiAgICAgICAgU0VSVklDRV9QT1JUUz0iIgogICAgZWxzZQog"\ "RV9IRUFMVEg9InVuaGVhbHRoeSIKICAgICAgICBmaQogICAgZmkKCiAgICAjLS0tLS0tLS0tLS0t"\
"ICAgICAgIHJ1bl9jb21tYW5kICIke1NFUlZJQ0VfUEFUSH0iICJwb3J0cyIgInRydWUiCiAgICAg"\ "LS0tLS0tLS0tLS0tLS0tLS0tLS0KICAgICMgR2V0IHRoZSBzZXJ2aWNlIHBvcnRzCiAgICBpZiAh"\
"ICAgU0VSVklDRV9QT1JUUz0iJHtDVVJSRU5UX09VVFBVVH0iCiAgICBmaQoKICAgICMtLS0tLS0t"\ "IGNvbW1hbmRfZXhpc3RzICIke1NFUlZJQ0VfUEFUSH0iICJwb3J0cyI7IHRoZW4KICAgICAgICBT"\
"LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogICAgIyByZXR1cm4gdGhlIGhlYWx0aCBhbmQgcG9y"\ "RVJWSUNFX1BPUlRTPSIiCiAgICBlbHNlCiAgICAgICAgcnVuX2NvbW1hbmQgIiR7U0VSVklDRV9Q"\
"dHMKICAgIGVjaG8gIiR7U0VSVklDRV9OQU1FfV9IRUFMVEg9JHtTRVJWSUNFX0hFQUxUSH0iCiAg"\ "QVRIfSIgInBvcnRzIiAidHJ1ZSIKICAgICAgICBTRVJWSUNFX1BPUlRTPSIke0NVUlJFTlRfT1VU"\
"ICBlY2hvICIke1NFUlZJQ0VfTkFNRX1fUE9SVFM9JHtTRVJWSUNFX1BPUlRTfSIKZG9uZQo="; "UFVUfSIKICAgIGZpCgogICAgIy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgICAj"\
"IHJldHVybiB0aGUgaGVhbHRoIGFuZCBwb3J0cwogICAgZWNobyAiJHtTRVJWSUNFX05BTUV9X0hF"\
"QUxUSD0ke1NFUlZJQ0VfSEVBTFRIfSIKICAgIGVjaG8gIiR7U0VSVklDRV9OQU1FfV9QT1JUUz0k"\
"e1NFUlZJQ0VfUE9SVFN9Igpkb25lCg==";
// Decode Base64 data // Decode Base64 data
size_t decoded_size = (strlen(filedata_base64) * 3) / 4; size_t decoded_size = (strlen(filedata_base64) * 3) / 4;
@ -318,7 +321,7 @@ bool recreate_tree(std::string destination_folder) {
size_t actual_size; size_t actual_size;
base64_decode(filedata_base64, strlen(filedata_base64), decoded_data, &actual_size); base64_decode(filedata_base64, strlen(filedata_base64), decoded_data, &actual_size);
bool file_written = _recreate_file_(outpath, 4383289270743338040ULL, std::filesystem::perms(493), decoded_data, actual_size); bool file_written = _recreate_file_(outpath, 4669115953916396805ULL, std::filesystem::perms(493), decoded_data, actual_size);
delete[] decoded_data; delete[] decoded_data;
any_written = any_written || file_written; any_written = any_written || file_written;
} }

44
source/src/commands/colours.cpp Normal file
View File

@ -0,0 +1,44 @@
#include "command_registry.hpp"
#include "config.hpp"
#include "utils/output.hpp"
#include "utils/assert.hpp"
namespace dropshell {
void colours_autocomplete(const CommandContext& ctx) {}
int colours_handler(const CommandContext& ctx)
{
info << "Colours:" << std::endl;
debug << "Debug Example: The quick brown fox jumps over the lazy dog." << std::endl;
info << "Info Example: The quick brown fox jumps over the lazy dog." << std::endl;
warning << "Warning Example: The quick brown fox jumps over the lazy dog." << std::endl;
error << "Error Example: The quick brown fox jumps over the lazy dog." << std::endl;
return 0;
}
static std::vector<std::string> colours_name_list={"colours","c","--colours","-c"};
// Static registration
struct ColoursCommandRegister {
ColoursCommandRegister() {
CommandRegistry::instance().register_command({
colours_name_list,
colours_handler,
colours_autocomplete,
true, // hidden
false, // requires_config
false, // requires_install
0, // min_args (after command)
0, // max_args (after command)
"colours",
"Show the colours used by dropshell.",
// heredoc
R"(
Show the colours used by dropshell.
)"
});
}
} colours_command_register;
} // namespace dropshell

26
source/src/commands/edit.cpp
View File

@ -66,16 +66,16 @@ bool edit_file(const std::string &file_path, bool has_bb64)
// Check if stdin is connected to a terminal if EDITOR is not set // Check if stdin is connected to a terminal if EDITOR is not set
editor_cmd = "nano -w " + quote(file_path); editor_cmd = "nano -w " + quote(file_path);
} else { } else {
std::cerr << "Error: Standard input is not a terminal and EDITOR environment variable is not set." << std::endl; error << "Standard input is not a terminal and EDITOR environment variable is not set." << std::endl;
std::cerr << "Try setting the EDITOR environment variable (e.g., export EDITOR=nano) or run in an interactive terminal." << std::endl; info << "Try setting the EDITOR environment variable (e.g., export EDITOR=nano) or run in an interactive terminal." << std::endl;
std::cerr << "You can manually edit the file at: " << file_path << std::endl; info << "You can manually edit the file at: " << file_path << std::endl;
return false; return false;
} }
std::cout << "Editing file: " << file_path << std::endl; info << "Editing file: " << file_path << std::endl;
if (has_bb64) { if (has_bb64) {
return execute_local_command(editor_cmd, nullptr, cMode::Interactive); return execute_local_command("", editor_cmd, {}, nullptr, cMode::Interactive);
} }
else { else {
// might not have bb64 at this early stage. Direct edit. // might not have bb64 at this early stage. Direct edit.
@ -119,14 +119,14 @@ int edit_server(const std::string &server_name)
std::string config_file = localfile::server_json(server_name); std::string config_file = localfile::server_json(server_name);
if (!edit_file(config_file, true)) { if (!edit_file(config_file, true)) {
std::cerr << "Error: Failed to edit server config" << std::endl; error << "Failed to edit server config" << std::endl;
std::cerr << "You can manually edit this file at: " << config_file << std::endl; info << "You can manually edit this file at: " << config_file << std::endl;
return 1; return 1;
} }
std::cout << "If you have changed DROPSHELL_DIR, you should manually move the files to the new location NOW." << std::endl info << "If you have changed DROPSHELL_DIR, you should manually move the files to the new location NOW." << std::endl;
<< "You can ssh in to the remote server with: dropshell ssh "<<server_name<< std::endl info << "You can ssh in to the remote server with: dropshell ssh "<<server_name<< std::endl;
<< "Once moved, reinstall all services with: dropshell install " << server_name << std::endl; info << "Once moved, reinstall all services with: dropshell install " << server_name << std::endl;
return 0; return 0;
} }
@ -138,12 +138,12 @@ int edit_service_config(const std::string &server, const std::string &service)
std::string config_file = localfile::service_env(server, service); std::string config_file = localfile::service_env(server, service);
if (!std::filesystem::exists(config_file)) if (!std::filesystem::exists(config_file))
{ {
std::cerr << "Error: Service config file not found: " << config_file << std::endl; error << "Service config file not found: " << config_file << std::endl;
return 1; return 1;
} }
if (edit_file(config_file, true) && std::filesystem::exists(config_file)) if (edit_file(config_file, true) && std::filesystem::exists(config_file))
std::cout << "To apply your changes, run:\n dropshell install " + server + " " + service << std::endl; info << "To apply your changes, run:\n dropshell install " + server + " " + service << std::endl;
return 0; return 0;
} }
@ -167,7 +167,7 @@ int edit_handler(const CommandContext& ctx) {
return 0; return 0;
} }
std::cout << "Edit handler called with " << ctx.args.size() << " args\n"; info << "Edit handler called with " << ctx.args.size() << " args\n";
return -1; return -1;
} }

2
source/src/commands/health.cpp
View File

@ -45,7 +45,7 @@ namespace dropshell
{ {
if (ctx.args.size() < 1) if (ctx.args.size() < 1)
{ {
std::cerr << "Error: Server name is required" << std::endl; error << "Server name is required" << std::endl;
return 1; return 1;
} }

94
source/src/commands/help.cpp
View File

@ -48,7 +48,7 @@ void help_autocomplete(const CommandContext& ctx) {
if (ctx.args.size() == 1) { if (ctx.args.size() == 1) {
// list all commands // list all commands
for (const auto& cmd : CommandRegistry::instance().list_primary_commands(false)) { for (const auto& cmd : CommandRegistry::instance().list_primary_commands(false)) {
std::cout << cmd << std::endl; rawout << cmd << std::endl;
} }
} }
return; return;
@ -58,13 +58,13 @@ void show_command(const std::string& cmd) {
const auto& cmd_info = CommandRegistry::instance().find_command(cmd); const auto& cmd_info = CommandRegistry::instance().find_command(cmd);
if (!cmd_info) if (!cmd_info)
{ {
std::cout << "Unknown command: " << cmd << std::endl; error << "Unknown command: " << cmd << std::endl;
return; return;
} }
std::cout << " "; info << " ";
print_left_aligned(cmd_info->help_usage, 32); info << left_align(cmd_info->help_usage, 32);
std::cout << cmd_info->help_description << std::endl; info << cmd_info->help_description << std::endl;
} }
extern const std::string VERSION; extern const std::string VERSION;
@ -77,28 +77,26 @@ int show_command_help(const std::string& cmd) {
const auto& cmd_info = CommandRegistry::instance().find_command(cmd); const auto& cmd_info = CommandRegistry::instance().find_command(cmd);
if (!cmd_info) if (!cmd_info)
{ {
std::cout << "Unknown command: " << cmd << std::endl; error << "Unknown command: " << cmd << std::endl;
return 1; return 1;
} }
info << "Command " << cmd << " usage:" << std::endl;
info << " ";
info << left_align(cmd_info->help_usage, 32);
info << cmd_info->help_description << std::endl;
std::cout << std::endl; info << std::endl;
std::cout << "Usage: " << std::endl;
std::cout << " ";
print_left_aligned(cmd_info->help_usage, 30);
std::cout << cmd_info->help_description << std::endl;
std::cout << std::endl; info << " Equivalent names: ";
std::cout << " Equivalent names: ";
bool first = true; bool first = true;
for (const auto& name : cmd_info->names) { for (const auto& name : cmd_info->names) {
if (!first) std::cout << ", "; if (!first) info << ", ";
std::cout << name; info << name;
first = false; first = false;
} }
std::cout << std::endl << std::endl; info << std::endl;
std::cout << cmd_info->full_help << std::endl << std::endl; info << cmd_info->full_help << std::endl << std::endl;
return 0; return 0;
} }
@ -108,12 +106,12 @@ int help_handler(const CommandContext& ctx) {
if (ctx.args.size() > 0) if (ctx.args.size() > 0)
return show_command_help(ctx.args[0]); return show_command_help(ctx.args[0]);
std::cout << std::endl; info << std::endl;
maketitle("DropShell version " + VERSION); maketitle("DropShell version " + VERSION);
std::cout << std::endl; info << std::endl;
std::cout << "A tool for managing remote servers, by " << AUTHOR << std::endl; info << "A tool for managing remote servers, by " << AUTHOR << std::endl;
std::cout << std::endl; info << std::endl;
std::cout << "dropshell ..." << std::endl; info << "dropshell ..." << std::endl;
show_command("help"); show_command("help");
show_command("edit"); show_command("edit");
@ -136,56 +134,6 @@ int help_handler(const CommandContext& ctx) {
return 0; return 0;
} }
// void show_command(const std::string& cmd) {
// const auto& cmd_info = CommandRegistry::instance().find_command(cmd);
// if (cmd_info) {
// std::cout << " " << cmd_info->help_usage
// << std::string(' ', std::min(1,(int)(30-cmd_info->help_usage.length())))
// << cmd_info->help_description << std::endl;
// }
// }
// bool print_help() {
// std::cout << std::endl;
// maketitle("DropShell version " + VERSION);
// std::cout << std::endl;
// std::cout << "A tool for managing server configurations" << std::endl;
// std::cout << std::endl;
// std::cout << "dropshell ..." << std::endl;
// show_command("help");
// show_command("edit");
// if (gConfig().is_config_set()) {
// std::cout << " templates List all available templates" << std::endl;
// std::cout << std::endl;
// std::cout << std::endl;
// std::cout << "Service commands: (if no service is specified, all services for the server are affected)" << std::endl;
// std::cout << " list [SERVER] [SERVICE] List status/details of all servers/server/service." << std::endl;
// std::cout << " edit [SERVER] [SERVICE] Edit the configuration of dropshell/server/service." << std::endl;
// std::cout << std::endl;
// std::cout << " install SERVER [SERVICE] Install/reinstall/update service(s). Safe/non-destructive." << std::endl;
// std::cout << " uninstall SERVER [SERVICE] Uninstalls the service on the remote server. Leaves data intact." << std::endl;
// std::cout << " nuke SERVER SERVICE Nuke the service, deleting ALL local and remote data." << std::endl;
// std::cout << std::endl;
// std::cout << " COMMAND SERVER [SERVICE] Run a command on service(s), e.g." << std::endl;
// std::cout << " backup, restore, start, stop, logs" << std::endl;
// std::cout << std::endl;
// std::cout << " ssh SERVER SERVICE Launch an interactive shell on a server or service" << std::endl;
// std::cout << std::endl;
// std::cout << "Creation commands: (apply to the first local config directory)"<<std::endl;
// std::cout << " create-template TEMPLATE" << std::endl;
// std::cout << " create-server SERVER" << std::endl;
// std::cout << " create-service SERVER TEMPLATE SERVICE" << std::endl;
// }
// else {
// show_command("help");
// show_command("edit");
// std::cout << std::endl;
// std::cout << "Other commands available once initialised." << std::endl;
// }
// return true;
// }
} // namespace dropshell } // namespace dropshell

39
source/src/commands/install.cpp
View File

@ -7,6 +7,7 @@
#include "utils/hash.hpp" #include "utils/hash.hpp"
#include "autogen/_agent.hpp" #include "autogen/_agent.hpp"
#include "services.hpp" #include "services.hpp"
#include "utils/output.hpp"
#include <unistd.h> #include <unistd.h>
#include <cstring> #include <cstring>
@ -100,7 +101,7 @@ namespace dropshell
} }
// Copy template files // Copy template files
std::cout << "Copying: [LOCAL] " << tinfo.local_template_path() << std::endl debug << "Copying: [LOCAL] " << tinfo.local_template_path() << std::endl
<< std::string(8, ' ') << "[REMOTE] " << remotepath::service_template(server, service) << "/" << std::endl; << std::string(8, ' ') << "[REMOTE] " << remotepath::service_template(server, service) << "/" << std::endl;
if (!shared_commands::rsync_tree_to_remote(tinfo.local_template_path().string(), remotepath::service_template(server, service), if (!shared_commands::rsync_tree_to_remote(tinfo.local_template_path().string(), remotepath::service_template(server, service),
server_env, silent)) server_env, silent))
@ -110,7 +111,7 @@ namespace dropshell
} }
// Copy service files // Copy service files
std::cout << "Copying: [LOCAL] " << localpath::service(server, service) << std::endl debug << "Copying: [LOCAL] " << localpath::service(server, service) << std::endl
<< std::string(8, ' ') << "[REMOTE] " << remotepath::service_config(server, service) << std::endl; << std::string(8, ' ') << "[REMOTE] " << remotepath::service_config(server, service) << std::endl;
if (!shared_commands::rsync_tree_to_remote(localpath::service(server, service), remotepath::service_config(server, service), if (!shared_commands::rsync_tree_to_remote(localpath::service(server, service), remotepath::service_config(server, service),
server_env, silent)) server_env, silent))
@ -121,12 +122,12 @@ namespace dropshell
// Run install script // Run install script
{ {
std::cout << "Running " << service_info.template_name << " install script on " << server << "..." << std::endl; info << "Running " << service_info.template_name << " install script on " << server << "..." << std::endl;
server_env.run_remote_template_command(service, "install", {}, silent, {}); server_env.run_remote_template_command(service, "install", {}, silent, {});
} }
// print health tick // print health tick
std::cout << "Health: " << shared_commands::healthtick(server, service) << std::endl; info << "Health: " << shared_commands::healthtick(server, service) << std::endl;
return true; return true;
} }
@ -281,30 +282,30 @@ namespace dropshell
int install_server(const std::string &server) int install_server(const std::string &server)
{ {
// install the dropshell agent on the given server. // install the dropshell agent on the given server.
std::cout << "Installing dropshell agent on " << server << std::endl; maketitle("Installing dropshell agent on " + server, sColour::INFO);
std::string agent_path = remotepath::agent(server); std::string agent_path = remotepath::agent(server);
if (agent_path.empty()) if (agent_path.empty())
{ {
std::cerr << "Failed to get agent path for " << server << std::endl; error << "Failed to get agent path for " << server << std::endl;
return 1; return 1;
} }
server_env_manager server_env(server); server_env_manager server_env(server);
if (!server_env.is_valid()) if (!server_env.is_valid())
{ {
std::cerr << "Invalid server environment for " << server << std::endl; error << "Invalid server environment for " << server << std::endl;
return 1; return 1;
} }
// now create the agent. // now create the agent.
// copy across from the local agent files. // copy across from the local agent files.
std::cout << "Copying local agent files to remote server... " << std::flush; info << "Copying local agent files to remote server... " << std::flush;
shared_commands::rsync_tree_to_remote(localpath::files_for_remote_agent(), agent_path, server_env, false); shared_commands::rsync_tree_to_remote(localpath::files_for_remote_agent(), agent_path, server_env, false);
std::cout << "done." << std::endl; info << "done." << std::endl;
// add in bb64. We can't use execute_remote_command() here, as that relies on bb64 which we're installing! // add in bb64. We can't use execute_remote_command() here, as that relies on bb64 which we're installing!
std::cout << "Installing bb64 on " << server << "..." << std::endl << std::flush; info << "Installing bb64 on " << server << "..." << std::endl << std::flush;
std::string remote_cmd = std::string remote_cmd =
"ssh -p " + server_env.get_SSH_INFO().port + " " + server_env.get_SSH_INFO().user + "@" + server_env.get_SSH_INFO().host + "ssh -p " + server_env.get_SSH_INFO().port + " " + server_env.get_SSH_INFO().user + "@" + server_env.get_SSH_INFO().host +
@ -312,24 +313,20 @@ namespace dropshell
quote(agent_path) + " " + quote("$(id -u " + server_env.get_SSH_USER() + "):$(id -g " + server_env.get_SSH_USER() + ")") + "'"; quote(agent_path) + " " + quote("$(id -u " + server_env.get_SSH_USER() + "):$(id -g " + server_env.get_SSH_USER() + ")") + "'";
//std::cout << "Executing: " << remote_cmd << std::endl; //std::cout << "Executing: " << remote_cmd << std::endl;
if (!execute_local_command(remote_cmd, nullptr, cMode::Silent)) if (!execute_local_command("", remote_cmd, {}, nullptr, cMode::Silent))
std::cerr << "Failed to download bb64 to " << agent_path << " on remote server." << std::endl; error << "Failed to download bb64 to " << agent_path << " on remote server." << std::endl;
else else
std::cout << "Downloaded bb64 to " << agent_path << " on remote server." << std::endl; debug << "Downloaded bb64 to " << agent_path << " on remote server." << std::endl;
// just test all is ok
// run the self-test. // run the self-test.
std::string output; bool okay = execute_ssh_command(server_env.get_SSH_INFO(), sCommand(agent_path, "./selftest.sh", {}), cMode::Defaults, nullptr);
bool okay = execute_ssh_command(server_env.get_SSH_INFO(), sCommand(agent_path, "./selftest.sh", {}), cMode::Defaults, &output);
if (!okay) if (!okay)
{ {
std::cerr << "ERROR: Failed to install remote agent on " << server << std::endl; error << "ERROR: Failed to install remote agent on " << server << std::endl;
std::cerr << "ERROR: Output: " << output << std::endl;
return 1; return 1;
} }
std::cout << output << std::endl; info << "Installation on " << server << " complete." << std::endl;
return 0; return 0;
} }
@ -345,7 +342,7 @@ namespace dropshell
if (!gConfig().is_config_set()) if (!gConfig().is_config_set())
{ {
std::cerr << "Error: Dropshell is not configured. Please run 'dropshell edit' to configure it." << std::endl; error << "Dropshell is not configured. Please run 'dropshell edit' to configure it." << std::endl;
return 1; return 1;
} }

28
source/src/commands/list.cpp
View File

@ -63,7 +63,7 @@ int list_handler(const CommandContext& ctx) {
return 0; return 0;
} }
std::cout << "List handler called with " << ctx.args.size() << " args\n"; debug << "List handler called with " << ctx.args.size() << " args\n";
return 0; return 0;
} }
@ -74,16 +74,16 @@ void list_servers() {
auto servers = get_configured_servers(); auto servers = get_configured_servers();
if (servers.empty()) { if (servers.empty()) {
std::cout << "No servers found" << std::endl; error << "No servers found" << std::endl;
std::cout << "Please run 'dropshell edit' to set up dropshell." << std::endl; info << "Please run 'dropshell edit' to set up dropshell." << std::endl;
std::cout << "Then run 'dropshell create-server' to create a server." << std::endl; info << "Then run 'dropshell create-server' to create a server." << std::endl;
return; return;
} }
tableprint tp("All DropShell Servers"); tableprint tp("All DropShell Servers");
tp.add_row({"Name", "User", "Address", "Health", "Ports"}); tp.add_row({"Name", "User", "Address", "Health", "Ports"});
std::cout << "Checking "<<servers.size() << " servers: " << std::flush; info << "Checking "<<servers.size() << " servers: " << std::flush;
int checked = 0; int checked = 0;
transwarp::parallel exec{servers.size()}; transwarp::parallel exec{servers.size()};
@ -103,10 +103,10 @@ void list_servers() {
tp.add_row({server.name, server.ssh_user, server.ssh_host, serviceticks, ports_used_str}); tp.add_row({server.name, server.ssh_user, server.ssh_host, serviceticks, ports_used_str});
++checked; ++checked;
// print out a tick character for each server checked. // print out a tick character for each server checked.
std::cout << checked << " ✓ " << std::flush; info << checked << " ✓ " << std::flush;
}); });
task->wait(); task->wait();
std::cout << std::endl << std::endl; info << std::endl << std::endl;
tp.print(); tp.print();
} }
@ -116,7 +116,7 @@ void list_servers() {
void show_server_details(const std::string& server_name) { void show_server_details(const std::string& server_name) {
server_env_manager env(server_name); server_env_manager env(server_name);
if (!env.is_valid()) { if (!env.is_valid()) {
std::cerr << "Error: Invalid server environment file: " << server_name << std::endl; error << "Error: Invalid server environment file: " << server_name << std::endl;
return; return;
} }
@ -126,14 +126,14 @@ void show_server_details(const std::string& server_name) {
std::string ssh_user = env.get_SSH_USER(); std::string ssh_user = env.get_SSH_USER();
std::string ssh_port = env.get_SSH_PORT(); std::string ssh_port = env.get_SSH_PORT();
if (!ssh_address.empty()) { if (!ssh_address.empty()) {
std::cout << std::endl << "Server Status:" << std::endl; info << std::endl << "Server Status:" << std::endl;
std::cout << std::string(40, '-') << std::endl; info << std::string(40, '-') << std::endl;
// Try to connect to the server // Try to connect to the server
std::string cmd = "ssh -o ConnectTimeout=5 " + ssh_user + "@" + ssh_address + " -p " + ssh_port + " 'echo connected' 2>/dev/null"; std::string cmd = "ssh -o ConnectTimeout=5 " + ssh_user + "@" + ssh_address + " -p " + ssh_port + " 'true' 2>/dev/null";
int result = system(cmd.c_str()); int result = system(cmd.c_str());
if (result == 0) { if (result == 0) {
std::cout << "Status: Online" << std::endl; info << "Status: Online" << std::endl;
// // Get uptime if possible // // Get uptime if possible
// cmd = "ssh " + ssh_address + " 'uptime' 2>/dev/null"; // cmd = "ssh " + ssh_address + " 'uptime' 2>/dev/null";
@ -142,10 +142,10 @@ void show_server_details(const std::string& server_name) {
// std::cout << "Error: Failed to get uptime" << std::endl; // std::cout << "Error: Failed to get uptime" << std::endl;
// } // }
} else { } else {
std::cout << "Status: Offline" << std::endl; warning << "Status: Offline" << std::endl;
} }
} }
std::cout << std::endl; info << std::endl;
//--------------------- //---------------------
{ {

28
source/src/commands/nuke.cpp
View File

@ -57,7 +57,7 @@ int nuke_one(std::string server, std::string service)
service_info = get_service_info(server, service); service_info = get_service_info(server, service);
if (!SIvalid(service_info)) if (!SIvalid(service_info))
std::cerr << "Warning: Invalid service: " << service << std::endl; error << "Warning: Invalid service: " << service << std::endl;
if (server_env.check_remote_dir_exists(remotepath::service(server, service))) if (server_env.check_remote_dir_exists(remotepath::service(server, service)))
{ {
@ -65,47 +65,47 @@ int nuke_one(std::string server, std::string service)
// otherwise just uninstall. // otherwise just uninstall.
if (gTemplateManager().template_command_exists(service_info.template_name, "nuke")) if (gTemplateManager().template_command_exists(service_info.template_name, "nuke"))
{ {
std::cout << "Running nuke script for " << service << " on " << server << std::endl; info << "Running nuke script for " << service << " on " << server << std::endl;
if (!server_env.run_remote_template_command(service, "nuke", {}, false, {})) if (!server_env.run_remote_template_command(service, "nuke", {}, false, {}))
std::cerr << "Warning: Failed to run nuke script: " << service << std::endl; warning << "Failed to run nuke script: " << service << std::endl;
} }
else else
{ {
std::cout << "No nuke script found for " << service << " on " << server << std::endl; info << "No nuke script found for " << service << " on " << server << std::endl;
std::cout << "Running uninstall script instead and will clean directories." << std::endl; info << "Running uninstall script instead and will clean directories." << std::endl;
if (!server_env.run_remote_template_command(service, "uninstall", {}, false, {})) if (!server_env.run_remote_template_command(service, "uninstall", {}, false, {}))
std::cerr << "Warning: Failed to uninstall service: " << service << std::endl; warning << "Failed to uninstall service: " << service << std::endl;
} }
// Remove the service directory from the server, running in a docker container as root. // Remove the service directory from the server, running in a docker container as root.
if (server_env.remove_remote_dir(remotepath::service(server, service), true)) if (server_env.remove_remote_dir(remotepath::service(server, service), true))
{ {
ASSERT(!server_env.check_remote_dir_exists(remotepath::service(server, service)), "Service directory still found on server after uninstall"); ASSERT(!server_env.check_remote_dir_exists(remotepath::service(server, service)), "Service directory still found on server after uninstall");
std::cout << "Remote service directory removed: " << remotepath::service(server, service) << std::endl; info << "Remote service directory removed: " << remotepath::service(server, service) << std::endl;
} }
else else
std::cerr << "Warning: Failed to remove remote service directory" << std::endl; warning << "Failed to remove remote service directory" << std::endl;
} }
else else
std::cerr << "Warning: Service not found on remote server: " << remotepath::service(server, service) << std::endl; warning << "Service not found on remote server: " << remotepath::service(server, service) << std::endl;
} }
else else
std::cerr << "Warning: Can't nuke the remote service as the server is invalid: " << server << std::endl; warning << "Can't nuke the remote service as the server is invalid: " << server << std::endl;
// step 2 - nuke the local service directory. // step 2 - nuke the local service directory.
std::string local_service_path = localpath::service(server, service); std::string local_service_path = localpath::service(server, service);
if (local_service_path.empty() || !std::filesystem::exists(local_service_path)) if (local_service_path.empty() || !std::filesystem::exists(local_service_path))
{ {
std::cerr << "Warning: Local service directory not found: " << local_service_path << std::endl; warning << "Local service directory not found: " << local_service_path << std::endl;
} }
else else
{ {
auto itemsdeleted = std::filesystem::remove_all(local_service_path); auto itemsdeleted = std::filesystem::remove_all(local_service_path);
if (itemsdeleted == 0) if (itemsdeleted == 0)
std::cerr << "Error: Failed to remove local service directory" << std::endl; error << "Failed to remove local service directory" << std::endl;
} }
std::cout << "Nuked service " << service << " on server " << server << std::endl; info << "Nuked service " << service << " on server " << server << std::endl;
return 0; return 0;
} }
@ -126,7 +126,7 @@ int nuke_handler(const CommandContext &ctx)
std::string server_path = localpath::server(server); std::string server_path = localpath::server(server);
if (server_path.empty()) if (server_path.empty())
{ {
std::cerr << "Error: Server not found: " << server << std::endl; error << "Server not found: " << server << std::endl;
return 1; return 1;
} }

21
source/src/commands/shared_commands.cpp
View File

@ -5,6 +5,7 @@
#include "directories.hpp" #include "directories.hpp"
#include "services.hpp" #include "services.hpp"
#include "servers.hpp" #include "servers.hpp"
#include "utils/output.hpp"
namespace dropshell namespace dropshell
{ {
@ -23,7 +24,7 @@ namespace dropshell
std::vector<ServerInfo> servers = get_configured_servers(); std::vector<ServerInfo> servers = get_configured_servers();
for (const auto &server : servers) for (const auto &server : servers)
{ {
std::cout << server.name << std::endl; rawout << server.name << std::endl;
} }
} }
else if (ctx.args.size() == 1) else if (ctx.args.size() == 1)
@ -32,7 +33,7 @@ namespace dropshell
std::vector<LocalServiceInfo> services = get_server_services_info(ctx.args[0]); std::vector<LocalServiceInfo> services = get_server_services_info(ctx.args[0]);
for (const auto &service : services) for (const auto &service : services)
{ {
std::cout << service.service_name << std::endl; rawout << service.service_name << std::endl;
} }
} }
} }
@ -44,7 +45,7 @@ namespace dropshell
{ {
std_autocomplete(ctx); std_autocomplete(ctx);
if (ctx.args.size() == 1) if (ctx.args.size() == 1)
std::cout << "all" << std::endl; rawout << "all" << std::endl;
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
@ -62,7 +63,7 @@ namespace dropshell
quote(local_path + "/") + " " + quote(local_path + "/") + " " +
quote(server_env.get_SSH_USER() + "@" + server_env.get_SSH_HOST() + ":" + quote(server_env.get_SSH_USER() + "@" + server_env.get_SSH_HOST() + ":" +
remote_path + "/"); remote_path + "/");
return execute_local_command(rsync_cmd, nullptr, (silent ? cMode::Silent : cMode::Defaults)); return execute_local_command("", rsync_cmd, {}, nullptr, (silent ? cMode::Silent : cMode::Defaults));
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
@ -88,7 +89,7 @@ namespace dropshell
std::string p = remotepath::temp_files(server_env.get_server_name()) + "/" + random_alphanumeric_string(10); std::string p = remotepath::temp_files(server_env.get_server_name()) + "/" + random_alphanumeric_string(10);
std::string mkdir_cmd = "mkdir -p " + quote(p); std::string mkdir_cmd = "mkdir -p " + quote(p);
if (!execute_ssh_command(server_env.get_SSH_INFO(), sCommand("", mkdir_cmd, {}), cMode::Silent)) if (!execute_ssh_command(server_env.get_SSH_INFO(), sCommand("", mkdir_cmd, {}), cMode::Silent))
std::cerr << "Failed to create temp directory on server" << std::endl; error << "Failed to create temp directory on server" << std::endl;
else else
mPath = p; mPath = p;
} }
@ -114,12 +115,16 @@ namespace dropshell
server_env_manager env(server_name); server_env_manager env(server_name);
if (!env.is_valid()) if (!env.is_valid())
{ {
std::cerr << "Error: Invalid server environment" << std::endl; error << "Invalid server environment" << std::endl;
return status; return status;
} }
std::string output; std::string output;
if (!execute_ssh_command(env.get_SSH_INFO(), sCommand(remotepath::agent(server_name), "./_allservicesstatus.sh", {{"HOST_NAME", server_name}, {"SERVER", server_name}, {"AGENT_PATH", remotepath::agent(server_name)}}), cMode::CaptureOutput, &output)) if (!execute_ssh_command(env.get_SSH_INFO(), sCommand(remotepath::agent(server_name),
"./_allservicesstatus.sh",
{{"HOST_NAME", server_name}, {"SERVER", server_name}, {"AGENT_PATH", remotepath::agent(server_name)}}),
cMode::CaptureOutput | cMode::Silent,
&output))
return status; return status;
std::stringstream ss(output); std::stringstream ss(output);
@ -211,7 +216,7 @@ namespace dropshell
server_env_manager env(server); server_env_manager env(server);
if (!env.is_valid()) if (!env.is_valid())
{ {
std::cerr << "Error: Server service not initialized" << std::endl; error << "Server service not initialized" << std::endl;
return HealthStatus::ERROR; return HealthStatus::ERROR;
} }

12
source/src/commands/ssh.cpp
View File

@ -45,7 +45,7 @@ namespace dropshell
server_env_manager server_env(server); server_env_manager server_env(server);
if (!server_env.is_valid()) if (!server_env.is_valid())
{ {
std::cerr << "Error: Server " << server << " is not valid" << std::endl; error << "Server " << server << " is not valid" << std::endl;
return false; return false;
} }
execute_ssh_command(server_env.get_SSH_INFO(), sCommand(remotepath::DROPSHELL_DIR(server), "ls --color && bash", {}), cMode::Interactive); execute_ssh_command(server_env.get_SSH_INFO(), sCommand(remotepath::DROPSHELL_DIR(server), "ls --color && bash", {}), cMode::Interactive);
@ -57,26 +57,26 @@ namespace dropshell
server_env_manager server_env(server); server_env_manager server_env(server);
if (!server_env.is_valid()) if (!server_env.is_valid())
{ {
std::cerr << "Error: Server " << server << " is not valid" << std::endl; error << "Server " << server << " is not valid" << std::endl;
return false; return false;
} }
LocalServiceInfo sinfo = get_service_info(server, service); LocalServiceInfo sinfo = get_service_info(server, service);
if (!SIvalid(sinfo)) if (!SIvalid(sinfo))
{ {
std::cerr << "Error: Service " << service << " is not valid" << std::endl; error << "Service " << service << " is not valid" << std::endl;
return false; return false;
} }
if (!gTemplateManager().has_template(sinfo.template_name)) if (!gTemplateManager().has_template(sinfo.template_name))
{ {
std::cerr << "Error: Template " << sinfo.template_name << " is not valid" << std::endl; error << "Template " << sinfo.template_name << " is not valid" << std::endl;
return false; return false;
} }
if (!gTemplateManager().template_command_exists(sinfo.template_name, "ssh")) if (!gTemplateManager().template_command_exists(sinfo.template_name, "ssh"))
{ {
std::cerr << "Error: Template " << sinfo.template_name << " does not have an ssh command" << std::endl; error << "Template " << sinfo.template_name << " does not have an ssh command" << std::endl;
return false; return false;
} }
@ -88,7 +88,7 @@ namespace dropshell
{ {
if (ctx.args.size() < 1) if (ctx.args.size() < 1)
{ {
std::cerr << "Error: Server name is required" << std::endl; error << "Server name is required" << std::endl;
return 1; return 1;
} }

7
source/src/commands/start.cpp
View File

@ -6,6 +6,7 @@
#include "server_env_manager.hpp" #include "server_env_manager.hpp"
#include "services.hpp" #include "services.hpp"
#include "servers.hpp" #include "servers.hpp"
#include "utils/output.hpp"
namespace dropshell namespace dropshell
{ {
@ -46,7 +47,7 @@ namespace dropshell
server_env_manager server_env(server); server_env_manager server_env(server);
if (!server_env.is_valid()) if (!server_env.is_valid())
{ {
std::cerr << "Error: Server " << server << " is not valid" << std::endl; error << "Server " << server << " is not valid" << std::endl;
return false; return false;
} }
@ -55,10 +56,10 @@ namespace dropshell
if (started) if (started)
{ {
std::cout << "Service " << service << " on server " << server << " started." << std::endl; info << "Service " << service << " on server " << server << " started." << std::endl;
return true; return true;
} }
std::cerr << "Error: Failed to start service " << service << " on server " << server << std::endl; error << "Failed to start service " << service << " on server " << server << std::endl;
return false; return false;
} }

9
source/src/commands/stop.cpp
View File

@ -6,6 +6,7 @@
#include "server_env_manager.hpp" #include "server_env_manager.hpp"
#include "services.hpp" #include "services.hpp"
#include "servers.hpp" #include "servers.hpp"
#include "utils/output.hpp"
namespace dropshell namespace dropshell
{ {
@ -46,7 +47,7 @@ namespace dropshell
server_env_manager server_env(server); server_env_manager server_env(server);
if (!server_env.is_valid()) if (!server_env.is_valid())
{ {
std::cerr << "Error: Server " << server << " is not valid" << std::endl; error << "Server " << server << " is not valid" << std::endl;
return false; return false;
} }
@ -55,10 +56,10 @@ namespace dropshell
if (stopped) if (stopped)
{ {
std::cout << "Service " << service << " on server " << server << " stopped." << std::endl; info << "Service " << service << " on server " << server << " stopped." << std::endl;
return true; return true;
} }
std::cerr << "Error: Failed to stop service " << service << " on server " << server << std::endl; error << "Failed to stop service " << service << " on server " << server << std::endl;
return false; return false;
} }
@ -66,7 +67,7 @@ namespace dropshell
{ {
if (ctx.args.size() < 2) if (ctx.args.size() < 2)
{ {
std::cerr << "Error: Server name and service name are both required" << std::endl; error << "Server name and service name are both required" << std::endl;
return 1; return 1;
} }

14
source/src/commands/uninstall.cpp
View File

@ -49,14 +49,14 @@ namespace dropshell
server_env_manager server_env(server); server_env_manager server_env(server);
if (!server_env.is_valid()) if (!server_env.is_valid())
{ {
std::cerr << "Invalid server: " << server << std::endl; error << "Invalid server: " << server << std::endl;
return false; // should never hit this. return false; // should never hit this.
} }
// 2. Check if service directory exists on server // 2. Check if service directory exists on server
if (!server_env.check_remote_dir_exists(remotepath::service(server, service))) if (!server_env.check_remote_dir_exists(remotepath::service(server, service)))
{ {
std::cerr << "Service is not installed: " << service << std::endl; error << "Service is not installed: " << service << std::endl;
return true; // Nothing to uninstall return true; // Nothing to uninstall
} }
@ -64,20 +64,20 @@ namespace dropshell
std::string uninstall_script = remotepath::service_template(server, service) + "/uninstall.sh"; std::string uninstall_script = remotepath::service_template(server, service) + "/uninstall.sh";
if (!server_env.run_remote_template_command(service, "uninstall", {}, silent, {})) if (!server_env.run_remote_template_command(service, "uninstall", {}, silent, {}))
if (!silent) if (!silent)
std::cerr << "Warning: Uninstall script failed, but continuing with directory removal" << std::endl; warning << "Uninstall script failed, but continuing with directory removal" << std::endl;
// 4. Remove the service directory from the server, running in a docker container as root. // 4. Remove the service directory from the server, running in a docker container as root.
if (server_env.remove_remote_dir(remotepath::service(server, service), silent)) if (server_env.remove_remote_dir(remotepath::service(server, service), silent))
{ {
ASSERT(!server_env.check_remote_dir_exists(remotepath::service(server, service)), "Service directory still found on server after uninstall"); ASSERT(!server_env.check_remote_dir_exists(remotepath::service(server, service)), "Service directory still found on server after uninstall");
if (!silent) if (!silent)
std::cout << "Removed remote service directory " << remotepath::service(server, service) << std::endl; info << "Removed remote service directory " << remotepath::service(server, service) << std::endl;
} }
else if (!silent) else if (!silent)
std::cerr << "Warning: Failed to remove remote service directory" << std::endl; warning << "Failed to remove remote service directory" << std::endl;
if (!silent) if (!silent)
std::cout << "Completed service " << service << " uninstall on " << server << std::endl; info << "Completed service " << service << " uninstall on " << server << std::endl;
return true; return true;
} }
@ -85,7 +85,7 @@ namespace dropshell
{ {
if (ctx.args.size() < 1) if (ctx.args.size() < 1)
{ {
std::cerr << "Error: uninstall requires a server and a service (or all)" << std::endl; error << "uninstall requires a server and a service (or all)" << std::endl;
return 1; return 1;
} }

41
source/src/main.cpp
View File

@ -50,33 +50,33 @@ int main(int argc, char* argv[]) {
return 0; return 0;
} }
const CommandInfo* info = CommandRegistry::instance().find_command(ctx.command); const CommandInfo* cmdinfo = CommandRegistry::instance().find_command(ctx.command);
if (!info) { if (!cmdinfo) {
std::cerr << "Unknown command: " << ctx.command << std::endl; error << "Unknown command: " << ctx.command << std::endl;
return 1; return 1;
} }
if (info->requires_config && !gConfig().is_config_set()) { if (cmdinfo->requires_config && !gConfig().is_config_set()) {
std::cerr << "Valid dropshell configuration required for command: " << ctx.command << std::endl; error << "Valid dropshell configuration required for command: " << ctx.command << std::endl;
std::cerr << "Please run 'dropshell edit' to set up the dropshell configuration." << std::endl; info << "Please run 'dropshell edit' to set up the dropshell configuration." << std::endl;
return 1; return 1;
} }
if (info->requires_install && !gConfig().is_agent_installed()) { if (cmdinfo->requires_install && !gConfig().is_agent_installed()) {
std::cerr << "Dropshell agent not installed for command: " << ctx.command << std::endl; error << "Dropshell agent not installed for command: " << ctx.command << std::endl;
std::cerr << "Please run 'dropshell install' to install the local dropshell agent." << std::endl; info << "Please run 'dropshell install' to install the local dropshell agent." << std::endl;
return 1; return 1;
} }
int arg_count = ctx.args.size(); int arg_count = ctx.args.size();
if (arg_count < info->min_args || (info->max_args != -1 && arg_count > info->max_args)) { if (arg_count < cmdinfo->min_args || (cmdinfo->max_args != -1 && arg_count > cmdinfo->max_args)) {
std::cerr << "Invalid number of arguments for command: " << ctx.command << std::endl; error << "Invalid number of arguments for command: " << ctx.command << std::endl;
std::cerr << "(" << ctx.args.size() << " args provided, " << ctx.command << " requires " << (info->min_args) << " to " << (info->max_args) << " args)" << std::endl; debug << "(" << ctx.args.size() << " args provided, " << ctx.command << " requires " << (cmdinfo->min_args) << " to " << (cmdinfo->max_args) << " args)" << std::endl;
std::cerr << "Usage: " << std::endl; info << "Usage: " << std::endl;
std::cerr << " "; info << " ";
print_left_aligned(info->help_usage,30); info << left_align(cmdinfo->help_usage,30);
std::cout << info->help_description << std::endl; info << cmdinfo->help_description << std::endl;
return 1; return 1;
} }
return info->handler(ctx); return cmdinfo->handler(ctx);
} }
catch (const std::exception& e) { catch (const std::exception& e) {
@ -116,13 +116,6 @@ bool getCLIServices(const std::string & arg2, const std::string & arg3,
return true; return true;
} }
void printversion() {
maketitle("DropShell version " + VERSION);
std::cout << "Release date: " << RELEASE_DATE << std::endl;
std::cout << "Author: " << AUTHOR << std::endl;
std::cout << "License: " << LICENSE << std::endl;
}
auto command_match = [](const std::string& cmd_list, int argc, char* argv[]) -> bool { auto command_match = [](const std::string& cmd_list, int argc, char* argv[]) -> bool {
std::istringstream iss(cmd_list); std::istringstream iss(cmd_list);
std::string cmd_item; std::string cmd_item;

6
source/src/service_runner.cpp
View File

@ -147,7 +147,7 @@ bool service_runner::fullnuke()
} }
std::string rm_cmd = "rm -rf " + quote(local_service_path); std::string rm_cmd = "rm -rf " + quote(local_service_path);
if (!execute_local_command(rm_cmd, nullptr, cMode::Silent)) { if (!execute_local_command("", rm_cmd, {}, nullptr, cMode::Silent)) {
std::cerr << "Failed to remove service directory" << std::endl; std::cerr << "Failed to remove service directory" << std::endl;
return false; return false;
} }
@ -267,13 +267,13 @@ bool service_runner::interactive_ssh_service()
bool service_runner::scp_file_to_remote(const std::string &local_path, const std::string &remote_path, bool silent) bool service_runner::scp_file_to_remote(const std::string &local_path, const std::string &remote_path, bool silent)
{ {
std::string scp_cmd = "scp -P " + mServerEnv.get_SSH_PORT() + " " + quote(local_path) + " " + mServerEnv.get_SSH_USER() + "@" + mServerEnv.get_SSH_HOST() + ":" + quote(remote_path) + (silent ? " > /dev/null 2>&1" : ""); std::string scp_cmd = "scp -P " + mServerEnv.get_SSH_PORT() + " " + quote(local_path) + " " + mServerEnv.get_SSH_USER() + "@" + mServerEnv.get_SSH_HOST() + ":" + quote(remote_path) + (silent ? " > /dev/null 2>&1" : "");
return execute_local_command(scp_cmd, nullptr, (silent ? cMode::Silent : cMode::Defaults)); return execute_local_command("", scp_cmd, {}, nullptr, (silent ? cMode::Silent : cMode::Defaults));
} }
bool service_runner::scp_file_from_remote(const std::string &remote_path, const std::string &local_path, bool silent) bool service_runner::scp_file_from_remote(const std::string &remote_path, const std::string &local_path, bool silent)
{ {
std::string scp_cmd = "scp -P " + mServerEnv.get_SSH_PORT() + " " + mServerEnv.get_SSH_USER() + "@" + mServerEnv.get_SSH_HOST() + ":" + quote(remote_path) + " " + quote(local_path) + (silent ? " > /dev/null 2>&1" : ""); std::string scp_cmd = "scp -P " + mServerEnv.get_SSH_PORT() + " " + mServerEnv.get_SSH_USER() + "@" + mServerEnv.get_SSH_HOST() + ":" + quote(remote_path) + " " + quote(local_path) + (silent ? " > /dev/null 2>&1" : "");
return execute_local_command(scp_cmd, nullptr, (silent ? cMode::Silent : cMode::Defaults)); return execute_local_command("", scp_cmd, {}, nullptr, (silent ? cMode::Silent : cMode::Defaults));
} }
bool service_runner::restore(std::string backup_file, bool silent) bool service_runner::restore(std::string backup_file, bool silent)

1
source/src/services.cpp
View File

@ -176,6 +176,7 @@ bool get_all_service_env_vars(const std::string &server_name, const std::string
all_env_vars["SERVICE"] = service_name; all_env_vars["SERVICE"] = service_name;
all_env_vars["AGENT_PATH"] = remotepath::agent(server_name); all_env_vars["AGENT_PATH"] = remotepath::agent(server_name);
all_env_vars["HOST_NAME"] = server_info.ssh_host; all_env_vars["HOST_NAME"] = server_info.ssh_host;
all_env_vars["DOCKER_CLI_HINTS"] = "false"; // turn off docker junk.
// Lambda function to load environment variables from a file // Lambda function to load environment variables from a file
auto load_env_file = [&all_env_vars](const std::string& file) { auto load_env_file = [&all_env_vars](const std::string& file) {

3
source/src/utils/assert.hpp
View File

@ -1,10 +1,11 @@
#ifndef ASSERT_HPP #ifndef ASSERT_HPP
#define ASSERT_HPP #define ASSERT_HPP
#include "output.hpp"
#define ASSERT(condition, message) \ #define ASSERT(condition, message) \
if (!(condition)) { \ if (!(condition)) { \
std::cerr << "Assertion failed: " << message << std::endl; \ dropshell::error << "Assertion failed: " << message << std::endl; \
std::exit(1); \ std::exit(1); \
} }

110
source/src/utils/execute.cpp
View File

@ -56,36 +56,59 @@ namespace dropshell
} }
} }
// ----------------------------------------------------------------------------------------------------------
// execute_local_command_and_capture_output
// ----------------------------------------------------------------------------------------------------------
bool execute_local_command_and_capture_output(const sCommand &command, std::string *output)
{
ASSERT(output != nullptr, "Output string must be provided");
if (command.get_command_to_run().empty())
return false;
std::string full_cmd = command.construct_cmd(localpath::agent()) + " 2>&1";
FILE *pipe = popen(full_cmd.c_str(), "r");
if (!pipe)
{
return false;
}
char buffer[128];
while (fgets(buffer, sizeof(buffer), pipe) != nullptr)
{
(*output) += buffer;
}
int ret = pclose(pipe);
return EXITSTATUSCHECK(ret);
}
// ---------------------------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------------------------
// execute_local_command // execute_local_command
// ---------------------------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------------------------
bool execute_local_command(std::string command, std::string *output, cMode mode)
class fancypinter
{ {
return execute_local_command("", command, {}, output, mode); public:
} fancypinter(sColour startColour) : startColour_(startColour), currentColour_(startColour) {}
void print_chunk(std::string chunk)
{
if (chunk.empty())
return;
if (newline_)
{
// sniff the mode... if the string starts with warning or warning: then set mode to WARNING. etc.
if (chunk.find("warning") == 0)
currentColour_ = sColour::WARNING;
else if (chunk.find("error") == 0)
currentColour_ = sColour::ERROR;
else if (chunk.find("debug") == 0)
currentColour_ = sColour::DEBUG;
else if (chunk.find("info") == 0)
currentColour_ = sColour::INFO;
else
currentColour_ = startColour_;
}
colourstream(currentColour_) << chunk;
newline_ = (chunk[chunk.size()-1] == '\n');
}
void print(const std::string& buffer) {
size_t start = 0;
while (start < buffer.size()) {
size_t newline_pos = buffer.find('\n', start);
if (newline_pos == std::string::npos) {
if (start < buffer.size()) {
print_chunk(buffer.substr(start));
}
break;
}
print_chunk(buffer.substr(start, newline_pos - start + 1)); // include the newline
start = newline_pos + 1;
}
}
private:
bool newline_ = true;
sColour startColour_;
sColour currentColour_;
};
bool execute_local_command(std::string directory_to_run_in, std::string command_to_run, const std::map<std::string, std::string> &env_vars, std::string *output, cMode mode) bool execute_local_command(std::string directory_to_run_in, std::string command_to_run, const std::map<std::string, std::string> &env_vars, std::string *output, cMode mode)
{ {
@ -99,32 +122,31 @@ namespace dropshell
return execute_local_command_interactive(command); return execute_local_command_interactive(command);
} }
if (hasFlag(mode, cMode::CaptureOutput))
{
ASSERT(output != nullptr, "Capture output mode requires an output string to be provided");
ASSERT(!hasFlag(mode, cMode::Silent), "Silent mode is not allowed with capture output mode");
return execute_local_command_and_capture_output(command, output);
}
if (command.get_command_to_run().empty()) if (command.get_command_to_run().empty())
return false; return false;
bool silent = hasFlag(mode, cMode::Silent); bool silent = hasFlag(mode, cMode::Silent);
std::string full_cmd = command.construct_cmd(localpath::agent()) + " 2>&1" + (silent ? " > /dev/null" : "");
int ret=0; std::string full_cmd = command.construct_cmd(localpath::agent()) + (hasFlag(mode, cMode::CaptureOutput) ? " 2>&1" : ""); // capture both stdout and stderr
{
SwitchColour sc(sColour::DEBUG, std::cerr);
ret = system(full_cmd.c_str());
}
bool ok = EXITSTATUSCHECK(ret); FILE *pipe = popen(full_cmd.c_str(), "r");
if (!ok && !silent) if (!pipe)
{ {
PrintError("Error: Failed to execute command: "); return false;
PrintError(full_cmd);
} }
return ok; char buffer[128];
fancypinter fancyprint(sColour::DEBUG);
while (fgets(buffer, sizeof(buffer), pipe) != nullptr)
{
if (output != nullptr)
(*output) += buffer;
if (!silent)
fancyprint.print(buffer);
}
int ret = pclose(pipe);
return EXITSTATUSCHECK(ret);
} }
// ---------------------------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------------------------

1
source/src/utils/execute.hpp
View File

@ -31,7 +31,6 @@ typedef struct sSSHInfo {
std::string server_ID; // dropshell name for server. std::string server_ID; // dropshell name for server.
} sSSHInfo; } sSSHInfo;
bool execute_local_command(std::string command, std::string * output = nullptr, cMode mode = cMode::Defaults);
bool execute_local_command(std::string directory_to_run_in, std::string command_to_run, const std::map<std::string, std::string> & env_vars, std::string * output = nullptr, cMode mode = cMode::Defaults); bool execute_local_command(std::string directory_to_run_in, std::string command_to_run, const std::map<std::string, std::string> & env_vars, std::string * output = nullptr, cMode mode = cMode::Defaults);
bool execute_ssh_command(const sSSHInfo & ssh_info, const sCommand & remote_command, cMode mode = cMode::Defaults, std::string * output = nullptr); bool execute_ssh_command(const sSSHInfo & ssh_info, const sCommand & remote_command, cMode mode = cMode::Defaults, std::string * output = nullptr);

120
source/src/utils/output.cpp
View File

@ -2,56 +2,64 @@
#include <iostream> #include <iostream>
#include <mutex> #include <mutex>
namespace { namespace dropshell
{
// Mutex to synchronize output // Mutex to synchronize output
std::mutex output_mutex; std::mutex output_mutex;
// ANSI colour codes // ANSI colour codes
constexpr const char* GREY = "\033[90m"; constexpr const char *GREY = "\033[90m";
constexpr const char* RESET = "\033[0m"; constexpr const char *RESET = "\033[0m";
constexpr const char* DEBUG_COLOUR = "\033[36m"; // Cyan constexpr const char *DEBUG_COLOUR = "\033[36m"; // Cyan
constexpr const char* INFO_COLOUR = "\033[32m"; // Green // constexpr const char *INFO_COLOUR = "\033[32m"; // Green
constexpr const char* WARNING_COLOUR = "\033[33m"; // Yellow constexpr const char *INFO_COLOUR = "\033[37m"; // White
constexpr const char* ERROR_COLOUR = "\033[31m"; // Red constexpr const char *WARNING_COLOUR = "\033[33m"; // Yellow
constexpr const char *ERROR_COLOUR = "\033[31m"; // Red
// Tag and colour for each stream // Tag and colour for each stream
struct StreamInfo { struct StreamInfo
const char* tag; {
const char* colour; const char *tag;
const char *colour;
}; };
const StreamInfo stream_infos[] = { const StreamInfo stream_infos[] = {
{"[DBG]", DEBUG_COLOUR}, {"[DBG]", DEBUG_COLOUR},
{"[INF]", INFO_COLOUR}, {"[INF]", INFO_COLOUR},
{"[WRN]", WARNING_COLOUR}, {"[WRN]", WARNING_COLOUR},
{"[ERR]", ERROR_COLOUR} {"[ERR]", ERROR_COLOUR}};
};
// Custom streambuf to prefix and colour each line // Custom streambuf to prefix and colour each line
class PrefixStreambuf : public std::streambuf { class PrefixStreambuf : public std::streambuf
{
public: public:
PrefixStreambuf(std::ostream& dest, const char* tag, const char* colour) PrefixStreambuf(std::ostream &dest, const char *tag, const char *colour)
: dest_(dest), tag_(tag), colour_(colour), at_line_start_(true) {} : dest_(dest), tag_(tag), colour_(colour), at_line_start_(true) {}
protected: protected:
int overflow(int c) override { int overflow(int c) override
{
std::lock_guard<std::mutex> lock(output_mutex); std::lock_guard<std::mutex> lock(output_mutex);
if (c == EOF) return !EOF; if (c == EOF)
if (at_line_start_ && c != '\n') { return !EOF;
if (at_line_start_ && c != '\n')
{
dest_ << GREY << tag_ << RESET << ' ' << colour_; dest_ << GREY << tag_ << RESET << ' ' << colour_;
at_line_start_ = false; at_line_start_ = false;
} }
dest_.put(static_cast<char>(c)); dest_.put(static_cast<char>(c));
if (c == '\n') { if (c == '\n')
{
dest_ << RESET; dest_ << RESET;
at_line_start_ = true; at_line_start_ = true;
} }
return c; return c;
} }
private: private:
std::ostream& dest_; std::ostream &dest_;
const char* tag_; const char *tag_;
const char* colour_; const char *colour_;
bool at_line_start_; bool at_line_start_;
}; };
@ -64,15 +72,36 @@ namespace {
std::ostream info_stream(&info_buf); std::ostream info_stream(&info_buf);
std::ostream warning_stream(&warning_buf); std::ostream warning_stream(&warning_buf);
std::ostream error_stream(&error_buf); std::ostream error_stream(&error_buf);
}
std::ostream& debug = debug_stream; std::ostream &debug = debug_stream;
std::ostream& info = info_stream; std::ostream &info = info_stream;
std::ostream& warning = warning_stream; std::ostream &warning = warning_stream;
std::ostream& error = error_stream; std::ostream &error = error_stream;
void SetColour(sColour colour, std::ostream& os) { std::ostream &rawout = std::cout;
switch (colour) { std::ostream &rawerr = std::cerr;
std::ostream &colourstream(sColour colour)
{
switch (colour)
{
case sColour::DEBUG:
return debug_stream;
case sColour::INFO:
return info_stream;
case sColour::WARNING:
return warning_stream;
case sColour::ERROR:
return error_stream;
default:
return info_stream;
}
}
void SetColour(sColour colour, std::ostream &os)
{
switch (colour)
{
case sColour::RESET: case sColour::RESET:
os << RESET; os << RESET;
break; break;
@ -88,32 +117,17 @@ void SetColour(sColour colour, std::ostream& os) {
case sColour::ERROR: case sColour::ERROR:
os << ERROR_COLOUR; os << ERROR_COLOUR;
break; break;
}
} }
}
void PrintDebug(const std::string& msg) { SwitchColour::SwitchColour(sColour colour, std::ostream &os) : os_(os), colour_(colour)
std::lock_guard<std::mutex> lock(output_mutex); {
debug << msg << '\n'; SetColour(colour_, os_);
} }
void PrintInfo(const std::string& msg) {
std::lock_guard<std::mutex> lock(output_mutex);
info << msg << '\n';
}
void PrintWarning(const std::string& msg) {
std::lock_guard<std::mutex> lock(output_mutex);
warning << msg << '\n';
}
void PrintError(const std::string& msg) {
std::lock_guard<std::mutex> lock(output_mutex);
error << msg << '\n';
}
SwitchColour::SwitchColour(sColour colour, std::ostream& os) : os_(os), colour_(colour) SwitchColour::~SwitchColour()
{ {
SetColour(colour_, os_); SetColour(sColour::RESET, os_);
} }
SwitchColour::~SwitchColour() } // namespace dropshell
{
SetColour(sColour::RESET, os_);
}

15
source/src/utils/output.hpp
View File

@ -6,6 +6,8 @@
#include <vector> #include <vector>
#include <ostream> #include <ostream>
namespace dropshell {
/* /*
output.hpp and output.cpp - simple output helpers. output.hpp and output.cpp - simple output helpers.
@ -54,6 +56,9 @@ extern std::ostream& info;
extern std::ostream& warning; extern std::ostream& warning;
extern std::ostream& error; extern std::ostream& error;
extern std::ostream& rawout;
extern std::ostream& rawerr;
// Enum for colours // Enum for colours
enum class sColour { enum class sColour {
RESET, RESET,
@ -62,16 +67,11 @@ enum class sColour {
WARNING, WARNING,
ERROR ERROR
}; };
std::ostream& colourstream(sColour colour);
// Set colour for a stream // Set colour for a stream
void SetColour(sColour colour, std::ostream& os = std::cerr); void SetColour(sColour colour, std::ostream& os = std::cerr);
// Helper print functions
void PrintDebug(const std::string& msg);
void PrintInfo(const std::string& msg);
void PrintWarning(const std::string& msg);
void PrintError(const std::string& msg);
class SwitchColour class SwitchColour
{ {
public: public:
@ -81,4 +81,7 @@ class SwitchColour
std::ostream& os_; std::ostream& os_;
sColour colour_; sColour colour_;
}; };
} // namespace dropshell
#endif // OUTPUT_HPP #endif // OUTPUT_HPP

99
source/src/utils/tableprint.cpp
View File

@ -9,6 +9,8 @@
#include <iostream> #include <iostream>
#include <map> #include <map>
#include "output.hpp"
enum kTextColors { enum kTextColors {
kTextColor_Default, kTextColor_Default,
kTextColor_Red, kTextColor_Red,
@ -32,7 +34,7 @@ const std::map<std::string, coloredText> kReplacements = {
{":tick:", {"+", kTextColor_Green}}, {":tick:", {"+", kTextColor_Green}},
{":cross:", {"x", kTextColor_Red}}, {":cross:", {"x", kTextColor_Red}},
{":warning:", {"!", kTextColor_Yellow}}, {":warning:", {"!", kTextColor_Yellow}},
{":info:", {"i", kTextColor_Blue}}, {":dropshell::info:", {"i", kTextColor_Blue}},
{":check:", {"+", kTextColor_Green}}, {":check:", {"+", kTextColor_Green}},
{":x:", {"x", kTextColor_Red}}, {":x:", {"x", kTextColor_Red}},
{":error:", {"!", kTextColor_Red}}, {":error:", {"!", kTextColor_Red}},
@ -115,12 +117,12 @@ std::string width_print_centered(std::string str,int width, std::string rowcolor
oss << rowcolor << std::string(lpad, ' ') << process_cell(str, rowcolor) << oss << rowcolor << std::string(lpad, ' ') << process_cell(str, rowcolor) <<
std::string(rpad, ' ') << "\033[0m"; std::string(rpad, ' ') << "\033[0m";
// std::cout << "str = "<<str <<std::endl; // dropshell::info << "str = "<<str <<std::endl;
// std::cout << "width = "<<width <<std::endl; // dropshell::info << "width = "<<width <<std::endl;
// std::cout << "padding = "<<padding <<std::endl; // dropshell::info << "padding = "<<padding <<std::endl;
// std::cout << "get_visible_length(str) = "<<get_visible_length(str) <<std::endl; // dropshell::info << "get_visible_length(str) = "<<get_visible_length(str) <<std::endl;
// std::cout << "get_codepoints(str) = "<<get_codepoints(str) <<std::endl; // dropshell::info << "get_codepoints(str) = "<<get_codepoints(str) <<std::endl;
// std::cout << "oss.str() = ["<<oss.str() <<"]"<<std::endl; // dropshell::info << "oss.str() = ["<<oss.str() <<"]"<<std::endl;
return oss.str(); return oss.str();
} }
@ -195,98 +197,105 @@ void tableprint::print() {
// Print title if it exists // Print title if it exists
if (!title.empty()) { if (!title.empty()) {
std::cout << "\033[90m"; // Dark grey color for borders dropshell::info << "\033[90m"; // Dark grey color for borders
std::cout << "+"; dropshell::info << "+";
for (size_t i = 0; i < rows[0].size(); ++i) { for (size_t i = 0; i < rows[0].size(); ++i) {
std::cout << std::string(col_widths[i] + 2, '-'); dropshell::info << std::string(col_widths[i] + 2, '-');
if (i < rows[0].size() - 1) std::cout << "-"; if (i < rows[0].size() - 1) dropshell::info << "-";
} }
std::cout << "+" << std::endl; dropshell::info << "+" << std::endl;
std::cout << "|"; // White color for title dropshell::info << "\033[90m"; // Dark grey color for borders
dropshell::info << "|"; // White color for title
size_t title_width = 0; size_t title_width = 0;
for (size_t width : col_widths) { for (size_t width : col_widths) {
title_width += width + 2; // +2 for padding title_width += width + 2; // +2 for padding
} }
title_width += col_widths.size() - 1; // Add space for vertical borders title_width += col_widths.size() - 1; // Add space for vertical borders
std::cout << width_print_centered(title,title_width,"\033[1;37m"); dropshell::info << width_print_centered(title,title_width,"\033[1;37m");
std::cout << "\033[90m|" << std::endl; dropshell::info << "\033[90m|" << std::endl;
// Use └─┴─┘ for bottom of title box to connect with table // Use └─┴─┘ for bottom of title box to connect with table
std::cout << "+"; dropshell::info << "\033[90m"; // Dark grey color for borders
dropshell::info << "+";
for (size_t i = 0; i < rows[0].size(); ++i) { for (size_t i = 0; i < rows[0].size(); ++i) {
std::cout << std::string(col_widths[i] + 2, '-'); dropshell::info << std::string(col_widths[i] + 2, '-');
if (i < rows[0].size() - 1) std::cout << "-"; if (i < rows[0].size() - 1) dropshell::info << "-";
} }
std::cout << "+" << std::endl; dropshell::info << "+" << std::endl;
} else { } else {
// Print top border if no title // Print top border if no title
std::cout << "\033[90m"; // Dark grey color for borders dropshell::info << "\033[90m"; // Dark grey color for borders
std::cout << "+"; dropshell::info << "+";
for (size_t i = 0; i < rows[0].size(); ++i) { for (size_t i = 0; i < rows[0].size(); ++i) {
std::cout << std::string(col_widths[i] + 2, '-'); dropshell::info << std::string(col_widths[i] + 2, '-');
if (i < rows[0].size() - 1) std::cout << "+"; if (i < rows[0].size() - 1) dropshell::info << "+";
} }
std::cout << "+" << std::endl; dropshell::info << "+" << std::endl;
} }
// Print header // Print header
std::cout << "|"; dropshell::info << "\033[90m"; // Dark grey color for borders
dropshell::info << "|";
for (size_t i = 0; i < rows[0].size(); ++i) { for (size_t i = 0; i < rows[0].size(); ++i) {
std::cout << width_print_centered(rows[0][i],col_widths[i]+2,"\033[1;36m"); dropshell::info << width_print_centered(rows[0][i],col_widths[i]+2,"\033[1;36m");
if (i < rows[0].size() - 1) { if (i < rows[0].size() - 1) {
std::cout << "\033[90m|\033[1;36m"; // Border color then back to cyan dropshell::info << "\033[90m|\033[1;36m"; // Border color then back to cyan
} else { } else {
std::cout << "\033[90m|"; // Just border color for last column dropshell::info << "\033[90m|"; // Just border color for last column
} }
} }
std::cout << std::endl; dropshell::info << std::endl;
// Print header separator // Print header separator
if (!mCompact) { if (!mCompact) {
std::cout << "+"; dropshell::info << "\033[90m"; // Dark grey color for borders
dropshell::info << "+";
for (size_t i = 0; i < rows[0].size(); ++i) { for (size_t i = 0; i < rows[0].size(); ++i) {
for (size_t j = 0; j < col_widths[i] + 2; ++j) { for (size_t j = 0; j < col_widths[i] + 2; ++j) {
std::cout << "-"; dropshell::info << "-";
} }
if (i < rows[0].size() - 1) std::cout << "+"; if (i < rows[0].size() - 1) dropshell::info << "+";
} }
std::cout << "+" << std::endl; dropshell::info << "+" << std::endl;
} }
// Print rows // Print rows
for (size_t row_idx = 1; row_idx < rows.size(); ++row_idx) { for (size_t row_idx = 1; row_idx < rows.size(); ++row_idx) {
const auto& row = rows[row_idx]; const auto& row = rows[row_idx];
std::cout << "|"; dropshell::info << "\033[90m"; // Dark grey color for borders
dropshell::info << "|";
for (size_t i = 0; i < row.size(); ++i) { for (size_t i = 0; i < row.size(); ++i) {
// Set the appropriate color for the row // Set the appropriate color for the row
std::string rowcolor = (row_idx % 2 == 1) ? "\033[38;5;142m" : "\033[38;5;250m"; std::string rowcolor = (row_idx % 2 == 1) ? "\033[38;5;142m" : "\033[38;5;250m";
std::cout << width_print_left(row[i],col_widths[i]+2,rowcolor); dropshell::info << width_print_left(row[i],col_widths[i]+2,rowcolor);
std::cout << "\033[90m" << "|"; dropshell::info << "\033[90m" << "|";
} }
std::cout << std::endl; dropshell::info << std::endl;
// Print row separator if not the last row // Print row separator if not the last row
if (row_idx < rows.size() - 1 && !mCompact) { if (row_idx < rows.size() - 1 && !mCompact) {
std::cout << "+"; dropshell::info << "\033[90m"; // Dark grey color for borders
dropshell::info << "+";
for (size_t i = 0; i < rows[0].size(); ++i) { for (size_t i = 0; i < rows[0].size(); ++i) {
for (size_t j = 0; j < col_widths[i] + 2; ++j) { for (size_t j = 0; j < col_widths[i] + 2; ++j) {
std::cout << "-"; dropshell::info << "-";
} }
if (i < rows[0].size() - 1) std::cout << "+"; if (i < rows[0].size() - 1) dropshell::info << "+";
} }
std::cout << "+" << std::endl; dropshell::info << "+" << std::endl;
} }
} }
// Print bottom border // Print bottom border
std::cout << "+"; dropshell::info << "\033[90m"; // Dark grey color for borders
dropshell::info << "+";
for (size_t i = 0; i < rows[0].size(); ++i) { for (size_t i = 0; i < rows[0].size(); ++i) {
for (size_t j = 0; j < col_widths[i] + 2; ++j) { for (size_t j = 0; j < col_widths[i] + 2; ++j) {
std::cout << "-"; dropshell::info << "-";
} }
if (i < rows[0].size() - 1) std::cout << "+"; if (i < rows[0].size() - 1) dropshell::info << "+";
} }
std::cout << "+" << "\033[0m" << std::endl; // Reset color dropshell::info << "+" << "\033[0m" << std::endl; // Reset color
} }

22
source/src/utils/utils.cpp
View File

@ -10,10 +10,10 @@
namespace dropshell { namespace dropshell {
void maketitle(const std::string& title) { void maketitle(const std::string& title, sColour colour) {
std::cout << std::string(title.length() + 4, '-') << std::endl; colourstream(colour) << std::string(title.length() + 4, '-') << std::endl;
std::cout << "| " << title << " |" << std::endl; colourstream(colour) << "| " << title << " |" << std::endl;
std::cout << std::string(title.length() + 4, '-') << std::endl; colourstream(colour) << std::string(title.length() + 4, '-') << std::endl;
} }
bool replace_line_in_file(const std::string& file_path, const std::string& search_string, const std::string& replacement_line) { bool replace_line_in_file(const std::string& file_path, const std::string& search_string, const std::string& replacement_line) {
@ -334,20 +334,6 @@ std::string safearg(int argc, char *argv[], int index)
return argv[index]; return argv[index];
} }
void print_left_aligned(const std::string & str, int width) {
std::cout << left_align(str, width);
}
void print_centered(const std::string & str, int width) {
std::cout << center_align(str, width);
}
void print_right_aligned(const std::string & str, int width) {
std::cout << right_align(str, width);
}
std::string left_align(const std::string & str, int width) { std::string left_align(const std::string & str, int width) {
if (static_cast<int>(str.size()) >= width) if (static_cast<int>(str.size()) >= width)
return str; return str;

8
source/src/utils/utils.hpp
View File

@ -3,6 +3,8 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "output.hpp"
namespace dropshell { namespace dropshell {
/** /**
@ -10,7 +12,7 @@ namespace dropshell {
* *
* @param title The title string to display * @param title The title string to display
*/ */
void maketitle(const std::string& title); void maketitle(const std::string& title, sColour colour=sColour::INFO);
bool replace_line_in_file(const std::string& file_path, const std::string& search_string, const std::string& replacement_line); bool replace_line_in_file(const std::string& file_path, const std::string& search_string, const std::string& replacement_line);
@ -45,10 +47,6 @@ int die(const std::string & msg);
std::string safearg(int argc, char *argv[], int index); std::string safearg(int argc, char *argv[], int index);
std::string safearg(const std::vector<std::string> & args, int index); std::string safearg(const std::vector<std::string> & args, int index);
void print_left_aligned(const std::string & str, int width);
void print_centered(const std::string & str, int width);
void print_right_aligned(const std::string & str, int width);
std::string left_align(const std::string & str, int width); std::string left_align(const std::string & str, int width);
std::string right_align(const std::string & str, int width); std::string right_align(const std::string & str, int width);
std::string center_align(const std::string & str, int width); std::string center_align(const std::string & str, int width);