Skip to content

Commit

Permalink
Fix downloading multiple files
Browse files Browse the repository at this point in the history
  • Loading branch information
suricactus committed Mar 25, 2021
1 parent 923af3f commit 5c6a87d
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions qfieldsync/core/cloud_transferrer.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def __init__(self, network_manager: CloudNetworkAccessManager, cloud_project: Cl
self.is_delete_active = False
self.is_project_list_update_active = False
self.replies = []
self.redirects_data = []
self.redirects_data = {}
self.redirects = []
self.temp_dir = Path(cloud_project.local_dir).joinpath('.qfieldsync')

Expand Down Expand Up @@ -205,11 +205,11 @@ def _download(self) -> None:

def on_redirected_wrapper(reply: QNetworkReply, filename: str, temp_filename: str) -> Callable:
def on_redirected(url: QUrl) -> None:
reply.abort()
self.redirects_data[reply] = [url, filename, temp_filename]

self.redirects_data.append([url, filename, temp_filename])
reply.abort()

if len(self.redirects) != len(self._files_to_download):
if len(self.redirects_data) != len(self._files_to_download):
return

self._request_redirects()
Expand All @@ -218,6 +218,10 @@ def on_redirected(url: QUrl) -> None:

def on_finished_wrapper(reply: QNetworkReply, filename: str) -> Callable:
def on_finished() -> None:
# it has been redirected
if self.redirects_data.get(reply):
return

try:
self.network_manager.handle_response(reply, False)
except Exception as err:
Expand All @@ -237,7 +241,7 @@ def on_finished() -> None:


def _request_redirects(self):
for url, filename, temp_filename in self.redirects_data:
for url, filename, temp_filename in self.redirects_data.values():
reply = self.network_manager.get(url, str(temp_filename))
reply.downloadProgress.connect(self._on_download_file_progress_wrapper(reply, filename))
reply.finished.connect(self._on_download_file_finished_wrapper(reply, filename, temp_filename))
Expand Down

0 comments on commit 5c6a87d

Please sign in to comment.