# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1467733885 -10800
# Node ID 54644b29a9a3b87e6e24e8c3f2b91b9217fcf6c9
# Parent  f8618bae162a32e35dbcdab49139fb5fbc1c7c1a
Match also summaryOverride attribute against the source calendar regexp.

diff -r f8618bae162a -r 54644b29a9a3 multimerge.py
--- a/multimerge.py	Tue Jul 05 18:01:11 2016 +0300
+++ b/multimerge.py	Tue Jul 05 18:51:25 2016 +0300
@@ -364,16 +364,23 @@
 src_re = re.compile(cfg.source_regex, re.UNICODE)
 src_calendars = []
 for calendar in calendars:
-    if "summary" in calendar:
+    if u"summary" in calendar:
         # Find destination calendar ID if not set
         if not cfg.dest_id and cfg.dest_name == calendar["summary"].strip():
             cfg.mset("dest_id", calendar["id"])
 
+        # If summary or summaryOverride match the regexp, add calendar
         mre = src_re.match(calendar["summary"])
         if mre:
             calendar["gcm_title"] = mre.group(cfg.source_regmap[0])
             calendar["gcm_id"] = mre.group(cfg.source_regmap[1])
             src_calendars.append(calendar)
+        elif u"summaryOverride" in calendar:
+            mre = src_re.match(calendar[u"summaryOverride"])
+            if mre:
+                calendar["gcm_title"] = mre.group(cfg.source_regmap[0])
+                calendar["gcm_id"] = mre.group(cfg.source_regmap[1])
+                src_calendars.append(calendar)
 
 gcm_debug(u"{0} source calendars found.".format(len(src_calendars)))