github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge a206c9132f into 69b8a2d8cc

Browse source
This commit is contained in:
kernc 2015-06-05 21:01:04 +00:00
commit 55a51fd6a5
2 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
pelican/readers.py
View file

@ -30,7 +30,9 @@ from pelican.utils import get_date, pelican_open, FileStampDataCacher, SafeDatet
def strip_split(text, sep=','):
"""Return a list of stripped, non-empty substrings, delimited by sep."""
items = [x.strip() for x in text.split(sep)]
if not isinstance(text, list):
text = text.split(sep)
items = [x.strip() for x in text]
return [x for x in items if x]
@ -90,6 +92,8 @@ class BaseReader(object):
def process_metadata(self, name, value):
if name in METADATA_PROCESSORS:
if isinstance(value, list) and len(value) == 1:
value = value[0]
return METADATA_PROCESSORS[name](value, self.settings)
return value
@ -249,16 +253,13 @@ class MarkdownReader(BaseReader):
summary = self._md.convert(summary_values)
output[name] = self.process_metadata(name, summary)
elif name in METADATA_PROCESSORS:
if len(value) > 1:
logger.warning('Duplicate definition of `%s` '
'for %s. Using first one.', name, self._source_path)
output[name] = self.process_metadata(name, value[0])
elif len(value) > 1:
# handle list metadata as list of string
output[name] = self.process_metadata(name, value)
else:
# otherwise, handle metadata as single string
elif isinstance(value, list) and len(value) == 1:
# handle metadata as a single string
output[name] = self.process_metadata(name, value[0])
else:
# otherwise, handle metadata as single item
output[name] = self.process_metadata(name, value)
return output
def read(self, source_path):

9
pelican/utils.py
View file

@ -222,9 +222,16 @@ def get_date(string):
If no format matches the given date, raise a ValueError.
"""
string = re.sub(' +', ' ', string)
default = SafeDatetime.now().replace(hour=0, minute=0,
second=0, microsecond=0)
if isinstance(string, datetime.datetime):
# Return datetime object as SafeDatetime
return default.replace(year=string.year, month=string.month,
day=string.day, hour=string.hour,
minute=string.minute, second=string.second,
microsecond=string.microsecond,
tzinfo=string.tzinfo)
string = re.sub('[ _]+', ' ', string)
try:
return dateutil.parser.parse(string, default=default)
except (TypeError, ValueError):