Move input file / output file out of RenderParams

src/fart/Cli.cpp

@@ -128,12 +128,12 @@ int Cli::run(int argc, char * argv[])
         }
         else
         {
-            if (this->params.input_file != "")
+            if (!this->input_file.empty())
             {
                 fprintf(stderr, "Extraneous argument: %s\n", argv[i]);
                 return 2;
             }
-            this->params.input_file = argv[i];
+            this->input_file = argv[i];
         }
     }
     return 0;
@@ -190,7 +190,7 @@ int Cli::handle_option(size_t flag_idx, const char * arg_value)
 
     case flag_output:
     case flag_output_l:
-        this->params.output_file = arg_value;
+        this->output_file = arg_value;
         return 0;
 
     case flag_width:

src/fart/Cli.h

@@ -6,6 +6,8 @@ class Cli
 {
 public:
     RenderParams params;
+    string_view input_file;
+    opt<string_view> output_file;
 
     int run(int argc, char * argv[]);
 

src/fart/Engine.cpp

@@ -5,7 +5,7 @@ Engine::Engine(const RenderParams & params)
 {
 }
 
-int Engine::run()
+int Engine::run(string_view input_file, opt<string_view> output_file)
 {
     return 0;
 }

src/fart/Engine.h

@@ -6,7 +6,7 @@ class Engine
 {
 public:
     Engine(const RenderParams & params);
-    int run();
+    int run(string_view input_file, opt<string_view> output_file);
 
 protected:
     RenderParams params;

src/fart/RenderParams.h

@@ -1,12 +1,9 @@
 #pragma once
 
 #include <stddef.h>
-#include <string>
 
 struct RenderParams
 {
-    string input_file;
-    string output_file;
     size_t width = 0u;
     size_t height = 0u;
 };

src/fart/common.h

@@ -1,5 +1,9 @@
 #pragma once
 
+#include <optional>
 #include <string>
+#include <string_view>
 
 using string = std::string;
+using string_view = std::string_view;
+template <typename T> using opt = std::optional<T>;

src/fart/main.cpp

@@ -11,5 +11,5 @@ int main(int argc, char * argv[])
         return rc - 1;
     }
     Engine engine(cli.params);
-    return engine.run();
+    return engine.run(cli.input_file, cli.output_file);
 }