Merge pull request #29 from 2captcha/1.1.1

v1.1.1

Author: 2captcha

README.md

@@ -90,6 +90,8 @@ Below you can find basic examples for every captcha type. Check out [examples di
 To bypass a normal captcha (distorted text on image) use the following method. This method also can be used to recognize any text on the image.
 ```python 
 result = solver.normal('path/to/captcha.jpg', param1=..., ...)
+# OR
+result = solver.normal('https://site-with-captcha.com/path/to/captcha.jpg', param1=..., ...)
 ```
 
 ### Text Captcha

setup.py

@@ -1,13 +1,19 @@
 #!/usr/bin/env python3
 
 from setuptools import setup, find_packages
-from twocaptcha import __version__
+import re
 
 with open("README.md", "r") as fh:
     long_description = fh.read()
 
+
+def get_version():
+    with open('twocaptcha/__init__.py', 'r') as f:
+        return re.search(r'__version__ = ["\'](.*?)["\']', f.read()).group(1)
+
+
 setup(name='2captcha-python',
-      version=__version__,
+      version=get_version(),
       description='Python module for easy integration with 2Captcha API',
       long_description=long_description,
       long_description_content_type="text/markdown",

twocaptcha/__init__.py

@@ -2,4 +2,4 @@
 from .solver import (TwoCaptcha, SolverExceptions, ValidationException,
                      NetworkException, ApiException, TimeoutException)
 
-__version__ = '1.1.0'
+__version__ = '1.1.1'

twocaptcha/solver.py

@@ -2,6 +2,7 @@
 
 import os, sys
 import time
+import requests
 
 try:
     from .api import ApiClient
@@ -55,7 +56,7 @@ def normal(self, file, **kwargs):
         Wrapper for solving normal captcha (image)
         
         Required:
-            file                (image or base64)
+            file                (image, base64, or url)
 
         Optional params:
 
@@ -432,6 +433,12 @@ def get_method(self, file):
 
         if not '.' in file and len(file) > 50:
             return {'method': 'base64', 'body': file}
+        
+        if file.startswith('http'):
+            img_resp = requests.get(file)
+            if img_resp.status_code != 200:
+                raise ValidationException(f'File could not be downloaded from url: {file}')
+            return {'method': 'base64', 'body': b64encode(img_resp.content).decode('utf-8')}
 
         if not os.path.exists(file):
             raise ValidationException(f'File not found: {file}')