post3

DriveDownloader/downloader.py

@@ -9,6 +9,10 @@
 import os
 import sys
 __version__ = "1.5.0"
+url_scheme_env_key_map = {
+        "http": "http_proxy",
+        "https": "https_proxy",
+}
 
 def parse_args():
     parser = argparse.ArgumentParser(description='Drive Downloader Args')
@@ -19,21 +23,19 @@ def parse_args():
     args = parser.parse_args()
     return args
 
+def get_env(key):
+    value = os.environ.get(key)
+    if not value or len(value) == 0:
+        return None
+    return value
+
 def download_single_file(url, filename="", thread_number=1):
     scheme = judge_scheme(url)
-    if scheme == 'http':
-        if len(os.environ["http_proxy"]) > 0:
-            proxy = os.environ["http_proxy"]
-        else:
-            proxy = None
-    elif scheme == 'https':
-        if len(os.environ["https_proxy"]) > 0:
-            proxy = os.environ["https_proxy"]
-        else:
-            proxy = None
-    else:
+    if scheme not in url_scheme_env_key_map.keys():
         raise NotImplementedError(f"Unsupported scheme {scheme}")
-    used_proxy = proxy
+    env_key = url_scheme_env_key_map[scheme]
+    used_proxy = get_env(env_key)
+
     session_name = judge_session(url)
     session_func = get_session(session_name)
     if session_name == 'GoogleDrive' and thread_number > 1:

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 setup(
     name = "DriveDownloader",
-    version = "1.5.0.post2",
+    version = "1.5.0.post3",
     keywords = ("drivedownloader", "drive", "netdrive", "download"),
     description = "A Python netdrive downloader.",
     long_description = "A Python netdrive downloader.",