Add format detector

Author: Laurynas Butkus

convertapi/file_param.py

@@ -1,5 +1,6 @@
 import os
 
+from io import FileIO
 from .result_file import ResultFile
 from .upload_io import UploadIO
 
@@ -10,6 +11,9 @@ def build(resource):
     if isinstance(resource, UploadIO):
         return resource.upload()
 
+    if isinstance(resource, FileIO):
+        return UploadIO(resource).upload()
+
     if os.path.isfile(resource):
         io = open(resource, 'rb')
         return UploadIO(io).upload()

convertapi/format_detector.py

@@ -0,0 +1,13 @@
+from os.path import splitext
+from io import FileIO
+from requests import utils
+
+def detect(resource):
+    if 'filename' in dir(resource):
+        path = resource.filename
+    elif isinstance(resource, FileIO):
+        path = resource.name
+    else:
+        path = utils.urlparse(resource).path
+
+    return splitext(path)[1][1:].lower()

convertapi/task.py

@@ -1,8 +1,10 @@
 import convertapi
 
-from convertapi import file_param
+from convertapi import file_param, format_detector
 from .result import Result
 
+DEFAULT_URL_FORMAT = 'url'
+
 class Task:
     def __init__(self, from_format, to_format, params, conversion_timeout = None):
         self.from_format = from_format
@@ -17,7 +19,7 @@ def __init__(self, from_format, to_format, params, conversion_timeout = None):
 
     def run(self):
         params = self.__normalize_params()
-        from_format = self.from_format
+        from_format = self.from_format or self.__detect_format()
         timeout = self.conversion_timeout + convertapi.conversion_timeout_delta
         path = "convert/%s/to/%s" % (from_format, self.to_format)
 
@@ -38,4 +40,14 @@ def __normalize_params(self):
 
         params.update(self.default_params)
 
-        return params
+        return params
+
+    def __detect_format(self):
+        if 'Url' in self.params:
+            return DEFAULT_URL_FORMAT
+
+        if 'File' in self.params:
+            return format_detector.detect(self.params['File'])
+
+        if 'Files' in self.params:
+            return format_detector.detect(self.params['Files'][0])

tests/test_convertapi.py

@@ -18,16 +18,16 @@ def test_configuration(self):
 		eq_('TEST', convertapi.api_secret)
 
 	def test_convert_file(self):
-		result = convertapi.convert('pdf', { 'File': 'examples/files/test.docx' }, 'docx')
+		result = convertapi.convert('pdf', { 'File': 'examples/files/test.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')
+		result = convertapi.convert('pdf', { 'Url': 'http://convertapi.com' })
 		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')
+		result = convertapi.convert('pdf', { 'File': upload_io })
 		assert result.conversion_cost > 0