Add upload IO

Author: Laurynas Butkus

convertapi/__init__.py

@@ -2,6 +2,7 @@
 
 from .exceptions import *
 from .client import Client
+from .upload_io import UploadIO
 from .api import convert
 
 # configuration

convertapi/file_param.py

@@ -1,20 +1,17 @@
 import os
-import convertapi
 
 from .result_file import ResultFile
+from .upload_io import UploadIO
 
 def build(resource):
     if isinstance(resource, ResultFile):
         return resource.url
 
+    if isinstance(resource, UploadIO):
+        return resource.upload()
+
     if os.path.isfile(resource):
-        return __upload_file(resource)
+        io = open(resource, 'rb')
+        return UploadIO(io).upload()
 
     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/upload_io.py

@@ -0,0 +1,21 @@
+import convertapi
+import os.path
+
+class UploadIO:
+    def __init__(self, io, filename = None):
+        self.io = io
+        self.__filename = filename
+
+    def upload(self):
+        result = convertapi.client.upload(self.io, self.filename)
+        return result['FileId']
+
+    @property
+    def filename(self):
+        if self.__filename:
+            return self.__filename
+
+        if 'name' in dir(self.io):
+            return os.path.basename(self.io.name)
+
+        raise 'Filename must be provided for non File resources'

tests/test_convertapi.py

@@ -1,5 +1,6 @@
 import convertapi
 import os
+import io
 import tempfile
 
 from . import utils
@@ -25,4 +26,8 @@ def test_convert_url(self):
 		result = convertapi.convert('pdf', { 'Url': 'http://convertapi.com' }, 'web')
 		assert result.conversion_cost > 0
 
-
+	def test_upload_io(self):
+		string_io = io.StringIO(u'test')
+		upload_io = convertapi.UploadIO(string_io, 'test.txt')
+		result = convertapi.convert('pdf', { 'File': upload_io }, 'txt')
+		assert result.conversion_cost > 0