mirror of
https://github.com/getpelican/pelican.git
synced 2025-10-15 20:28:56 +02:00
update summary plugin so that tests are fixed (hopefully)
This commit is contained in:
parent
d68d2debf9
commit
03f87057c2
1 changed files with 20 additions and 27 deletions
|
|
@ -19,17 +19,8 @@ def content_object_init(instance):
|
||||||
if 'summary' in instance.metadata:
|
if 'summary' in instance.metadata:
|
||||||
return
|
return
|
||||||
|
|
||||||
try:
|
def _get_content(self):
|
||||||
content = instance.content
|
content = self._content
|
||||||
except:
|
|
||||||
# in some tests, this fails because a context has not been set
|
|
||||||
return
|
|
||||||
|
|
||||||
# monkey patch a new function around get_content that removes summary
|
|
||||||
# markers
|
|
||||||
prev_get_content = instance.get_content
|
|
||||||
def get_content(self, siteurl):
|
|
||||||
content = prev_get_content(siteurl)
|
|
||||||
if self.settings['SUMMARY_BEGIN_MARKER']:
|
if self.settings['SUMMARY_BEGIN_MARKER']:
|
||||||
content = content.replace(
|
content = content.replace(
|
||||||
self.settings['SUMMARY_BEGIN_MARKER'], '', 1)
|
self.settings['SUMMARY_BEGIN_MARKER'], '', 1)
|
||||||
|
|
@ -37,23 +28,25 @@ def content_object_init(instance):
|
||||||
content = content.replace(
|
content = content.replace(
|
||||||
self.settings['SUMMARY_END_MARKER'], '', 1)
|
self.settings['SUMMARY_END_MARKER'], '', 1)
|
||||||
return content
|
return content
|
||||||
instance.get_content = types.MethodType(get_content, instance)
|
instance._get_content = types.MethodType(_get_content, instance)
|
||||||
|
|
||||||
# extract out our summary
|
# extract out our summary
|
||||||
begin_summary = -1
|
if not hasattr(instance, '_summary'):
|
||||||
end_summary = -1
|
content = instance._content
|
||||||
if instance.settings['SUMMARY_BEGIN_MARKER']:
|
begin_summary = -1
|
||||||
begin_summary = content.find(instance.settings['SUMMARY_BEGIN_MARKER'])
|
end_summary = -1
|
||||||
if instance.settings['SUMMARY_END_MARKER']:
|
if instance.settings['SUMMARY_BEGIN_MARKER']:
|
||||||
end_summary = content.find(instance.settings['SUMMARY_END_MARKER'])
|
begin_summary = content.find(instance.settings['SUMMARY_BEGIN_MARKER'])
|
||||||
if begin_summary != -1 or end_summary != -1:
|
if instance.settings['SUMMARY_END_MARKER']:
|
||||||
# the beginning position has to take into account the length
|
end_summary = content.find(instance.settings['SUMMARY_END_MARKER'])
|
||||||
# of the marker
|
if begin_summary != -1 or end_summary != -1:
|
||||||
begin_summary = (begin_summary +
|
# the beginning position has to take into account the length
|
||||||
len(instance.settings['SUMMARY_BEGIN_MARKER'])
|
# of the marker
|
||||||
if begin_summary != -1 else 0)
|
begin_summary = (begin_summary +
|
||||||
end_summary = end_summary if end_summary != -1 else None
|
len(instance.settings['SUMMARY_BEGIN_MARKER'])
|
||||||
instance._summary = content[begin_summary:end_summary]
|
if begin_summary != -1 else 0)
|
||||||
|
end_summary = end_summary if end_summary != -1 else None
|
||||||
|
instance._summary = content[begin_summary:end_summary]
|
||||||
|
|
||||||
def register():
|
def register():
|
||||||
signals.initialized.connect(initialized)
|
signals.initialized.connect(initialized)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue