diff --git a/dumpgenerator.py b/dumpgenerator.py index 5671559..3aacf33 100644 --- a/dumpgenerator.py +++ b/dumpgenerator.py @@ -272,7 +272,16 @@ def getImageFilenamesURL(config={}, start='!'): raw = cleanHTML(raw) #archiveteam Yahoovideo.jpg (file) #wikanda Fernandocg - m = re.compile(r'(?im)]+title="[^:>]+:(?P[^>]+)">[^<]+[^<]+[^<]+[^<]+\s*]+>(?P[^<]+)').finditer(raw) + r_images1 = r'(?im)]+title="[^:>]+:(?P[^>]+)">[^<]+[^<]+[^<]+[^<]+\s*]+>(?P[^<]+)' + #wikijuegos http://softwarelibre.uca.es/wikijuegos/Especial:Imagelist old mediawiki version + r_images2 = r'(?im)]+title="[^:>]+:(?P[^>]+)">[^<]+[^<]+[^<]+\s*[^<]+\s*[^<]+\s*]+>(?P[^<]+)' + m = [] + #different mediawiki versions + if re.search(r_images1, raw): + m = re.compile(r_images1).finditer(raw) + elif re.search(r_images2, raw): + m = re.compile(r_images2).finditer(raw) + for i in m: url = i.group('url') if url[0] == '/' or not url.startswith('http://'): #relative URL