More generic implementation for --proxy-file (accepting public lists format)

stamparm · stamparm · commit 1c92d8d51f9e · 2014-04-06T17:23:13.000+02:00
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -47,6 +47,7 @@
 from lib.core.common import paths
 from lib.core.common import randomRange
 from lib.core.common import randomStr
+from lib.core.common import readCachedFileContent
 from lib.core.common import readInput
 from lib.core.common import resetCookieJar
 from lib.core.common import runningAsAdmin
@@ -1947,7 +1948,10 @@ def _setProxyList():
     if not conf.proxyFile:
         return
 
-    conf.proxyList = getFileItems(conf.proxyFile)
+    conf.proxyList = []
+    for match in re.finditer(r"(?i)((http[^:]*|socks[^:]*)://)?([\w.]+):(\d+)", readCachedFileContent(conf.proxyFile)):
+        _, type_, address, port = match.groups()
+        conf.proxyList.append("%s://%s:%s" % (type_ or "http", address, port))
 
 def _setTorProxySettings():
     if not conf.tor:
