Merge branch 'team-matchmaking' into tmm

Gatsik · Feb 13, 2021 · f082841 · f082841
2 parents 1ece1c9 + e4b02d0
commit f082841
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/fa/maps.py b/src/fa/maps.py
@@ -415,9 +415,10 @@ def downloadMap(name, silent=False):
     link = name2link(name)
     ret, msg = _doDownloadMap(name, link, silent)
     if not ret:
-        name = name.replace(" ", "_")
-        link = name2link(name)
-        ret, msg = _doDownloadMap(name, link, silent)
+        if msg is None:
+            name = name.replace(" ", "_")
+            link = name2link(name)
+            ret, msg = _doDownloadMap(name, link, silent)
         if not ret:
             msg()
             return ret

diff --git a/src/news/wpapi.py b/src/news/wpapi.py
@@ -55,4 +55,5 @@ def finishedDownload(self, reply):
     def download(self, page=1, perpage=10):
         url = QtCore.QUrl(WPAPI_ROOT.format(page=page, perpage=perpage))
         request = QNetworkRequest(url)
+        request.setAttribute(QNetworkRequest.FollowRedirectsAttribute, True)
         self.nam.get(request)
diff --git a/src/vault/dialogs.py b/src/vault/dialogs.py
@@ -92,6 +92,10 @@ def downloadVaultAssetNoMsg(url, target_dir, exist_handler, name, category,
 
     if result == VaultDownloadDialog.CANCELED:
         logger.warning("{} Download canceled for: {}".format(capitCat, url))
+        msg = lambda: QtWidgets.QMessageBox.information(
+            None,
+            "{} has not been downloaded".format(capitCat),
+            ("{} download has been cancelled.".format(capitCat)))
     if result in [VaultDownloadDialog.DL_ERROR, VaultDownloadDialog.UNKNOWN_ERROR]:
         logger.warning("Vault download failed, {} probably not in vault (or broken).".format(category))
         msg = lambda: QtWidgets.QMessageBox.information(