Upload file

Author: Laurynas Butkus

convertapi/client.py

@@ -14,6 +14,18 @@ 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 upload(self, io, filename):
+		url = convertapi.base_uri + 'upload'
+		encoded_filename = requests.utils.quote(filename)
+
+		headers = self.headers()
+		headers.update({
+			'Content-Disposition': "attachment; filename*=UTF-8''" + encoded_filename,
+		})
+
+		r = requests.post(url, data = io, headers = headers, timeout = convertapi.upload_timeout)
+		return self.handle_response(r)
+
 	def download(self, url, path):
 		r = requests.get(url, stream = True, timeout = convertapi.download_timeout)
 
@@ -25,14 +37,12 @@ def download(self, url, path):
 		return path
 
 	def handle_response(self, r):
-		json = r.json()
-
-		if r.status_code >= 400:
-			raise ConvertApiError(json['Message'])
-
 		r.raise_for_status()
 
-		return json
+		# if r.status_code >= 400:
+		# 	raise ConvertApiError(json['Message'])
+
+		return r.json()
 
 	def url(self, path):
 		return "%s%s?Secret=%s" % (convertapi.base_uri, path, convertapi.api_secret)

convertapi/file_param.py

@@ -0,0 +1,20 @@
+import os
+import convertapi
+
+from .result_file import ResultFile
+
+def build(resource):
+    if isinstance(resource, ResultFile):
+        return resource.url
+
+    if os.path.isfile(resource):
+        return __upload_file(resource)
+
+    return resource
+
+def __upload_file(file):
+    filename = os.path.basename(file)
+
+    with open(file, 'rb') as f:
+        result = convertapi.client.upload(f, filename)
+        return result['FileId']

convertapi/task.py

@@ -1,5 +1,6 @@
 import convertapi
 
+from convertapi import file_param
 from .result import Result
 
 class Task:
@@ -25,6 +26,16 @@ def run(self):
         return Result(response)
 
     def __normalize_params(self):
-        params = self.params.copy()
+        params = {}
+
+        for k, v in self.params.items():
+            if k == 'File':
+                params[k] = file_param.build(v)
+            elif k == 'Files':
+                params[k] = map(file_param.build, v)
+            else:
+                params[k] = v
+
         params.update(self.default_params)
+
         return params

examples/files/test.docx

@@ -16,7 +16,13 @@ def test_configuration(self):
 		convertapi.api_secret = 'TEST'
 		eq_('TEST', convertapi.api_secret)
 
-	def test_convert(self):
+	def test_convert_file(self):
+		result = convertapi.convert('pdf', { 'File': 'examples/files/test.docx' }, 'docx')
+		assert result.save_files(tempfile.gettempdir())
+		assert result.conversion_cost > 0
+
+	def test_convert_url(self):
 		result = convertapi.convert('pdf', { 'Url': 'http://convertapi.com' }, 'web')
-		print(result.save_files(tempfile.gettempdir()))
+		assert result.conversion_cost > 0
+