Merge pull request #289 from beliaev-maksim/beliaev_args_upload

added possibility to specify args for upload report functions

Author: vgrem

examples/sharepoint/files/upload_large_file.py

@@ -6,8 +6,8 @@
 from office365.sharepoint.client_context import ClientContext
 
 
-def print_upload_progress(offset):
-    print("Uploaded '{0}' bytes...".format(offset))
+def print_upload_progress(offset, total_size):
+    print("Uploaded '{}' bytes from '{}'...[{}%]".format(offset, total_size, round(offset/total_size*100, 2)))
 
 
 credentials = UserCredential(settings['user_credentials']['username'],
@@ -18,7 +18,7 @@ def print_upload_progress(offset):
 target_folder = ctx.web.get_folder_by_server_relative_url(target_url)
 size_chunk = 1000000
 local_path = "../../../tests/data/big_buck_bunny.mp4"
-# local_path = "../../../tests/data/SharePoint User Guide.docx"
+
 file_size = os.path.getsize(local_path)
 
 if file_size > size_chunk:

office365/sharepoint/actions/upload_session.py

@@ -25,7 +25,7 @@ def _create_empty_file(path):
 
 
 class UploadSessionQuery(CreateFileQuery):
-    def __init__(self, files, source_path, chunk_size, chunk_uploaded):
+    def __init__(self, files, source_path, chunk_size, chunk_uploaded, chunk_func_args):
         """
 
         :type files: office365.sharepoint.files.file_collection.FileCollection
@@ -39,6 +39,7 @@ def __init__(self, files, source_path, chunk_size, chunk_uploaded):
         self._upload_id = str(uuid.uuid4())
         self._source_path = source_path
         self._chunk_uploaded = chunk_uploaded
+        self._chunk_func_args = chunk_func_args
         self._uploaded_bytes = 0
         self._upload_results = []
         self.file.context.after_execute(self._build_upload_session_query)
@@ -70,7 +71,7 @@ def _process_chunk_upload(self, resp):
             self.file.context.after_execute(self._process_chunk_upload)
         elif isinstance(self._return_type, File):
             self._uploaded_bytes = qry.return_type.length
-        self._chunk_uploaded(self._uploaded_bytes)
+        self._chunk_uploaded(self._uploaded_bytes, *self._chunk_func_args)
 
     @property
     def file(self):

office365/sharepoint/files/file_collection.py

@@ -19,15 +19,16 @@ def get(self):
         """
         return super(FileCollection, self).get()
 
-    def create_upload_session(self, source_path, chunk_size, chunk_uploaded=None):
+    def create_upload_session(self, source_path, chunk_size, chunk_uploaded=None, *chunk_func_args):
         """Upload a file as multiple chunks
 
         :param str source_path: path where file to upload resides
         :param int chunk_size: upload chunk size
         :param (long)->None or None chunk_uploaded: uploaded event
+        :param chunk_func_args: arguments to pass to chunk_uploaded function
         :return: office365.sharepoint.files.file.File
         """
-        qry = UploadSessionQuery(self, source_path, chunk_size, chunk_uploaded)
+        qry = UploadSessionQuery(self, source_path, chunk_size, chunk_uploaded, chunk_func_args)
         self.context.add_query(qry)
         return qry.file