Merge pull request #4 from ConvertAPI/feature/format_detection

Use format from upload result

Author: laurynas-convertapi

convertapi/format_detector.py

@@ -2,9 +2,12 @@
 from io import FileIO
 from requests import utils
 from .result import Result
+from .upload_io import UploadIO
 
 def detect(resource):
-    if 'filename' in dir(resource):
+    if isinstance(resource, UploadIO):
+        return resource.file_ext
+    elif 'filename' in dir(resource):
         path = resource.filename
     elif isinstance(resource, FileIO):
         path = resource.name

convertapi/upload_io.py

@@ -5,25 +5,28 @@ class UploadIO:
     def __init__(self, io, filename = None):
         self.io = io
         self._filename = filename
-        self._file_id = None
+        self._result = None
 
     @property
     def file_id(self):
-        if self._file_id is None:
-            self._file_id = self.__upload()
+        return self.__result['FileId']
 
-        return self._file_id
+    @property
+    def file_ext(self):
+        return self.__result['FileExt']
 
     @property
-    def filename(self):
+    def __result(self):
+        if self._result is None:
+            self._result = convertapi.client.upload(self.io, self.__build_filename())
+
+        return self._result
+
+    def __build_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'
-
-    def __upload(self):
-        result = convertapi.client.upload(self.io, self.filename)
-        return result['FileId']

tests/test_convertapi.py

@@ -23,6 +23,10 @@ def test_convert_file(self):
 		assert result.save_files(tempfile.gettempdir())
 		assert result.conversion_cost > 0
 
+	def test_convert_file_url(self):
+		result = convertapi.convert('pdf', { 'File': 'https://cdn.convertapi.com/cara/testfiles/document.docx?test=1' })
+		assert result.conversion_cost > 0
+
 	def test_convert_url(self):
 		result = convertapi.convert('pdf', { 'Url': 'http://convertapi.com' })
 		assert result.conversion_cost > 0