Changeset 4511ac3 for commands.c

Timestamp:

Aug 5, 2017, 11:21:53 PM (7 years ago)

Author:

Jason Gross <jasongross9@gmail.com>

Branches:

master

Children:

253f37f

Parents:

565a43c

git-author:

Jason Gross <jgross@mit.edu> (08/05/17 22:06:52)

git-committer:

Jason Gross <jasongross9@gmail.com> (08/05/17 23:21:53)

Message:

Better UI for :flush-logs and flush-logs-interval

We now only print the message about how many logs there are to flush
when -q is not passed to :flush-logs.  The timer from
flush-logs-interval passes -q, so the user won't see "There are no logs
to flush." ever few minutes.

File:

• commands.c (modified) (3 diffs)

commands.c

@@ -490 +490 @@
   OWLCMD_ARGS("flush-logs", owl_command_flushlogs, OWL_CTX_ANY,
               "flush the queue of messages waiting to be logged",
-              "flush-logs [-f | --force]",
+              "flush-logs [-f | --force] [-q | --quiet]",
               "If BarnOwl failed to log a file, this command tells\n"
               "BarnOwl to try logging the messages that have since\n"
@@ -501 +501 @@
               "any messages on the queue which cannot successfully be\n"
               "logged are dropped, and BarnOwl will resume logging\n"
-              "normally."),
+              "normally.\n"
+              "\n"
+              "Unless --quiet is passed, a message is printed about\n"
+              "how many logs there are to flush."),
 
   OWLCMD_ARGS("load-subs", owl_command_loadsubs, OWL_CTX_ANY,
@@ -1454 +1457 @@
 char *owl_command_flushlogs(int argc, const char *const *argv, const char *buff)
 {
-  if (argc == 1) {
-    owl_log_flush_logs(false);
-  } else if (argc == 2) {
-    if (!strcmp(argv[1], "-f") || !strcmp(argv[1], "--force")) {
-      owl_log_flush_logs(true);
+  bool force = false;
+  bool quiet = false;
+  int i;
+
+  for (i = 1; i < argc; i++) {
+    if (!strcmp(argv[i], "-f") || !strcmp(argv[i], "--force")) {
+      force = true;
+    } else if (!strcmp(argv[i], "-q") || !strcmp(argv[i], "--quiet")) {
+      quiet = true;
     } else {
-      owl_function_makemsg("Invalid flag to flush-logs: %s", argv[1]);
+      owl_function_makemsg("Invalid flag to flush-logs: %s", argv[i]);
     }
-  } else {
-    owl_function_makemsg("Wrong number of arguments for flush-logs.");
-  }
+  }
+  owl_log_flush_logs(force, quiet);
   return NULL;
 }