Optimize from data parameters.

Author: roywangaspose

asposecellscloud/api_client.py

@@ -471,14 +471,21 @@ def prepare_post_parameters(self, post_params=None, files=None):
             for k, v in iteritems(files):
                 if not v:
                     continue
-                file_names = v if type(v) is list else [v]
-                for n in file_names:
-                    with open(n, 'rb') as f:
-                        filename = os.path.basename(f.name)
-                        filedata = f.read()
-                        mimetype = mimetypes.\
-                            guess_type(filename)[0] or 'application/octet-stream'
-                        params.append(tuple([k, tuple([filename, filedata, mimetype])]))
+                # print(v)
+                print(k)
+                if isinstance(v,bytes) :
+                    print("bytes")
+                    mimetype = mimetypes. guess_type(k)[0] or 'application/octet-stream'
+                    params.append(tuple([k, tuple([k, v, mimetype])]))
+                else:
+                    file_names = v if type(v) is list else [v]
+                    for n in file_names:
+                        with open(n, 'rb') as f:
+                            filename = os.path.basename(f.name)
+                            filedata = f.read()
+                            mimetype = mimetypes.\
+                                guess_type(filename)[0] or 'application/octet-stream'
+                            params.append(tuple([k, tuple([filename, filedata, mimetype])]))
 
         return params
 

asposecellscloud/requests/put_convert_workbook_request.py

@@ -25,6 +25,7 @@
 """
 
 import json
+import os
 
 from six import iteritems
 from asposecellscloud import *
@@ -87,10 +88,13 @@ def create_http_request(self, api_client):
         local_var_files = {}
         if self.file is not None:            
             if isinstance(self.file,dict):
-                for filename , filecontext in  self.file.items():
+                for filename, filecontext in self.file.items():
                     local_var_files[filename] = filecontext
             else:
-                local_var_files['File'] = self.file   
+                if isinstance(self.file,bytes):
+                    local_var_files['File'] = self.file
+                else:
+                    local_var_files[os.path.basename(self.file)] = self.file
 
         body_params = None
         # HTTP header `Accept`

test/tests_one.py

@@ -3,7 +3,7 @@
 from __future__ import absolute_import
 
 import os
-    import shutil
+import shutil
 import sys
 import time
 import unittest
@@ -32,44 +32,61 @@ def test_one_case(self):
         remote_folder = 'TestData/In'
 
 
-        local_name = 'ExampleData.xlsx'
-        remote_name = 'ExampleData.xlsx'
-
-        mapFiles = { 
-            local_name:  "../TestData/" + local_name             
-        }
-        request =  UploadFileRequest( mapFiles, remote_folder + '/' + remote_name,storage_name= '')
-        self.api.upload_file(request)
-
-        image_or_print_options =  ImageOrPrintOptions(one_page_per_sheet= True)
-        page_setup = PageSetup( black_and_white= True, bottom_margin=0,left_margin=0,top_margin=0,right_margin=0,print_headings= False )
-        range_operate_source = Range(column_count= 28 ,first_column= 1 ,first_row= 1 ,row_count= 42 )
-
-        range_convert = RangeConvertRequest(source= range_operate_source ,image_or_print_options= image_or_print_options ,page_setup= page_setup , image_type= 'Png' )
-
-        request =  PostWorksheetCellsRangeToImageRequest( remote_name, 'Retention Analysis', range_convert,folder= remote_folder,storage_name= '')
-        print(request.name)
-        response = self.api.post_worksheet_cells_range_to_image(request)
-        print(response)
-        # os.rename(response, 'ExampleData.png')
-        shutil.move(response, 'ExampleData.png')
+        local_name = 'Book1.xlsx'
+        remote_name = 'Book1.xlsx'
+
+        with open("../TestData/" + local_name, 'rb') as f:
+            filename = os.path.basename(f.name)
+            filedata = f.read()
+            request = PutConvertWorkbookRequest({filename:filedata}, format='pdf')
+            response = self.api.put_convert_workbook(request)
+            shutil.move(response, 'ExampleData3.pdf')
+
+        # with open("../TestData/" + local_name, 'rb') as f:
+        #     filename = os.path.basename(f.name)
+        #     filedata = f.read()
+        #     request = PutConvertWorkbookRequest(filedata, format='pdf')
+        #     response = self.api.put_convert_workbook(request)
+        #     shutil.move(response, 'ExampleData3.pdf')
+
+        # mapFiles = {
+        #     local_name:  "../TestData/" + local_name
+        # }
+        # request = PutConvertWorkbookRequest(mapFiles, format= 'pdf')
+
+
+        # request = PutConvertWorkbookRequest("../TestData/" + local_name, format='pdf')
+        # response = self.api.put_convert_workbook(request)
+        # shutil.move(response, 'ExampleData2.pdf')
+        # request =  UploadFileRequest( mapFiles, remote_folder + '/' + remote_name,storage_name= '')
+        # self.api.upload_file(request)
+        #
+        # image_or_print_options =  ImageOrPrintOptions(one_page_per_sheet= True)
+        # page_setup = PageSetup( black_and_white= True, bottom_margin=0,left_margin=0,top_margin=0,right_margin=0,print_headings= False )
+        # range_operate_source = Range(column_count= 28 ,first_column= 1 ,first_row= 1 ,row_count= 42 )
+        #
+        # range_convert = RangeConvertRequest(source= range_operate_source ,image_or_print_options= image_or_print_options ,page_setup= page_setup , image_type= 'Png' )
+        #
+        # request =  PostWorksheetCellsRangeToImageRequest( remote_name, 'Retention Analysis', range_convert,folder= remote_folder,storage_name= '')
+        # print(request.name)
+        # response = self.api.post_worksheet_cells_range_to_image(request)
+        # print(response)
+        # # os.rename(response, 'ExampleData.png')
+        # shutil.move(response, 'ExampleData.png')
         # source_name = 'Book1.xlsx'
         # target_name = 'myDocument.xlsx'
 
         # source_name = 'Book1.xlsx'
         # result = AuthUtil.Ready(self.api, source_name, remote_folder + '/' + source_name ,  '')
         # self.assertTrue(len(result.uploaded)>0) 
 
-
-
         # rangeOperateSource = Range(column_count= 3 ,first_column= 8 ,first_row= 4 ,row_count= 2, worksheet="Sheet1" )
         # rangeOperateTarget = Range(column_count= 3 ,first_column= 1,first_row= 1 ,row_count= 2 , worksheet="Sheet4")
         # rangeOperate = RangeCopyRequest(operate= 'CopyTo' ,source= rangeOperateSource ,target= rangeOperateTarget,target_workbook = remote_folder + '/' + target_name )
 
         # request =  PostWorksheetCellsRangesCopyRequest( source_name, 'Sheet1', rangeOperate,   folder= remote_folder,storage_name= '')
         # self.api.post_worksheet_cells_ranges_copy(request)        
 
-
         # remote_folder = 'TestData/In'
 
         # local_name = 'TestCase.xlsx'