From 362539bbda643e9a86f0af572284aa29596c4f0d Mon Sep 17 00:00:00 2001
From: Max Zhao <mdcw1103@gmail.com>
Date: Mon, 3 Aug 2020 22:57:24 +0800
Subject: [PATCH] add socks5h proxy support

---
 ADC_function.py | 5 +++--
 config.ini      | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ADC_function.py b/ADC_function.py
index 44707cf..df10283 100755
--- a/ADC_function.py
+++ b/ADC_function.py
@@ -3,6 +3,7 @@ from lxml import etree
 
 import config
 
+SUPPORT_PROXY_TYPE = ("http", "socks5", "socks5h")
 
 def get_data_state(data: dict) -> bool:  # 元数据获取失败检测
     if "title" not in data or "number" not in data:
@@ -27,8 +28,8 @@ def get_proxy(proxy: str, proxytype: str = None) -> dict:
     ''' 获得代理参数，默认http代理
     '''
     if proxy:
-        if proxytype.startswith("socks"):
-            proxies = {"http": "socks5://" + proxy, "https": "socks5://" + proxy}
+        if proxytype in SUPPORT_PROXY_TYPE:
+            proxies = {"http": proxytype + "://" + proxy, "https": proxytype + "://" + proxy}
         else:
             proxies = {"http": "http://" + proxy, "https": "https://" + proxy}
     else:
diff --git a/config.ini b/config.ini
index 3d908d3..c4186c7 100644
--- a/config.ini
+++ b/config.ini
@@ -5,7 +5,7 @@ success_output_folder=JAV_output
 soft_link=0
 
 [proxy]
-;proxytype: http or socks5
+;proxytype: http or socks5 or socks5h
 type=http
 proxy=127.0.0.1:1080
 timeout=10