X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=src%2Fmain.cpp;h=a7e95fe751bff9337248f4a3762fde2933c175f0;hb=d8afd601de1f0d8afe6eff61d40ff52d21d90fd8;hp=15523bf67d8bd949c19ff981a91700784d01e177;hpb=6d6b6a5d971decfb9d32752ac882ff56bc33d705;p=gen-shell.git

diff --git a/src/main.cpp b/src/main.cpp
index 15523bf..a7e95fe 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -26,141 +26,99 @@
 
 #include <cmake.h>
 #include <iostream>
-#include <vector>
-#include <string>
-#include <cstring>
-#include <cstdio>
+#include <Sarge/src/sarge.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <shared.h>
 
 #ifdef HAVE_READLINE
 #include <readline/readline.h>
 #include <readline/history.h>
 #endif
 
-std::string promptCompose ();
+////////////////////////////////////////////////////////////////////////////////
 
-const std::string getResponse (const std::string& prompt)
-{
-  std::string response {""};
+using namespace std;
+std::string promptCompose();
+
+const std::string getResponse(const std::string & prompt) {
+  std::string response {
+    ""
+  };
 
   // Display prompt, get input.
-#ifdef HAVE_READLINE
-  char *line_read = readline (prompt.c_str ());
-  if (! line_read)
-  {
+  #ifdef HAVE_READLINE
+  char * line_read = readline(prompt.c_str());
+  if (!line_read) {
     std::cout << "\n";
     response = "<EOF>";
-  }
-  else
-  {
+  } else {
     // Save history.
-    if (*line_read)
-      add_history (line_read);
+    if ( * line_read)
+      add_history(line_read);
 
-    response = std::string (line_read);
-    free (line_read);
+    response = std::string(line_read);
+    free(line_read);
   }
-#else
+  #else
   std::cout << prompt;
-  std::getline (std::cin, response);
-  if (std::cin.eof () == 1)
-  {
+  std::getline(std::cin, response);
+  if (std::cin.eof() == 1) {
     std::cout << "\n";
     response = "<EOF>";
   }
-#endif
+  #endif
 
   return response;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-static int commandLoop (bool autoClear)
-{
-  // Compose the prompt.
-  auto prompt = promptCompose ();
 
-  // Display prompt, get input.
-  auto command = getResponse (prompt);
+int main(int argc, char** argv)
+{
 
-  // Obey Taskwarrior's rc.tasksh.autoclear.
-  if (autoClear)
-    std::cout << "\033[2J\033[0;0H";
+  // Command line arguments
+  Sarge sarge;
 
-  int status = 0;
-  if (! isatty (fileno (stdin)) && command == "")
-  {
-    status = -1;
-  }
-  else if (command != "")
-  {
-    auto args = split (command, ' ');
-
-    // Dispatch command.
-         if (args[0] == "<EOF>")                      status = -1;
-    else if (closeEnough ("exit",        args[0], 3)) status = -1;
-    else if (closeEnough ("quit",        args[0], 3)) status = -1;
-    else if (command != "")
-    {
-      command = "echo " + command + " | lolcat ";
-      std::cout << "[" << command << "]\n";
-      system (command.c_str ());
+	sarge.setArgument("h", "help", "Get help.", false);
+	sarge.setArgument("c", "cmd", "Command to execute before entering the shell", true);
+	sarge.setDescription("Make a shell from any command");
+	sarge.setUsage("gen-shell <options> <command>");
 
-      // Deliberately ignoreѕ taskwarrior exit status, otherwise empty filters
-      // cause the shell to terminate.
-    }
-  }
+	if (!sarge.parseArguments(argc, argv)) {
+		std::cerr << "Couldn't parse arguments..." << std::endl;
+		return 1;
+	}
 
-  return status;
-}
+	if (sarge.exists("help")) {
+		sarge.printHelp();
+    return 0;
+	}
 
-////////////////////////////////////////////////////////////////////////////////
-int main (int argc, const char** argv)
-{
-  int status = 0;
+  string arg_cmd;
+  sarge.getFlag("cmd", arg_cmd);
+  arg_cmd += " ";
 
-  // Lightweight version checking that doesn't require initialization or any I/O.
-  if (argc == 2 && !strcmp (argv[1], "--version"))
-  {
-    std::cout << VERSION << "\n";
-  }
-  else
-  {
-    try
-    {
-      // Get the Taskwarrior rc.tasksh.autoclear Boolean setting.
-      bool autoClear = false;
-      std::string input;
-      std::string output;
-      execute ("task", {"_get", "rc.tasksh.autoclear"}, input, output);
-      output = lowerCase (output);
-      autoClear = (output == "true\n" ||
-                   output == "1\n"    ||
-                   output == "y\n"    ||
-                   output == "yes\n"  ||
-                   output == "on\n");
-
-      while ((status = commandLoop (autoClear)) == 0)
-        ;
-    }
+  // Main program
+  while (true) {
+    // Compose the prompt.
+    auto prompt = promptCompose();
 
-    catch (const std::string& error)
-    {
-      std::cerr << error << "\n";
-      status = -1;
-    }
+    // Display prompt, get input.
+    auto command = getResponse(prompt);
 
-    catch (...)
+    if (command != "")
     {
-      std::cerr << "Unknown error." << "\n";
-      status = -2;
+      // Dispatch command.
+      if (command == "<EOF>")
+      {
+        return 0;
+      }
+      else if (command != "")
+      {
+        string whole_command = arg_cmd + command;
+        system (whole_command.c_str ());
+      }
     }
   }
-
-  // Returning -1 drops out of the command loop, but gets translated to 0 here,
-  // so that there is a clean way to exit.
-  return status == -1 ? 0 : status;
 }
 
 ////////////////////////////////////////////////////////////////////////////////