Fix date and ical test cases

[lackey] / cals / ical.c

diff --git a/cals/ical.c b/cals/ical.c
index 981d08dc3b29c6951c71c812f0a5e978722d193b..bd41b721c899715ff29853eff22e8de320cc8d37 100644 (file)
--- a/cals/ical.c
+++ b/cals/ical.c
@@ -101,11 +101,7 @@ static void add_recur(cal_t *cal,
                cend   = icalcomponent_get_dtend(comp);
                length = icaltime_subtract(cend, cstart);
 
-               rrule  = icalcomponent_get_first_property(comp, ICAL_RRULE_PROPERTY);
-               recur  = icalproperty_get_rrule(rrule);
-               iter   = icalrecur_iterator_new(recur, cstart);
-
-               /* Add recurrences */
+               /* Full day event */
                if (icaltime_is_null_time(cstart) ||
                    which == ICAL_VTODO_COMPONENT) {
                        icalarray_append(array, &(ical_inst){
@@ -114,27 +110,38 @@ static void add_recur(cal_t *cal,
                                .start = cstart,
                                .end   = cend,
                        });
-               } else while (1) {
-                       istart = iend = icalrecur_iterator_next(iter);
-                       if (icaltime_is_null_time(istart))
-                               break;    // no more instances
-                       if (!icaltime_is_null_time(cend))
-                               iend = icaltime_add(iend, length);
-
-                       if (icaltime_compare(iend, start) <= 0)
-                               continue; // instance ends before start time
-                       if (icaltime_compare(istart, end) >= 0)
-                               break;    // instance begins after stop time
-
-                       icalarray_append(array, &(ical_inst){
-                               .cal   = cal,
-                               .comp  = comp,
-                               .start = istart,
-                               .end   = iend,
-                       });
                }
 
-               icalrecur_iterator_free(iter);
+               /* Add all recurrences */
+               rrule = icalcomponent_get_first_property(comp, ICAL_RRULE_PROPERTY);
+               while (rrule) {
+                       recur = icalproperty_get_rrule(rrule);
+                       iter  = icalrecur_iterator_new(recur, cstart);
+
+                       /* Add recurrence for this rrule */
+                       while (1) {
+                               istart = iend = icalrecur_iterator_next(iter);
+                               if (icaltime_is_null_time(istart))
+                                       break;    // no more instances
+                               if (!icaltime_is_null_time(cend))
+                                       iend = icaltime_add(iend, length);
+
+                               if (icaltime_compare(iend, start) <= 0)
+                                       continue; // instance ends before start time
+                               if (icaltime_compare(istart, end) >= 0)
+                                       break;    // instance begins after stop time
+
+                               icalarray_append(array, &(ical_inst){
+                                       .cal   = cal,
+                                       .comp  = comp,
+                                       .start = istart,
+                                       .end   = iend,
+                               });
+                       }
+
+                       icalrecur_iterator_free(iter);
+                       rrule = icalcomponent_get_next_property(comp, ICAL_RRULE_PROPERTY);
+               }
        }
 
        /* Add children */
@@ -152,17 +159,16 @@ static void read_icals(void)
                if (cal->comp == NULL && cal->location) {
                        wordexp_t wexp;
                        wordexp(cal->location, &wexp, WRDE_NOCMD);
-                       if (wexp.we_wordc == 0)
-                               continue;
-                       FILE *file = fopen(wexp.we_wordv[0], "r");
-                       wordfree(&wexp);
-                       if (!file)
-                               continue;
-
                        icalparser *parser = icalparser_new();
-                       icalparser_set_gen_data(parser, file);
+                       for (int i = 0; i < wexp.we_wordc; i++) {
+                               FILE *file = fopen(wexp.we_wordv[i], "r");
+                               if (!file)
+                                       continue;
+                               icalparser_set_gen_data(parser, file);
+                       }
                        cal->comp = icalparser_parse(parser, (void*)fgets);
                        icalparser_free(parser);
+                       wordfree(&wexp);
                }
        }
 }
@@ -344,10 +350,10 @@ void ical_printr(icalcomponent *comp, int depth)
        }
 }
 
-void ical_test(void)
+void ical_test(char *path)
 {
        /* Load ical */
-       FILE *file = fopen("data/all.ics", "r");
+       FILE *file = fopen(path, "r");
        icalparser *parser = icalparser_new();
        icalparser_set_gen_data(parser, file);
        icalcomponent *comp = icalparser_parse(parser, (void*)fgets);