Convert url and save result

Author: Laurynas Butkus

convertapi/__init__.py

@@ -3,6 +3,7 @@
 from .exceptions import *
 from .configuration import Configuration
 from .client import Client
+from .api import convert
 
 configuration = Configuration()
 client = Client(configuration)

convertapi/api.py

@@ -0,0 +1,5 @@
+from .task import Task
+
+def convert(to_format, params, from_format = None, conversion_timeout = None):
+    task = Task(from_format, to_format, params, conversion_timeout = conversion_timeout)
+    return task.run()

convertapi/client.py

@@ -6,14 +6,24 @@ class Client:
 	def __init__(self, configuration):
 		self.configuration = configuration
 
-	def get(self, path, params = {}):
-		r = requests.get(self.url(path), params=params, headers = self.headers())
+	def get(self, path, params = {}, timeout = None):
+		r = requests.get(self.url(path), params = params, headers = self.headers(), timeout = timeout)
 		return self.handle_response(r)
 
-	def post(self, path, payload):
-		r = requests.post(self.url(path), json=payload, headers = self.headers())
+	def post(self, path, payload, timeout = None):
+		r = requests.post(self.url(path), data = payload, headers = self.headers(), timeout = timeout)
 		return self.handle_response(r)
 
+	def download(self, url, path):
+		r = requests.get(url, stream = True, timeout = self.configuration.download_timeout)
+
+		with open(path, 'wb') as f:
+			for chunk in r.iter_content(chunk_size = 1024):
+				if chunk:
+					f.write(chunk)
+
+		return path
+
 	def handle_response(self, r):
 		json = r.json()
 
@@ -25,7 +35,7 @@ def handle_response(self, r):
 		return json
 
 	def url(self, path):
-		return "%s/%s?Secret=%s" % (self.configuration.base_uri, path, self.configuration.api_secret)
+		return "%s%s?Secret=%s" % (self.configuration.base_uri, path, self.configuration.api_secret)
 
 	def headers(self):
 		return {

convertapi/configuration.py

@@ -4,8 +4,7 @@ class Configuration:
 	api_secret = None
 	base_uri = 'https://v2.convertapi.com/'
 	user_agent = 'ConvertAPI-Python/' + convertapi.__version__
-	connect_timeout = 5
-	read_timeout = 60
+	timeout = 60
 	conversion_timeout = 180
 	conversion_timeout_delta = 10
 	upload_timeout = 600

convertapi/result.py

@@ -0,0 +1,20 @@
+from .result_file import ResultFile
+
+class Result:
+    def __init__(self, response):
+        self.response = response
+
+    @property
+    def conversion_cost(self):
+        return self.response['ConversionCost']
+
+    @property
+    def file(self):
+        return self.files[0]
+
+    @property
+    def files(self):
+        return map(ResultFile, self.response['Files'])
+
+    def save_files(self, path):
+        return [file.save(path) for file in self.files]

convertapi/result_file.py

@@ -0,0 +1,24 @@
+import convertapi
+import os
+
+class ResultFile:
+    def __init__(self, info):
+        self.info = info
+
+    @property
+    def url(self):
+        return self.info['Url']
+
+    @property
+    def filename(self):
+        return self.info['FileName']
+
+    @property
+    def size(self):
+        return self.info['FileSize']
+
+    def save(self, path):
+        if os.path.isdir(path):
+            path = os.path.join(path, self.filename)
+
+        return convertapi.client.download(self.url, path)

convertapi/task.py

@@ -0,0 +1,30 @@
+import convertapi
+
+from .result import Result
+
+class Task:
+    def __init__(self, from_format, to_format, params, conversion_timeout = None):
+        self.from_format = from_format
+        self.to_format = to_format
+        self.params = params
+        self.conversion_timeout = conversion_timeout or convertapi.configuration.conversion_timeout
+
+        self.default_params = {
+            'Timeout': self.conversion_timeout,
+            'StoreFile': True,
+        }
+
+    def run(self):
+        params = self.__normalize_params()
+        from_format = self.from_format
+        timeout = self.conversion_timeout + convertapi.configuration.conversion_timeout_delta
+        path = "convert/%s/to/%s" % (from_format, self.to_format)
+
+        response = convertapi.client.post(path, params, timeout = timeout)
+
+        return Result(response)
+
+    def __normalize_params(self):
+        params = self.params.copy()
+        params.update(self.default_params)
+        return params

tests/test_convertapi.py

@@ -1,11 +1,22 @@
+import convertapi
+import os
+import tempfile
+
 from . import utils
 from nose.tools import eq_
-import convertapi
 
 class TestConvertapi(utils.TestCase):
-	def testDefaults(self):
+	def setUp(self):
+		convertapi.configuration.api_secret = os.environ['CONVERT_API_SECRET']
+
+	def test_defaults(self):
 		eq_('https://v2.convertapi.com/', convertapi.configuration.base_uri)
 
-	def testConfiguration(self):
+	def test_configuration(self):
 		convertapi.configuration.api_secret = 'TEST'
-		eq_('TEST', convertapi.client.configuration.api_secret)
+		eq_('TEST', convertapi.client.configuration.api_secret)
+
+	def test_convert(self):
+		result = convertapi.convert('pdf', { 'Url': 'http://convertapi.com' }, 'web')
+		print(result.save_files(tempfile.gettempdir()))
+