Merge branch 'main' into ISSUE_324

Author: giohappy

src/qgis_geonode/network.py

@@ -232,6 +232,16 @@ def build_multipart(
         )
         part.setBody("false".encode("utf-8"))
         multipart.append(part)
+
+    # Add action=upload
+    action_part = QtNetwork.QHttpPart()
+    action_part.setHeader(
+        QtNetwork.QNetworkRequest.ContentDispositionHeader,
+        'form-data; name="action"',
+    )
+    action_part.setBody("upload".encode("utf-8"))
+    multipart.append(action_part)
+
     permissions_part = QtNetwork.QHttpPart()
     permissions_part.setHeader(
         QtNetwork.QNetworkRequest.ContentDispositionHeader,

src/qgis_geonode/tasks/network_task.py

@@ -16,7 +16,7 @@ class NetworkRequestTask(qgis.core.QgsTask):
     requests_to_perform: typing.List[network.RequestToPerform]
     response_contents: typing.List[typing.Optional[network.ParsedNetworkReply]]
     _num_finished: int
-    _pending_replies: typing.Dict[int, typing.Tuple[int, QtNetwork.QNetworkReply]]
+    _pending_replies: typing.Dict[int, network.PendingReply]
 
     _all_requests_finished = QtCore.pyqtSignal()
     task_done = QtCore.pyqtSignal(bool)
@@ -176,11 +176,11 @@ def _handle_request_timed_out(
     ) -> None:
         log(f"Request with id: {request_params.requestId()} has timed out")
         try:
-            index, qt_reply = self._pending_replies[request_params.requestId()]
+            pending_reply = self._pending_replies[request_params.requestId()]
         except KeyError:
             pass  # we are not managing this request, ignore
         else:
-            self.response_contents[index] = None
+            self.response_contents[pending_reply.index] = None
             self._num_finished += 1
             if self._num_finished >= len(self.requests_to_perform):
                 self._all_requests_finished.emit()