| Left: | ||
| Right: |
| LEFT | RIGHT |
|---|---|
| 1 import re | 1 import re |
| 2 from jinja2 import contextfunction | 2 from jinja2 import contextfunction |
| 3 | 3 |
| 4 | 4 |
| 5 @contextfunction | 5 @contextfunction |
| 6 def get_pages_metadata(context, filters=None): | 6 def get_pages_metadata(context, filters=None): |
| 7 if not isinstance(filters, dict) and filters: | 7 if not isinstance(filters, dict) and filters: |
| 8 raise TypeError('Filters are not a dictionary') | 8 raise TypeError('Filters are not a dictionary') |
| 9 | 9 |
| 10 return_data = [] | 10 return_data = [] |
| 11 for page_name, _format in context['source'].list_pages(): | 11 for page_name, _format in context['source'].list_pages(): |
| 12 data, filename = context['source'].read_page(page_name, _format) | 12 data, filename = context['source'].read_page(page_name, _format) |
| 13 page_data = parse_page_metadata(data, page_name) | 13 page_data = parse_page_metadata(data, page_name) |
| 14 | 14 |
| 15 if filter_metadata(filters, page_data, page_name) is True: | 15 if filter_metadata(filters, page_data) is True: |
| 16 return_data.append(page_data) | 16 return_data.append(page_data) |
| 17 | 17 |
| 18 return return_data | 18 return return_data |
| 19 | 19 |
| 20 | 20 |
| 21 def parse_page_metadata(data, page): | 21 def parse_page_metadata(data, page): |
| 22 page_metadata = {} | 22 page_metadata = {'page': page} |
| 23 lines = data.splitlines(True) | 23 lines = data.splitlines(True) |
| 24 for i, line in enumerate(lines): | 24 for i, line in enumerate(lines): |
| 25 if not re.search(r'^\s*[\w\-]+\s*=', line): | 25 if not re.search(r'^\s*[\w\-]+\s*=', line): |
| 26 break | 26 break |
| 27 name, value = line.split('=', 1) | 27 name, value = line.split('=', 1) |
| 28 value = tuple(value.strip().split(',')) | 28 value = value.strip() |
| 29 if value.startswith('[') and value.endswith(']'): | |
| 30 value = [element.strip() for element in value[1:-1].split(',')] | |
| 29 page_metadata[name.strip()] = value | 31 page_metadata[name.strip()] = value |
| 30 page_metadata['page'] = page | |
|
Vasily Kuznetsov
2017/01/12 10:37:47
I don't think we want to execute this for each lin
Jon Sonesen
2017/01/19 07:51:40
Done.
| |
| 31 return page_metadata | 32 return page_metadata |
| 32 | 33 |
| 33 | 34 |
| 34 def filter_metadata(filters, metadata, page): | 35 def filter_metadata(filters, metadata): |
| 35 if filters is None: | 36 if filters is None: |
| 36 return True | 37 return True |
| 37 for filter_name, filter_value in filters.items(): | 38 for filter_name, filter_value in filters.items(): |
| 38 if filter_name not in metadata[page]: | 39 if filter_name not in metadata: |
|
Vasily Kuznetsov
2017/01/12 10:37:47
This change looks like a mistake. `metadata` is al
Jon Sonesen
2017/01/19 07:51:40
Yeah, was a fail. Will fix
| |
| 39 return False | 40 return False |
| 40 for option in filter_value.split(','): | 41 if isinstance(metadata[filter_name], list): |
| 41 if option not in metadata[page][filter_name]: | 42 if isinstance(filter_value, basestring): |
|
Vasily Kuznetsov
2017/01/12 10:37:47
Same here regarding the `[page]` part. Also, what
Jon Sonesen
2017/01/19 07:51:40
You are right
| |
| 43 filter_value = [filter_value] | |
| 44 for option in filter_value: | |
| 45 if str(option) not in metadata[filter_name]: | |
| 46 return False | |
| 47 elif filter_value != metadata[filter_name]: | |
| 42 return False | 48 return False |
| 43 return True | 49 return True |
| LEFT | RIGHT |