diff --git a/gen-ignores.py b/gen-ignores.py index abf9b96f63de7301aac093e7ab5d0eeeb2452226..e0dae51eac4a7cb40a6a8f11d070f51f72edbac1 100755 --- a/gen-ignores.py +++ b/gen-ignores.py @@ -20,7 +20,7 @@ for fn in glob.glob(os.path.join(archivebot_ignore_path, '*.json')): with open(fn) as fd: print('\n\t// %s' % os.path.basename(fn)) for p in json.load(fd)['patterns']: - if '\\\\1' in p or '(?!' in p: + if re.search(r'\\[0-9]', p) or '(?!' in p: # RE2 does not support backreferences or other # fancy PCRE constructs. This excludes <10 # patterns from the ignore list. diff --git a/ignore_patterns.go b/ignore_patterns.go index 4c38ff6f707d7817072a42d2c742264bcbcaec10..319b294823aa7b9327a33e5e8d5a1023a84db675 100644 --- a/ignore_patterns.go +++ b/ignore_patterns.go @@ -79,7 +79,6 @@ var defaultIgnorePatterns = []string{ "[\\?&]undo(after)?=\\d+", "^https?://a\\.wikia-beacon\\.com/__track/", "^https?://beacon\\.wikia-services\\.com/__track/", - "([\\?&]title=|/)Special:(PrefixIndex|WhatLinksHere|Contributions|ListFiles|ListUsers)/.*/\\2/", "/User_talk:.+/User_talk:", "/User_blog:.+/User_blog:", "/User:.+/User:", @@ -135,7 +134,6 @@ var defaultIgnorePatterns = []string{ "[\\?&]undo(after)?=\\d+", "^https?://a\\.wikia-beacon\\.com/__track/", "^https?://beacon\\.wikia-services\\.com/__track/", - "([\\?&]title=|/)Spezial:(Pr%C3%A4fixindex|(Linkliste|Verweisliste)|Beitr%C3%A4ge|(Dateien|Dateiliste)|(Benutzer|Benutzerliste))/.*/\\2/", "/Benutzer_Diskussion:.+/Benutzer_Diskussion:", "/User_blog:.+/User_blog:", "/Benutzer:.+/Benutzer:", @@ -478,7 +476,6 @@ var defaultIgnorePatterns = []string{ "[\\?&]undo(after)?=\\d+", "^https?://a\\.wikia-beacon\\.com/__track/", "^https?://beacon\\.wikia-services\\.com/__track/", - "([\\?&]title=|/)Especial:((P%C3%A1ginasPorPrefijo|P%C3%A1ginas_por_prefijo)|(LoQueEnlazaAqu%C3%AD|Lo_que_enlaza_aqu%C3%AD)|Contribuciones|(ListaIm%C3%A1genes|Lista_de_im%C3%A1genes)|(ListaUsuarios|Lista_de_usuarios))/.*/\\2/", "/Usuario_discusi%C3%B3n:.+/Usuario_discusi%C3%B3n:", "/User_blog:.+/User_blog:", "/Usuario:.+/Usuario:", @@ -601,7 +598,6 @@ var defaultIgnorePatterns = []string{ "SESSION_ID=", "showcal\\.php", "site=guestbook.+type=(?:ASC|DESC)", - "/sites/all/(sites|modules|libraries|scripts|themes)/.+/\\1", "Souprava=.+Souprava=.+", "Special:Whatlinkshere", "start-index=-\\d+", @@ -768,7 +764,6 @@ var defaultIgnorePatterns = []string{ "[\\?&]undo(after)?=\\d+", "^https?://a\\.wikia-beacon\\.com/__track/", "^https?://beacon\\.wikia-services\\.com/__track/", - "([\\?&]title=|/)Sp%C3%A9cial:((Index|Pr%C3%A9fixes|Prefixes)|(Pages_li%C3%A9es|PagesLi%C3%A9es|Pages_liees|PagesLiees)|Contributions|(Liste_des_fichiers|ListeDesFichiers|Liste_des_images|ListeDesImages)|(Liste_des_utilisateurs|ListeDesUtilisateurs|Utilisateurs))/.*/\\2/", "/Discussion_utilisateur:.+/Discussion_utilisateur:", "/User_blog:.+/User_blog:", "/Utilisateur:.+/Utilisateur:",