Add day and week output flags

diff --git a/src/args.c b/src/args.c
index afc0b481870c01f488edc21e16e195c3fa65fbe6..1fceff6b85ab3e16f47c8e07592e4571438cc82b 100644 (file)
--- a/src/args.c
+++ b/src/args.c
@@ -21,18 +21,26 @@
 
 #include "args.h"
 #include "util.h"
+#include "conf.h"
+#include "date.h"
+#include "cal.h"
 
 /* Setup info */
 static int    argc;
 static char **argv;
 
 /* Options */
-const char *short_options = "h";
+const char *short_options = "hdw";
 
 struct option long_options[] = {
        {"help", 0, NULL, 'h'},
+       {"day",  2, NULL, 'd'},
+       {"week", 2, NULL, 'w'},
 };
 
+static int print_day  = 0;
+static int print_week = 0;
+
 /* Usage */
 static void usage(char *name)
 {
@@ -41,6 +49,8 @@ static void usage(char *name)
        printf("\n");
        printf("Options:\n");
        printf("  -h, --help  Print usage information\n");
+       printf("  -d, --day   Show today's events\n");
+       printf("  -w, --week  Show this week's events\n");
 }
 
 /* Initialize */
@@ -53,6 +63,7 @@ void args_setup(int _argc, char **_argv)
 /* Initialize */
 void args_init(void)
 {
+       /* Parse arguments */
        while (1) {
                int c = getopt_long(argc, argv,
                                short_options, long_options, NULL);
@@ -63,6 +74,66 @@ void args_init(void)
                                usage(argv[0]);
                                exit(0);
                                break;
+                       case 'd':
+                               print_day = 1;
+                               break;
+                       case 'w':
+                               print_week = 1;
+                               break;
+               }
+       }
+
+       /* Validate arguments */
+       if (print_day && print_week)
+               error("Cannot print both day and week");
+}
+
+void args_main(void)
+{
+       if (print_day || print_week) {
+               event_t *event = EVENTS;
+               for (int d = 0; d < (print_day ? 1 : 7); d++) {
+                       /* Get start and end of the day */
+                       date_t start = {SEL.year, SEL.month, SEL.day,  0, 0};
+                       date_t end   = {SEL.year, SEL.month, SEL.day, 24, 0};
+
+                       add_days(&start.year, &start.month, &start.day, d);
+                       add_days(&end.year,   &end.month,   &end.day,   d);
+
+
+                       /* Print day header */
+                       wday_t wday = day_of_week(start.year, start.month, start.day);
+                       printf("%s%s, %s %d, %d\n",
+                               d ? "\n" : "",
+                               day_to_string(wday),
+                               month_to_string(start.month),
+                               start.day+1,
+                               start.year);
+
+                       /* Skip forward to the day */
+                       while (event && compare(&start, &event->start) > 0)
+                               event = event->next;
+
+                       /* Print event info */
+                       int printed = 0;
+                       while (event && compare(&end, &event->start) > 0) {
+                               printf("%s  %02d:%02d",
+                                       printed ? "\n" : "",
+                                       event->start.hour,
+                                       event->start.min);
+                               if (event->name)
+                                       printf("  %s\n", event->name);
+                               if (event->desc)
+                                       printf("\n  %s\n", event->desc);
+                               printed++;
+                               event = event->next;
+                       }
+
+                       /* Print no events */
+                       if (!printed)
+                               printf("  No events\n");
                }
+
+               exit(0);
        }
 }

diff --git a/src/args.h b/src/args.h
index cca1b5e4a3273ea7cd75a8438244b33f5ecbafb4..8b327dfb8b183dcd8e7ea9f202966f5418b1ca16 100644 (file)
--- a/src/args.h
+++ b/src/args.h
@@ -18,3 +18,4 @@
 /* Functions */
 void args_setup(int argc, char **argv);
 void args_init(void);
+void args_main(void);

diff --git a/src/main.c b/src/main.c
index f957575f7ffd13fb6c4f7c2fbd951feedf72be32..99816b13fb40f76af822b511ba13130036c85e94 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -56,6 +56,9 @@ int main(int argc, char **argv)
        date_init();
        cal_init();
 
+       /* Run args main */
+       args_main();
+
        /* Run view main */
        view_init();
        view_main();