Merge pull request #110 from Habbie/version-obvious

make -v print the version in -cli and -lvgl, log version on startup
voorkant · Oct 4, 2024 · eaad4b4 · eaad4b4
2 parents 05b3b87 + 7bd3822
commit eaad4b4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/meson.build b/meson.build
@@ -156,6 +156,7 @@ if get_option('front-ftxui').enabled()
             'src/WSConn.cpp',
             'src/front-ftxui.cpp',
             'src/generated/domains.hpp',
+            version_file,
         ],
         install: true,
         dependencies: [
@@ -218,6 +219,7 @@ if get_option('front-lvgl').enabled()
             'src/front-lvgl.cpp',
             'src/lv_conf.h',
             'src/generated/domains.hpp',
+            version_file,
         ],
         install: true,
         dependencies: [

diff --git a/src/front-cli.cpp b/src/front-cli.cpp
@@ -42,7 +42,7 @@ class SimpleObserver : public IObserver
 
 void uithread(int _argc, char* _argv[])
 {
-  argparse::ArgumentParser program("voorkant-cli");
+  argparse::ArgumentParser program("voorkant-cli", getVersion());
   argparse::ArgumentParser version_command("version");
   program.add_subparser(version_command);
   argparse::ArgumentParser subscribe_command("subscribe");

diff --git a/src/front-lvgl.cpp b/src/front-lvgl.cpp
@@ -58,7 +58,7 @@ void lvLogCallback(lv_log_level_t _level, const char* _buf) // FIXME use level
 
 void uithread(int _argc, char* _argv[])
 {
-  argparse::ArgumentParser program("voorkant-lvgl");
+  argparse::ArgumentParser program("voorkant-lvgl", getVersion());
 
   argparse::ArgumentParser entity_command("entity");
   entity_command.add_argument("pattern").help("what entity to render, in a c++ regex");

diff --git a/src/main.cpp b/src/main.cpp
@@ -32,7 +32,7 @@ int main(int argc, char* argv[])
 {
   g_log.setLogLevel(Logger::LogLevel::Debug);
   g_log.setDoDetails(true);
-  g_log << Logger::LogLevel::Info << "Starting!" << std::endl;
+  g_log << Logger::LogLevel::Info << "Starting! (version " << getVersion() << ")" << std::endl;
   if (HABackend::getInstance().connect({.url = getEnv("HA_WS_URL"), .token = getEnv("HA_API_TOKEN")})) {
     g_log << Logger::LogLevel::Debug << "Connected to HA succesfully!" << std::endl;
     // we used to do this, which actually is quite pointless if main does nothing besides this (after connecting HA)