increased timeout limits

Author: varmar05

mergin/client.py

@@ -396,7 +396,7 @@ def download_project(self, project_path, directory, parallel=True):
                 for future in concurrent.futures.as_completed(futures_map):
                     file = futures_map[future]
                     try:
-                        future.result(60)
+                        future.result(600)
                     except concurrent.futures.TimeoutError:
                         raise ClientError("Timeout error: failed to download {}".format(file))
         else:
@@ -454,7 +454,7 @@ def push_project(self, directory, parallel=True):
                     for future in concurrent.futures.as_completed(futures_map):
                         file = futures_map[future]
                         try:
-                            future.result(60)
+                            future.result(600)
                         except concurrent.futures.TimeoutError:
                             raise ClientError("Timeout error: failed to upload {}".format(file))
             else:
@@ -521,13 +521,13 @@ def backup_if_conflict(path, checksum):
                 with concurrent.futures.ThreadPoolExecutor() as executor:
                     futures_map = {}
                     for file in fetch_files:
-                        future = executor.submit(project_path, server_info['version'], file, temp_dir, parallel)
+                        future = executor.submit(self._download_file, project_path, server_info['version'], file, temp_dir, parallel)
                         futures_map[future] = file
 
                     for future in concurrent.futures.as_completed(futures_map):
                         file = futures_map[future]
                         try:
-                            future.result(60)
+                            future.result(600)
                         except concurrent.futures.TimeoutError:
                             raise ClientError("Timeout error: failed to download {}".format(file))
                         src = os.path.join(temp_dir, file["path"])
@@ -596,7 +596,7 @@ def download_file_part(part):
                 for future in concurrent.futures.as_completed(futures_map):
                     i = futures_map[future]
                     try:
-                        future.result(60)
+                        future.result(300)
                     except concurrent.futures.TimeoutError:
                         raise ClientError('Timeout error: failed to download part {} of file {}'.format(i, basename))
         else:
@@ -658,7 +658,7 @@ def upload_chunk(chunk_id, data):
                     for future in concurrent.futures.as_completed(futures_map):
                         chunk = futures_map[future]
                         try:
-                            future.result(60)
+                            future.result(300)
                         except concurrent.futures.TimeoutError:
                             raise ClientError('Timeout error: failed to upload chunk {}'.format(chunk))
             else: