Add common files

1 files changed, 5 insertions, 10 deletions

diff --git a/autodownload.py b/autodownload.py
index 234131d2..bf44ad02 100644
--- a/autodownload.py
+++ b/autodownload.py
@@ -43,7 +43,7 @@ def usage():
     print("python3 autodownload.py <manual> [<server_url>]")
     print("\t <manual>: MCC, installer, netinstall or draklive")
     print("\t <server_url>: (optional) if not given: " +
-          "http://docteam.mageia.org.uk/zipped/ will be used")
+          "https://docteam.mageia.org.uk/Factory/zipped/ will be used")
 
 class ArchivePageHTMLParser(HTMLParser):
     def __init__(self):
@@ -63,15 +63,11 @@ def getPage(url):
     return parseur.data
 
 def getZip(url, manual, lang):
-    if lang == 'en' and manual == "mcc":
-        filename = manual_name_prefix[manual] + \
-                   manual_name_suffix
-    else:
-        filename = manual_name_prefix[manual] + \
+    filename = manual_name_prefix[manual] + \
                    lang.upper() + '-' + \
                    manual_name_suffix
 
-    language_url = "/".join([url, lang, filename])
+    language_url = "/".join([url, lang, manual, filename])
     print("Get %s\n"%language_url)
     try:
         with urlopen(Request(language_url, headers=agent_header)) as response:
@@ -94,10 +90,9 @@ if __name__ == "__main__":
             if len(sys.argv) == 3:
                 base_url = sys.argv[2]
             else:
-                base_url = "http://docteam.mageia.org.uk/zipped"
-            base_url = base_url + "/" + manual
+                base_url = "https://docteam.mageia.org.uk/Factory/zipped/"
             language_list = getPage(base_url)
             for elem in language_list:
-                getZip(base_url, manual, elem)
+                getZip(base_url, manual, elem.strip())