switched from urllib to requests

Author: tikuma-lsuhsc

setup.cfg

@@ -29,6 +29,7 @@ package_dir=
     =src
 packages=ffmpeg_downloader
 install_requires =
+    requests
     tqdm
     # patool;platform_system!='Linux'
     # pylzma

src/ffmpeg_downloader/_download_helper.py

@@ -1,48 +1,38 @@
-from urllib import request
-from contextlib import contextmanager
-import os, stat, ssl
+import os, stat
+import requests
 
-ctx = ssl.create_default_context()
-ctx.check_hostname = False
-ctx.verify_mode = ssl.CERT_NONE
 
-
-@contextmanager
-def download_base(url, content_type, timeout=None):
-    with request.urlopen(url, timeout=timeout or 5.0, context=ctx) as response:
-        # pprint(response.headers.get_content_type())
-        if response.headers.get_content_type() != content_type:
-            raise RuntimeError(f'"{url}" is not the expected content type.')
-        try:
-            nbytes = int(response.getheader("content-length"))
-        except:
-            nbytes = 0
-        yield response, nbytes
+def download_base(url, content_type, timeout=None, stream=True):
+    response = requests.get(url, timeout=timeout, stream=stream)
+    if response.headers.get("content-type", "text/plain") != content_type:
+        raise RuntimeError(f'"{url}" is not the expected content type.')
+    return response
 
 
 def download_info(url, content_type, timeout=None):
-    with download_base(url, content_type, timeout) as (response, nbytes):
-        info = response.read().decode("utf-8")
-    return info
+    response = download_base(url, content_type, timeout, stream=False)
+    return response.text
 
 
 def download_file(outfile, url, content_type, progress=None, timeout=None):
 
-    with download_base(url, content_type, timeout) as (response, nbytes):
-        if progress:
-            progress(0, nbytes)
-
-        blksz = nbytes // 32 or 1024 * 1024
-        with open(outfile, "wb") as f:
-            nread = 0
-            while True:
-                b = response.read(blksz)
-                if not b:
-                    break
-                f.write(b)
-                nread += len(b)
-                if progress:
-                    progress(nread, nbytes)
+    response = download_base(url, content_type, timeout)
+
+    nbytes = int(response.headers["Content-Length"])
+
+    if progress:
+        progress(0, nbytes)
+
+    blksz = nbytes // 32 or 1024 * 1024
+    with open(outfile, "wb") as f:
+        nread = 0
+        for b in response.iter_content(chunk_size=blksz):
+            if not b:
+                break
+            f.write(b)
+            nread += len(b)
+            if progress:
+                progress(nread, nbytes)
 
     return nbytes
 

src/ffmpeg_downloader/_linux.py

@@ -1,6 +1,6 @@
 from tempfile import TemporaryDirectory
 from ._download_helper import download_info, download_file, chmod
-import re, ssl, tarfile, os, shutil
+import re, tarfile, os, shutil
 from os import path
 
 home_url = "https://johnvansickle.com/ffmpeg"

src/ffmpeg_downloader/_macos.py

@@ -17,11 +17,10 @@ def download_n_install(install_dir, progress=None):
     ntotal = 0
 
     def get_nbytes(cmd):
-        with download_base(f"{home_url}/getrelease/{cmd}/zip", "application/zip") as (
-            _,
-            nbytes,
-        ):
-            return nbytes
+        response = download_base(f"{home_url}/getrelease/{cmd}/zip", "application/zip")
+        nbytes = int(response.headers["content-length"])
+        response.close()
+        return nbytes
 
     nfiles = [get_nbytes(cmd) for cmd in ("ffmpeg", "ffprobe")]
     ntotal = sum(nfiles)

tests/_test_downloads.py

@@ -0,0 +1,12 @@
+from ffmpeg_downloader import _win32, _macos, _linux
+import tempfile,os
+
+with tempfile.TemporaryDirectory() as dir:
+
+    for mod in (_win32,_macos,_linux):
+        mname = mod.__name__
+        dstdir = os.path.join(dir,mname)
+        os.mkdir(dstdir)
+        print(dstdir)
+        print(mod.get_version())
+        mod.download_n_install(dstdir)