Update image regex to handle new page format

mediawiki-client-tools · Sep 23, 2024 · 80b110a · 80b110a
1 parent 701c6e4
commit 80b110a
Show file tree

Hide file tree

Showing 2 changed files with 613 additions and 1 deletion.
diff --git a/wikiteam3/dumpgenerator/dump/image/html_regexs.py b/wikiteam3/dumpgenerator/dump/image/html_regexs.py
@@ -29,6 +29,6 @@
         r'(?im)<td class="TablePager_col_img_name">\s*<a href[^>]*?>(?P<filename>[^>]+)</a>[^<]*?<a href="(?P<url>[^>]+)">[^<]*?</a>[^<]*?</td>\s*'
         r'<td class="TablePager_col_thumb">[^\n\r]*?</td>\s*'
         r'<td class="TablePager_col_img_size">[^<]*?</td>\s*'
-        r'<td class="(?:TablePager_col_img_user_text|TablePager_col_img_actor)">\s*(<a href="[^>]*?" title="[^>]*?">)?(?P<uploader>[^<]+?)(</a>)?\s*</td>'
+        r'<td class="(?:TablePager_col_img_user_text|TablePager_col_img_actor)">\s*(?:<a href="[^>]*?" title="[^>]*?">)?(?:<bdi>)?(?P<uploader>[^<]+?)(?:</bdi>)?(?:</a>)?\s*(?:<span class="mw-usertoollinks">(?:(?!</span>)(?!</td>).)*?</span>)?</td>'
     ),
 ]