Merge branch 'fs#141-place-notice-after-comment' into develop

This commit is contained in:
2017-08-25 17:11:28 +02:00

View File

@@ -237,25 +237,28 @@ class MarkPagesBot( CurrentPageBot ): # sets 'current_page' on each treat()
insert_after_index = self.current_wikicode.index( insert_after_index = self.current_wikicode.index(
ltemplates[-1] ) ltemplates[-1] )
# Filter one linebreak # If there is more content
if isinstance( self.current_wikicode.get( if len(self.current_wikicode.nodes) > (insert_after_index + 1):
insert_after_index + 1), mwparser.nodes.text.Text ) and \ # Filter one linebreak
re.search( r"^\n\s+$", self.current_wikicode.get( if isinstance( self.current_wikicode.get(
insert_after_index + 1 ).value ): insert_after_index + 1),
mwparser.nodes.text.Text) and \
re.search( r"^\n[^\n\S]+$", self.current_wikicode.get(
insert_after_index + 1 ).value ):
insert_after_index += 1 insert_after_index += 1
while isinstance( while len(self.current_wikicode.nodes) > \
self.current_wikicode.get(insert_after_index + 1), (insert_after_index + 1) and \
mwparser.nodes.comment.Comment ): isinstance(
self.current_wikicode.get(insert_after_index + 1),
mwparser.nodes.comment.Comment ):
insert_after_index += 1 insert_after_index += 1
else: self.current_wikicode.insert_after(
self.current_wikicode.get(insert_after_index),
self.current_wikicode.insert_after( self.disc_notice )
self.current_wikicode.get(insert_after_index),
self.disc_notice )
# To have it in its own line we need to add a linbreak before # To have it in its own line we need to add a linbreak before
self.current_wikicode.insert_before(self.disc_notice, "\n" ) self.current_wikicode.insert_before(self.disc_notice, "\n" )