Xqt has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1328309?usp=email )
Change subject: checkimages: Reuse URL-formatted image title
......................................................................
checkimages: Reuse URL-formatted image title
Resolve the current image title once during duplicate processing. Reuse it
for comparisons, regex construction, and duplicate-report entries.
Change-Id: Ie7fd23c55a1badc0ce9ea3755db5955419f4ae48
---
M scripts/checkimages.py
1 file changed, 9 insertions(+), 7 deletions(-)
Approvals:
Xqt: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/checkimages.py b/scripts/checkimages.py
index 90c80e0..ef979f7 100755
--- a/scripts/checkimages.py
+++ b/scripts/checkimages.py
@@ -884,6 +884,8 @@
if len(duplicates) <= 1:
return bool(duplicates)
+ image_url_title = self.image.title(as_url=True)
+
xdict = {'en':
'%(name)s has {{PLURAL:count'
'|a duplicate! Reporting it'
@@ -895,8 +897,8 @@
time_image_list = []
for dup_page in duplicates:
- if dup_page.title(as_url=True) != self.image.title(
- as_url=True) or self.timestamp is None:
+ if (dup_page.title(as_url=True) != image_url_title
+ or self.timestamp is None):
try:
self.timestamp = dup_page.latest_file_info.timestamp
except PageRelatedError:
@@ -970,9 +972,10 @@
if images_to_tag_list and not only_report:
fp = pywikibot.FilePage(self.site, images_to_tag_list[-1])
already_reported_in_past = fp.revision_count(self.bots)
- image_title = re.escape(self.image.title(as_url=True))
+ escaped_image_title = re.escape(image_url_title)
from_regex = (
- rf'\n\*\[\[:{self.image_namespace}{image_title}\]\]')
+ rf'\n\*\[\[:{self.image_namespace}'
+ rf'{escaped_image_title}\]\]')
# Delete the image in the list where we're write on
text_for_the_report = re.sub(from_regex, '',
text_for_the_report)
@@ -994,12 +997,11 @@
self.site, 'checkimages-has-duplicates')
forced_mode = ' ' + i18n.twtranslate(
self.site, 'checkimages-forced-mode') if only_report else ''
- repme = self.list_entry % self.image.title(as_url=True)
+ repme = self.list_entry % image_url_title
repme += has_duplicates % {'force': forced_mode}
for dup_page in duplicates:
- if dup_page.title(as_url=True) \
- == self.image.title(as_url=True):
+ if dup_page.title(as_url=True) == image_url_title:
# the image itself, not report also this as duplicate
continue
repme += (f'\n** [[:{self.image_namespace}'
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1328309?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: Ie7fd23c55a1badc0ce9ea3755db5955419f4ae48
Gerrit-Change-Number: 1328309
Gerrit-PatchSet: 2
Gerrit-Owner: Mahveotm <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
Pywikibot-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
