kallithea Changeset - f9b5deab451e

Changeset - f9b5deab451e

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 8 years ago 2017-09-14 02:08:06
mads@kiilerich.com

ini: add support for adding extra entries to sections

When adding entries to an existing section, assume that comments and empty
lines *before* a section header belongs to that section. That is an
approximation; not always entirely correct, but the best we can come up with.

1 file changed with 29 insertions and 6 deletions:

kallithea/lib/inifile.py

0 comments (0 inline, 0 general)

kallithea/lib/inifile.py

➞

Show inline comments

@@ @@ -64,54 +64,77 @@ def expand(template, desc, mako_variable @@
     [first-section]
     <BLANKLINE>
     variable=VALUE
     #variable2  =    value after tab
     variable2 = VAL2
     <BLANKLINE>
     first_extra = EXTRA
     <BLANKLINE>
     <BLANKLINE>
     # FUNCTION RESULT
     [second-section]
     # Description                                                                  #
     # of this config file                                                          #
     <BLANKLINE>
     [fourth-section]
     fourth = "four"
     fourth_extra = 4
     <BLANKLINE>
     [third-section]
     third_extra =  3
     <BLANKLINE>
     """
     settings = dict((k, dict(v)) for k, v in settings.items()) # deep copy before mutating
     ini_lines = mako.template.Template(template).render(**mako_variable_values)
     ini_lines = re.sub(
         '# Kallithea - config file generated with kallithea-config *#\n',
         ''.join('# %-77s#\n' % l.strip() for l in desc.strip().split('\n')),
         ini_lines)
     def process_section(m):
         """process a ini section, replacing values as necessary"""
         sectionname, lines = m.groups()
         if sectionname in settings:
-            section_settings = settings[sectionname]
+            section_settings = settings.pop(sectionname)
             def process_line(m):
                 """process a section line and update value if necessary"""
                 key, value = m.groups()
                 line = m.group(0)
                 if key in section_settings:
                     # keep old entry as example - comments might refer to it
-                    line = '#%s\n%s = %s' % (line, key, section_settings[key])
+                    line = '#%s\n%s = %s' % (line, key, section_settings.pop(key))
                 return line.rstrip()
             # process lines that not are comments or empty and look like name=value
             lines = re.sub(r'^([^#\n\s]*)[ \t]*=[ \t]*(.*)$', process_line, lines, flags=re.MULTILINE)
             # add unused section settings
             if section_settings:
                 lines += '\n' + ''.join('%s = %s\n' % (key, value) for key, value in sorted(section_settings.items()))
         return sectionname + '\n' + lines
-    # process sections until next section start or end
+    # process sections until comments before next section or end
     ini_lines = re.sub(r'''^
         (\[.*\])\n
         # after the section name, a number of chunks with:
+        (
             (?:
                 # a number of empty or non-section-start lines
                 (?:[^\n[].*)?\n
                 # a number of comments or empty lines
                 (?:[#].*\n|\n)*
                 # one or more non-empty non-comments non-section-start lines
                 (?:[^\n#[].*\n)+
                 # a number of comments - not empty lines
                 (?:[#].*\n)*
             )*
+        )
         ''',
         process_section, ini_lines, flags=re.MULTILINE|re.VERBOSE)
         process_section, ini_lines, flags=re.MULTILINE|re.VERBOSE) \
         + \
         ''.join(
             '\n' + sectionname + '\n' + ''.join('%s = %s\n' % (key, value) for key, value in sorted(section_settings.items()))
             for sectionname, section_settings in sorted(settings.items())
             if section_settings)
     return ini_lines

0 comments (0 inline, 0 general)