Skip to content

Commit

Permalink
impr: Properly print new line characters in cli
Browse files Browse the repository at this point in the history
  • Loading branch information
@WerWolv
WerWolv committed Jul 21, 2023
1 parent d3f493b commit f6bbfd7
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 31 deletions.
5 changes: 5 additions & 0 deletions lib/libimhex/include/hex/helpers/fmt.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,9 @@ namespace hex {
fmt::print(fmt::runtime(format), args...);
}

template<typename... Args>
inline void println(std::string_view format, Args... args) {
fmt::println(fmt::runtime(format), args...);
}

}
62 changes: 31 additions & 31 deletions plugins/builtin/source/content/command_line_interface.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ namespace hex::plugin::builtin {

for (const auto &plugin : PluginManager::getPlugins()) {
for (const auto &subCommand : plugin.getSubCommands()) {
hex::print(" --{}{: <{}} {}\n", subCommand.commandKey, "", longestCommand - subCommand.commandKey.size(), subCommand.commandDesc);
hex::println(" --{}{: <{}} {}", subCommand.commandKey, "", longestCommand - subCommand.commandKey.size(), subCommand.commandDesc);
}
}

Expand All @@ -63,7 +63,7 @@ namespace hex::plugin::builtin {

void handleOpenCommand(const std::vector<std::string> &args) {
if (args.empty()) {
hex::print("No files provided to open.");
hex::println("No files provided to open.");
std::exit(EXIT_FAILURE);
}

Expand All @@ -85,8 +85,8 @@ namespace hex::plugin::builtin {

void handleCalcCommand(const std::vector<std::string> &args) {
if (args.empty()) {
hex::print("No expression provided!");
hex::print("Example: imhex --calc \"5 * 7\"");
hex::println("No expression provided!");
hex::println("Example: imhex --calc \"5 * 7\"");
std::exit(EXIT_FAILURE);
}

Expand All @@ -96,17 +96,17 @@ namespace hex::plugin::builtin {
auto result = evaluator.evaluate(input);

if (!result.has_value())
hex::print("{}\n> '{}'", evaluator.getLastError().value(), input);
hex::println("{}\n> '{}'", evaluator.getLastError().value(), input);
else
hex::print("{}", result.value());
hex::println("{}", result.value());

std::exit(EXIT_SUCCESS);
}

void handlePluginsCommand(const std::vector<std::string> &args) {
hex::unused(args);

hex::print("Loaded plugins:\n");
hex::println("Loaded plugins:");

for (const auto &plugin : PluginManager::getPlugins()) {
hex::print("- ");
Expand All @@ -116,18 +116,18 @@ namespace hex::plugin::builtin {
else
hex::print("\033[1m{}\033[0m", plugin.getPluginName());

hex::print(" by {}\n", plugin.getPluginAuthor());
hex::println(" by {}", plugin.getPluginAuthor());

hex::print(" \033[2;3m{}\033[0m\n", plugin.getPluginDescription());
hex::println(" \033[2;3m{}\033[0m", plugin.getPluginDescription());
}

std::exit(EXIT_SUCCESS);
}

void handleHashCommand(const std::vector<std::string> &args) {
if (args.size() != 2) {
hex::print("usage: imhex --hash <algorithm> <file>");
hex::print("Available algorithms: md5, sha1, sha224, sha256, sha384, sha512");
hex::println("usage: imhex --hash <algorithm> <file>");
hex::println("Available algorithms: md5, sha1, sha224, sha256, sha384, sha512");
std::exit(EXIT_FAILURE);
}

Expand All @@ -136,7 +136,7 @@ namespace hex::plugin::builtin {

wolv::io::File file(filePath, wolv::io::File::Mode::Read);
if (!file.isValid()) {
hex::print("Failed to open file: {}", wolv::util::toUTF8String(filePath));
hex::println("Failed to open file: {}", wolv::util::toUTF8String(filePath));
std::exit(EXIT_FAILURE);
}

Expand All @@ -158,20 +158,20 @@ namespace hex::plugin::builtin {
} else if (algorithm == "sha512") {
result = toVector(hex::crypt::sha512(file.readVector()));
} else {
hex::print("Unknown algorithm: {}", algorithm);
hex::print("Available algorithms: md5, sha1, sha224, sha256, sha384, sha512");
hex::println("Unknown algorithm: {}", algorithm);
hex::println("Available algorithms: md5, sha1, sha224, sha256, sha384, sha512");
std::exit(EXIT_FAILURE);
}

hex::print("{}({}) = {}", algorithm, wolv::util::toUTF8String(filePath.filename()), hex::crypt::encode16(result));
hex::println("{}({}) = {}", algorithm, wolv::util::toUTF8String(filePath.filename()), hex::crypt::encode16(result));

std::exit(EXIT_SUCCESS);
}

void handleEncodeCommand(const std::vector<std::string> &args) {
if (args.size() != 2) {
hex::print("usage: imhex --encode <algorithm> <string>");
hex::print("Available algorithms: base64, hex");
hex::println("usage: imhex --encode <algorithm> <string>");
hex::println("Available algorithms: base64, hex");
std::exit(EXIT_FAILURE);
}

Expand All @@ -185,19 +185,19 @@ namespace hex::plugin::builtin {
} else if (algorithm == "hex") {
result = hex::crypt::encode16(data);
} else {
hex::print("Unknown algorithm: {}", algorithm);
hex::print("Available algorithms: base64, hex");
hex::println("Unknown algorithm: {}", algorithm);
hex::println("Available algorithms: base64, hex");
std::exit(EXIT_FAILURE);
}

hex::print("encode_{}({}) = {}", algorithm, args[1], result);
hex::println("encode_{}({}) = {}", algorithm, args[1], result);
std::exit(EXIT_SUCCESS);
}

void handleDecodeCommand(const std::vector<std::string> &args) {
if (args.size() != 2) {
hex::print("usage: imhex --decode <algorithm> <string>");
hex::print("Available algorithms: base64, hex");
hex::println("usage: imhex --decode <algorithm> <string>");
hex::println("Available algorithms: base64, hex");
std::exit(EXIT_FAILURE);
}

Expand All @@ -212,8 +212,8 @@ namespace hex::plugin::builtin {
auto base16 = hex::crypt::decode16(std::string(data.begin(), data.end()));
result = std::string(base16.begin(), base16.end());
} else {
hex::print("Unknown algorithm: {}", algorithm);
hex::print("Available algorithms: base64, hex");
hex::println("Unknown algorithm: {}", algorithm);
hex::println("Available algorithms: base64, hex");
std::exit(EXIT_FAILURE);
}

Expand All @@ -223,8 +223,8 @@ namespace hex::plugin::builtin {

void handleMagicCommand(const std::vector<std::string> &args) {
if (args.size() != 2) {
hex::print("usage: imhex --magic <operation> <file>");
hex::print("Available operations: mime, desc");
hex::println("usage: imhex --magic <operation> <file>");
hex::println("Available operations: mime, desc");
std::exit(EXIT_FAILURE);
}

Expand All @@ -238,21 +238,21 @@ namespace hex::plugin::builtin {

wolv::io::File file(filePath, wolv::io::File::Mode::Read);
if (!file.isValid()) {
hex::print("Failed to open file: {}", wolv::util::toUTF8String(filePath));
hex::println("Failed to open file: {}", wolv::util::toUTF8String(filePath));
std::exit(EXIT_FAILURE);
}

auto data = file.readVector(std::min<size_t>(file.getSize(), 100_KiB));

if (operation == "mime") {
auto result = magic::getMIMEType(data);
hex::print("{}", result);
hex::println("{}", result);
} else if (operation == "desc") {
auto result = magic::getDescription(data);
hex::print("{}", result);
hex::println("{}", result);
} else {
hex::print("Unknown operation: {}", operation);
hex::print("Available operations: mime, desc");
hex::println("Unknown operation: {}", operation);
hex::println("Available operations: mime, desc");
std::exit(EXIT_FAILURE);
}

Expand Down

0 comments on commit f6bbfd7

Please sign in to comment.