Assume settings.env.py defines a python list of tuples

Author: benjaminleighton

README.md

@@ -129,14 +129,11 @@ You can alter default [Flask](http://flask.pocoo.org/docs/1.0/config/) or
     # Default product to display (picks first available)
     CUBEDASH_DEFAULT_PRODUCTS = ('ls8_nbar_albers', 'ls7_nbar_albers')
 
-    # Limited regex syntax to match product names with a user-defined group.
-    # Pairs of regex,group are ";" separated. Regex and group are "," separated.
-    # As such ";" and "," can't be used in the regexs.
-    # eg ".albers., Albers projection; level1, Level 1 products"
+    # CUBEDASH_PRODUCT_GROUP_BY_REGEX is a list of tuples of (regex_pattern_string,group_name)
     # If re.search(regex, product name) then return the corresponding group.
     # If CUBEDASH_PRODUCT_GROUP_BY_REGEX string parses then regex matching will be used in place of CUBEDASH_PRODUCT_GROUP_BY_FIELD.
     # If CUBEDASH_PRODUCT_GROUP_BY_REGEX string is malformed an error will be logged and we default back to CUBEDASH_PRODUCT_GROUP_BY_FIELD.
-    # eg ".*albers.*,Albers projection;level1,Level 1 products" 
+    # eg "[('.*albers.*','Albers projection'), ('.*level1.*','Level 1 products'), ('.*usgs.*','Level 1 products')]" 
     CUBEDASH_PRODUCT_GROUP_BY_REGEX = None 
     # Which field should we use when grouping products in the top menu?
     CUBEDASH_PRODUCT_GROUP_BY_FIELD = 'product_type'

cubedash/_pages.py

@@ -281,9 +281,8 @@ def _get_grouped_products() -> List[Tuple[str, List[ProductWithSummary]]]:
     if group_by_regex:
         try:
             regex_group= {}
-            for regex_group_pair in group_by_regex.split(';'):
-                regex, group = regex_group_pair.split(',')
-                regex_group[re.compile(regex.strip())] = group.strip()  
+            for regex, group in group_by_regex:
+                regex_group[re.compile(regex.strip())] = group.strip()
         except Exception as e:
             _LOG.warn("invalid CUBEDASH_PRODUCT_GROUP_BY_REGEX: {}".format(group_by_regex))
             group_by_regex = None