Add [iCalByDayMask initWithDaysAndOccurences:]

SOPE/NGCards/iCalByDayMask.h

@@ -53,6 +53,8 @@ typedef iCalWeekOccurrence iCalWeekOccurrences[7];
 - (id) initWithDays: (iCalWeekOccurrences) theDays;
 + (id) byDayMaskWithRuleString: (NSString *) byDayRule;
 - (id) initWithRuleString: (NSString *) byDayRule;
++ (id) byDayMaskWithDaysAndOccurences: (NSArray *) values;
+- (id) initWithDaysAndOccurences: (NSArray *) values;
 
 - (BOOL) occursOnDay: (iCalWeekDay) weekDay;
 - (BOOL) occursOnDay: (iCalWeekDay) weekDay

SOPE/NGCards/iCalByDayMask.m

@@ -190,6 +190,122 @@
   return self;
 }
 
++ (id) byDayMaskWithDaysAndOccurences: (NSArray *) values
+{
+  id o;
+
+  o = [[self alloc] initWithDaysAndOccurences: values];
+  AUTORELEASE(o);
+
+  return o;
+}
+
+- (id) initWithDaysAndOccurences: (NSArray *) values
+{
+  unsigned int count, max;
+  NSString *value;
+  unichar c, chars[2];
+  unsigned int valueLength, i, digitStart, order;
+  iCalWeekDay day;
+  id mask;
+  BOOL reverse;
+
+  self = [super init];
+
+  if (self)
+    {
+      memset(days, 0, 7 * sizeof(iCalWeekOccurrence));
+
+      max = [values count];
+      for (count = 0; count < max; count++)
+        {
+          mask = [values objectAtIndex: count];
+          if (![mask isKindOfClass: [NSDictionary class]])
+            continue;
+          value = [[mask objectForKey: @"day"] uppercaseString];
+          valueLength = [value length];
+          if (valueLength > 1)
+            {
+              day = iCalWeekDayUnknown;
+              reverse = NO;
+              digitStart = 0;
+              order = 0;
+
+              [value getCharacters: chars
+                             range: NSMakeRange(0, valueLength)];
+
+              switch (chars[0])
+                {
+                case 'M': day = iCalWeekDayMonday;
+                  break;
+                case 'W': day = iCalWeekDayWednesday;
+                  break;
+                case 'F': day = iCalWeekDayFriday;
+                  break;
+                case 'T':
+                  if (chars[1] == 'U')
+                    day = iCalWeekDayTuesday;
+                  else if (chars[1] == 'H')
+                    day = iCalWeekDayThursday;
+                  break;
+                case 'S':
+                  if (chars[1] == 'A')
+                    day = iCalWeekDaySaturday;
+                  else if (chars[1] == 'U')
+                    day = iCalWeekDaySunday;
+                  break;
+                }
+
+              if (day != iCalWeekDayUnknown)
+                {
+                  value = [mask objectForKey: @"occurence"];
+                  valueLength = [value length];
+                  if (valueLength > 0)
+                    {
+                      c = [value characterAtIndex: 0];
+                      if (c == '-')
+                        {
+                          digitStart = 1;
+                          reverse = YES;
+                        }
+                      else if (c == '+')
+                        {
+                          digitStart = 1;
+                        }
+
+                      i = digitStart;
+                      while (i < valueLength)
+                        {
+                          c = [value characterAtIndex: i];
+                          i++;
+                          if (!isdigit(c))
+                            break;
+                        }
+
+                      if (i != digitStart)
+                        order = [[value substringWithRange: NSMakeRange(digitStart, (i - digitStart))] intValue];
+                    }
+
+                  if (order > 0 && order < 6)
+                    {
+                      order = pow (2, order - 1);
+                      if (reverse)
+                        order = order << 5;
+                      days[day] |= order;
+                      //NSLog(@"*** iCalByDayMask [%i] %@ : day = %i, order = %i, result = %i", count, byDayRule, day, order, days[day]);
+                    }
+                  else
+                    {
+                      days[day] = iCalWeekOccurrenceAll;
+                    }
+                }
+	    }
+	}
+    }
+
+  return self;
+}
+
 - (void) dealloc
 {
   [super dealloc];