Merge pull request #81 from sergeybarkov/master

Добавлена возможность указывать конкретный прокси в командной строке

rosreestr2coord/__main__.py

@@ -1,7 +1,10 @@
 #!/usr/bin/env python
 # coding: utf-8
-from rosreestr2coord.console import console
 
+import sys,os
+sys.path.append(os.getcwd())
+
+from rosreestr2coord.console import console
 
 if __name__ == "__main__":
  console()

rosreestr2coord/console.py

@@ -126,6 +126,14 @@ def getopts():
  required=False,
  help="show current version",
  )
+ parser.add_argument(
+ "-u",
+ "--proxy_url",
+ action="store",
+ type=str,
+ required=False,
+ help="set proxy url",
+ )
  opts = parser.parse_args()
  return opts
 
@@ -142,6 +150,7 @@ def run_console(opt):
  "center_only": opt.center_only if opt.center_only else False,
  "use_cache": False if opt.refresh else True,
  "coord_out": "EPSG:4326",
+ "proxy_url": opt.proxy_url
  }
 
  if opt.list:

rosreestr2coord/parser.py

@@ -100,6 +100,7 @@ def __init__(
  proxy_handler=None,
  timeout=5,
  logger=logger,
+ proxy_url=None
  ):
  self.with_log = with_log
  self.area_type = area_type
@@ -108,6 +109,8 @@ def __init__(
  self.epsilon = epsilon
  self.code = code
 
+ self.proxy_url = proxy_url
+
  self.file_name = code_to_filename(self.code[:])
  self.with_proxy = with_proxy
  self.proxy_handler = proxy_handler
@@ -226,6 +229,7 @@ def make_request(self, url):
  proxy_handler=proxy_handler,
  logger=self.logger,
  timeout=self.timeout,
+ proxy_url=self.proxy_url
  )
  return response
 

rosreestr2coord/utils.py

@@ -41,9 +41,11 @@ def get_rosreestr_headers():
 proxy_handling = ProxyHandling()
 
 
-def make_request(url, with_proxy=False, proxy_handler=None, logger=None, timeout=5):
+def make_request(url, with_proxy=False, proxy_handler=None, logger=None, timeout=5, proxy_url=None):
  if url:
- if with_proxy:
+ if proxy_url is not None:
+ return make_request_with_specified_proxy(url, proxy_url, logger)
+ elif with_proxy:
  proxy_handler = proxy_handler if proxy_handler else proxy_handling
  return make_request_with_proxy(url, proxy_handler, logger, timeout)
  try:
@@ -61,6 +63,21 @@ def make_request(url, with_proxy=False, proxy_handler=None, logger=None, timeout
  raise ValueError("The url is not set")
 
 
+def make_request_with_specified_proxy(url, proxy_url, logger):
+ attempts = 3
+ for i in range(1, attempts + 1):
+ try:
+ ssl._create_default_https_context = ssl._create_unverified_context
+ opener = urllib.request.build_opener(
+ urllib.request.ProxyHandler(
+ {
+ 'http': proxy_url,
+ 'https': proxy_url
+ }))
+ return opener.open(url).read()
+ except:
+ logger.debug("Attempt failed, retry")
+
 def make_request_with_proxy(url, url_proxy, logger, timeout):
  tries_per_proxy = 3
  tries_for_proxies = 20