jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/443576 ) Change subject: [cleanup] Simplify list concatenating ...................................................................... [cleanup] Simplify list concatenating - instead of having two different line formatting string depending on image or category namespaces let page.title() do the job - do not collect article items if the list page already exists and could not be overwritten or appended - make some variables pep8 compliant Change-Id: I799d179bce6247a8067d7a39b4ed72598f6277a5 --- M scripts/category.py 1 file changed, 32 insertions(+), 39 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/category.py b/scripts/category.py index c781311..eea282b 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -129,6 +129,7 @@ import os import pickle import re +from textwrap import fill from operator import methodcaller @@ -922,46 +923,38 @@ def run(self): """Start bot.""" - setOfArticles = set(self.cat.articles(recurse=self.recurse)) - if self.subCats: - setOfArticles = setOfArticles.union(set(self.cat.subcategories())) - if not self.editSummary: - self.editSummary = i18n.twtranslate(self.site, - 'category-listifying', - {'fromcat': self.cat.title(), - 'num': len(setOfArticles)}) + if self.list.exists() and not (self.append or self.overwrite): + pywikibot.output('Page {} already exists, aborting.\n' + .format(self.list.title())) + pywikibot.output(fill( + 'Use -append option to append the list to the output page or ' + '-overwrite option to overwrite the output page.')) + return - listString = '' - for article in setOfArticles: - if (not article.is_filepage() - or self.showImages) and not article.is_categorypage(): - if self.talkPages and not article.isTalkPage(): - listString += '{0} [[{1}]] -- [[{2}|talk]]\n'.format( - self.prefix, article.title(), - article.toggleTalkPage().title()) - else: - listString += '{0} [[{1}]]\n'.format(self.prefix, - article.title()) - else: - if self.talkPages and not article.isTalkPage(): - listString += '{0} [[:{1}]] -- [[{2}|talk]]\n'.format( - self.prefix, article.title(), - article.toggleTalkPage().title()) - else: - listString += '{0} [[:{1}]]\n'.format(self.prefix, - article.title()) - if self.list.exists(): - if self.append: - # append content by default at the bottom - listString = self.list.text + '\n' + listString - pywikibot.output('Category list appending...') - elif not self.overwrite: - pywikibot.output( - 'Page {} already exists, aborting.\n' - 'Use -overwrite option to overwrite the output page.' - .format(self.list.title())) - return - self.list.put(listString, summary=self.editSummary) + set_of_articles = set(self.cat.articles(recurse=self.recurse)) + if self.subCats: + set_of_articles |= set(self.cat.subcategories()) + + list_string = '' + for article in set_of_articles: + textlink = not (article.is_filepage() and self.showImages) + list_string += '{} {}'.format( + self.prefix, article.title(as_link=True, textlink=textlink)) + if self.talkPages and not article.isTalkPage(): + list_string += ' -- [[{}|talk]]'.format( + article.toggleTalkPage().title()) + list_string += '\n' + + if self.list.text and self.append: + # append content by default at the bottom + list_string = self.list.text + '\n' + list_string + pywikibot.output('Category list appending...') + + if not self.editSummary: + self.editSummary = i18n.twtranslate( + self.site, 'category-listifying', + {'fromcat': self.cat.title(), 'num': len(set_of_articles)}) + self.list.put(list_string, summary=self.editSummary) class CategoryTidyRobot(Bot, CategoryPreprocess): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/443576 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I799d179bce6247a8067d7a39b4ed72598f6277a5 Gerrit-Change-Number: 443576 Gerrit-PatchSet: 13 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-CC: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-MessageType: merged