Repository: miurahr/aqtinstall
Pull request #107 (2020-03-05 06:30:43)

CLI: Change version info and test excpectation
Signed-off-by: Hiroshi Miura <miurahr@linux.com>


Patch:
diff --git a/aqt/cli.py b/aqt/cli.py
index 86b8e20..751252a 100644
--- a/aqt/cli.py
+++ b/aqt/cli.py
@@ -24,8 +24,8 @@ import argparse
 import logging
 import logging.config
 import os
+import platform
 import subprocess
-import sys
 import time
 
 from packaging.version import Version, parse
@@ -168,8 +168,11 @@ class Cli():
     def show_aqt_version(self):
         dist = importlib_metadata.distribution('aqtinstall')
         module_name = dist.entry_points[0].name
-        python_version = sys.version
-        print("aqtinstall({}) {} on Python {}".format(module_name, dist.version, python_version))
+        py_version = platform.python_version()
+        py_impl = platform.python_implementation()
+        py_build = platform.python_compiler()
+        self.logger.info("aqtinstall({}) v{} on Python {} [{} {}]".format(module_name, dist.version,
+                                                                          py_version, py_impl, py_build))
 
     def _create_parser(self):
         parser = argparse.ArgumentParser(prog='aqt', description='Installer for Qt SDK.',
diff --git a/aqt/helper.py b/aqt/helper.py
index 6cfb0bb..0f539b6 100644
--- a/aqt/helper.py
+++ b/aqt/helper.py
@@ -1,51 +1,53 @@
+import logging
+import sys
 import xml.etree.ElementTree as ElementTree
+from typing import List, Optional
 
 import requests
 
 from aqt.settings import Settings
 
 
-def altlink(url, alt, priority=None):
-    '''Download .meta4 metalink version4 xml file and parse it.'''
-    settings = Settings()
-    black = False
-    for site in settings.blacklist:
-        if alt.startswith(site):
-            black = True
-    if not black:
+def _get_meta(url: str):
+    return requests.get(url + '.meta4')
+
+
+def _check_content_type(ct: str) -> bool:
+    candidate = ['application/metalink4+xml', 'text/plain']
+    return any(ct.startswith(t) for t in candidate)
+
+
+def altlink(url: str, alt: str, logger=None):
+    '''Blacklisting redirected(alt) location based on Settings.blacklist configuration.
+     When found black url, then try download a url + .meta4 that is a metalink version4
+     xml file, parse it and retrieve best alternative url.'''
+    if logger is None:
+        logger = logging.getLogger(__name__)
+    blacklist = Settings().blacklist  # type: Optional[List[str]]
+    if blacklist is None or not any(alt.startswith(b) for b in blacklist):
         return alt
-    # specified mirror is black, try select another.
-    mirrors = {}
     try:
-        m = requests.get(url + '.meta4')
+        m = _get_meta(url)
     except requests.exceptions.ConnectionError:
-        return
+        logger.error("Got connection error. Fall back to recovery plan...")
+        return alt
     else:
-        if m.headers['content-type'] == 'application/metalink4+xml':
+        # Expected response->'application/metalink4+xml; charset=utf-8'
+        if not _check_content_type(m.headers['content-type']):
+            logger.error("Unexpected meta4 response;content-type: {}".format(m.headers['content-type']))
+            return alt
+        try:
             mirror_xml = ElementTree.fromstring(m.text)
+            meta_urls = {}
             for f in mirror_xml.iter("{urn:ietf:params:xml:ns:metalink}file"):
                 for u in f.iter("{urn:ietf:params:xml:ns:metalink}url"):
-                    pri = u.attrib['priority']
-                    mirrors[pri] = u.text
-        if len(mirrors) == 0:
-            # there is no valuable data.
+                    meta_urls[u.attrib['priority']] = u.text
+            mirrors = [meta_urls[i] for i in sorted(meta_urls.keys(), key=lambda x: int(x))]
+        except Exception:
+            exc_info = sys.exc_info()
+            logger.error("Unexpected meta4 file; parse error: {}".format(exc_info[1]))
             return alt
-
-    if priority is None:
-        if settings.blacklist is not None:
-            for ind in range(len(mirrors)):
-                mirror = mirrors[str(ind + 1)]
-                black = False
-                for b in settings.blacklist:
-                    if mirror.startswith(b):
-                        black = True
-                        continue
-                if black:
-                    continue
-                return mirror
         else:
-            for ind in range(len(mirrors)):
-                mirror = mirrors[str(ind + 1)]
-                return mirror
-    else:
-        return mirrors[str(priority)]
+            # Return first priority item which is not blacklist in mirrors list,
+            # if not found then return alt in default
+            return next(filter(lambda mirror: not any(mirror.startswith(b) for b in blacklist), mirrors), alt)
diff --git a/aqt/installer.py b/aqt/installer.py
index 13684be..49078e2 100644
--- a/aqt/installer.py
+++ b/aqt/installer.py
@@ -62,7 +62,7 @@ class QtInstaller:
         try:
             r = requests.get(url, allow_redirects=False, stream=True)
             if r.status_code == 302:
-                newurl = altlink(r.url, r.headers['Location'])
+                newurl = altlink(r.url, r.headers['Location'], logger=self.logger)
                 self.logger.info('Redirected to new URL: {}'.format(newurl))
                 r = requests.get(newurl, stream=True)
         except requests.exceptions.ConnectionError as e:


Test patch:
diff --git a/tests/test_connection.py b/tests/test_connection.py
index bc08bce..58919a7 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -1,3 +1,5 @@
+import sys
+
 import pytest
 
 import aqt
@@ -7,7 +9,8 @@ import aqt
 def test_cli_unknown_version(capsys):
     wrong_version = "5.12"
     wrong_url = "https://download.qt.io/online/qtsdkrepository/mac_x64/desktop/qt5_512/Updates.xml"
-    expected = ["aqt - WARNING - Specified Qt version is unknown: {}.".format(wrong_version),
+    expected = ["<<ignore>>",
+                "aqt - WARNING - Specified Qt version is unknown: {}.".format(wrong_version),
                 "aqt - ERROR - Download error when access to {}"
                 " Server response code: 404, reason code: Not Found".format(wrong_url)
                 ]
@@ -17,5 +20,9 @@ def test_cli_unknown_version(capsys):
     assert pytest_wrapped_e.type == SystemExit
     assert pytest_wrapped_e.value.code == 1
     out, err = capsys.readouterr()
+    sys.stdout.write(out)
+    sys.stderr.write(err)
     for i, line in enumerate(out):
+        if i == 0:
+            continue
         assert line.endswith(expected[i])
diff --git a/tests/test_helper.py b/tests/test_helper.py
new file mode 100644
index 0000000..91e950a
--- /dev/null
+++ b/tests/test_helper.py
@@ -0,0 +1,48 @@
+import pytest
+
+from aqt import helper
+
+
+@pytest.mark.unit
+def test_helper_altlink(monkeypatch):
+
+    class Message:
+        headers = {'content-type': 'text/plain',
+             'length': 300,}
+        text = '''<?xml version="1.0" encoding="UTF-8"?>
+<metalink xmlns="urn:ietf:params:xml:ns:metalink">
+  <generator>MirrorBrain/2.17.0</generator>
+  <origin dynamic="true">http://download.example.io/boo.7z.meta4</origin>
+  <published>2020-03-04T01:11:48Z</published>
+  <publisher>
+    <name>Example Project</name>
+    <url>https://download.example.io</url>
+  </publisher>
+
+  <file name="boo.7z">
+    <size>651</size>
+    <hash type="md5">d49eba3937fb063caa48769e8f28377c</hash>
+    <hash type="sha-1">25d3a33d00c1e5880679a17fd4b8b831134cfa6f</hash>
+    <hash type="sha-256">37e50248cf061109e2cb92105cd2c36a6e271701d6d4a72c4e73c6d82aad790a</hash>
+    <pieces length="262144" type="sha-1">
+      <hash>bec628a149ed24a3a9b83747776ecca5a1fad11c</hash>
+      <hash>98b1dee3f741de51167a9428b0560cd2d1f4d945</hash>
+      <hash>8717a0cb3d14c1958de5981635c9b90b146da165</hash>
+      <hash>78cd2ae3ae37ca7c080a56a2b34eb33ec44a9ef1</hash>
+    </pieces>
+    <url location="cn" priority="1">http://mirrors.geekpie.club/boo.7z</url>
+    <url location="jp" priority="2">http://ftp.jaist.ac.jp/pub/boo.7z</url>
+    <url location="jp" priority="3">http://ftp.yz.yamagata-u.ac.jp/pub/boo.7z</url>
+  </file>
+</metalink>
+'''
+
+    def mock_return(url):
+        return Message()
+
+    monkeypatch.setattr(helper, '_get_meta', mock_return)
+
+    url = 'http://foo.baz/qtproject/boo.7z'
+    alt = 'http://mirrors.geekpie.club/boo.7z'
+    newurl = helper.altlink(url, alt)
+    assert newurl.startswith('http://ftp.jaist.ac.jp/')