Merge pull request #2447 from stuaxo/patch-4

pelican_import: Fix post titles that are entirely made of spaces
This commit is contained in:
Justin Mayer 2018-11-20 15:56:23 -06:00 committed by GitHub
commit 45c884cba5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -131,11 +131,11 @@ def xml_to_soup(xml):
return soup
def get_filename(filename, post_id):
if filename is not None:
return filename
else:
def get_filename(post_name, post_id):
if post_name is None or post_name.isspace():
return post_id
else:
return post_name
def wp2fields(xml, wp_custpost=False):
@ -154,9 +154,9 @@ def wp2fields(xml, wp_custpost=False):
title = 'No title [%s]' % item.find('post_name').string
logger.warning('Post "%s" is lacking a proper title', title)
filename = item.find('post_name').string
post_name = item.find('post_name').string
post_id = item.find('post_id').string
filename = get_filename(filename, post_id)
filename = get_filename(post_name, post_id)
content = item.find('encoded').string
raw_date = item.find('post_date').string
@ -690,14 +690,14 @@ def get_attachments(xml):
for item in items:
kind = item.find('post_type').string
filename = item.find('post_name').string
post_name = item.find('post_name').string
post_id = item.find('post_id').string
if kind == 'attachment':
attachments.append((item.find('post_parent').string,
item.find('attachment_url').string))
else:
filename = get_filename(filename, post_id)
filename = get_filename(post_name, post_id)
names[post_id] = filename
attachedposts = defaultdict(list)
for parent, url in attachments: