Add basic-demo program, move src to weather-app

Author: diamondburned

.gitignore

@@ -9,4 +9,4 @@ install_manifest.txt
 compile_commands.json
 CTestTestfile.cmake
 _deps
-cpp-tui-workshop
+*.out

CMakeLists.txt

@@ -5,13 +5,20 @@ project(cpp-tui-workshop LANGUAGES CXX)
 find_package(ftxui REQUIRED)
 find_package(cpr REQUIRED)
 
-file(GLOB_RECURSE SRC_FILES "src/*.cpp")
-add_executable(cpp-tui-workshop ${SRC_FILES})
-target_include_directories(cpp-tui-workshop PRIVATE src)
+function(register_executable TARGET_NAME SRC_PATH LIBRARIES)
+	file(GLOB_RECURSE SRC_FILES "${SRC_PATH}/*.cpp")
+	add_executable("${TARGET_NAME}.out" ${SRC_FILES})
+	target_link_libraries("${TARGET_NAME}.out" ${LIBRARIES})
+endfunction()
 
-target_link_libraries(cpp-tui-workshop
-  PRIVATE ftxui::screen
-  PRIVATE ftxui::dom
-  PRIVATE ftxui::component
-  PRIVATE cpr::cpr
+register_executable(
+	"weather-app"
+	"weather-app"
+	"ftxui::screen;ftxui::dom;ftxui::component;cpr::cpr"
+)
+
+register_executable(
+	"basic-demo"
+	"basic-demo"
+	"ftxui::screen;ftxui::dom;ftxui::component"
 )

README.md

@@ -21,6 +21,16 @@ using [CMake](https://cmake.org/).
 nix build .#
 ```
 
+This gives you a `result` folder containing the binaries in `result/bin`.
+
+If you want to directly run the program without running the build command, you
+can do:
+
+```sh
+nix run .#weather-app
+nix run .#basic-demo
+```
+
 To run, you can either use `nix run` and skip building entirely or run
 `./result/bin/cpp-tui-workshop`.
 
@@ -40,4 +50,4 @@ cmake .
 cmake --build .
 ```
 
-To run, you can run `./cpp-tui-workshop`.
+To run, you can run any of the `.out` files.

basic-demo/main.cpp

@@ -0,0 +1,18 @@
+#include <ftxui/component/captured_mouse.hpp>
+#include <ftxui/component/component.hpp>
+#include <ftxui/component/component_base.hpp>
+#include <ftxui/component/screen_interactive.hpp>
+#include <ftxui/dom/elements.hpp>
+
+using namespace ftxui;
+
+int main() {
+  auto interface = [&] {
+    return window(text("Title") | center, vbox({
+                                              text("Hello!!") | center,
+                                          }));
+  };
+
+  auto screen = ScreenInteractive::Fullscreen();
+  screen.Loop(Renderer(interface));
+}

flake.nix

@@ -34,13 +34,20 @@
 
 				installPhase = ''
 					mkdir -p $out/bin
-					mv cpp-tui-workshop $out/bin
+					for bin in *.out; do
+						dst="$out/bin/$(basename $bin .out)"
+						mv $bin $dst
+					done
 				'';
+			};
 
-				meta = {
-					mainProgram = "cpp-tui-workshop";
+			apps = builtins.listToAttrs (map (exe: {
+				name = exe;
+				value = {
+					type = "app";
+					program = "${self.packages.${system}.default}/bin/${exe}";
 				};
-			};
+			}) ["weather-app" "basic-demo"]);
 		}
 	);
 }

src/async.cpp renamed to weather-app/async.cpp

@@ -131,17 +131,18 @@ int main() {
 
     if (event == Event::Custom) {
       // Check if the weather data is ready.
-      weather_future.wait();
       if (weather_future.valid()) {
         try {
           weather_maybe =
               std::make_unique<Weather::Conditions>(weather_future.get());
         } catch (...) {
           weather_maybe = std::current_exception();
         }
+        return true;
+      } else if (weather_maybe.index() == 0) {
+        // Data is still loading. Try again later.
+        screen.PostEvent(Event::Custom);
       }
-
-      return true;
     }
 
     return false;