launcher.py

git-svn-id: https://wikiteam.googlecode.com/svn/trunk@508 31edc4fc-5e31-b4c4-d58b-c8bc928bcb95

batchdownload/launcher.py

@@ -20,15 +20,16 @@ import re
 import sys
 import time
 
+import dumpgenerator
+
 f = open(sys.argv[1], 'r')
 wikis = f.read().splitlines()
 f.close()
 
 for wiki in wikis:
     skip = False
-    wikiname = re.sub(r'(^www\.|\/api\.php)', '', wiki.lower().split('://')[1])
+    wiki = wiki.lower()
-    wikiname = re.sub(r'\.', '', wikiname)
+    wikiname = dumpgenerator.domain2prefix(config={'api': wiki})
-    wikiname = re.sub(r'[-/]', '_', wikiname)
     wikidir = ''
     for dirname, dirnames, filenames in os.walk('.'):
         if dirname == '.':