Remove ShutdownRequest class; add Request.cancellable attribute

src/tribler/gui/core_manager.py

@@ -8,13 +8,13 @@
 from typing import Optional
 
 from PyQt5.QtCore import QObject, QProcess, QProcessEnvironment, QTimer
+from PyQt5.QtNetwork import QNetworkRequest
 
 from tribler.core.utilities.process_manager import ProcessManager
 from tribler.gui import gui_sentry_reporter
 from tribler.gui.app_manager import AppManager
 from tribler.gui.event_request_manager import EventRequestManager
 from tribler.gui.exceptions import CoreConnectTimeoutError, CoreCrashedError
-from tribler.gui.network.request.shutdown_request import ShutdownRequest
 from tribler.gui.network.request_manager import request_manager
 from tribler.gui.utilities import connect
 
@@ -238,8 +238,9 @@ def send_shutdown_request(initial=False):
                 else:
                     self._logger.warning("Re-sending shutdown request to Tribler Core")
 
-                request = ShutdownRequest(shutdown_request_processed)
-                request_manager.add(request)
+                request = request_manager.put("shutdown", shutdown_request_processed,
+                                              priority=QNetworkRequest.HighPriority)
+                request.cancellable = False
 
             send_shutdown_request(initial=True)
 

src/tribler/gui/network/request/request.py

@@ -67,6 +67,7 @@ def __init__(
 
         self.time = time()
         self.status_code = 0
+        self.cancellable = True
 
     def set_manager(self, manager: RequestManager):
         self.manager = manager

src/tribler/gui/network/request_manager.py

@@ -12,7 +12,6 @@
 from tribler.gui.defs import BUTTON_TYPE_NORMAL, DEFAULT_API_HOST, DEFAULT_API_PORT, DEFAULT_API_PROTOCOL
 from tribler.gui.dialogs.confirmationdialog import ConfirmationDialog
 from tribler.gui.network.request.request import Request
-from tribler.gui.network.request.shutdown_request import ShutdownRequest
 from tribler.gui.utilities import connect
 
 
@@ -173,11 +172,10 @@ def get_message_from_error(d: Dict) -> str:
 
         return json.dumps(d)
 
-    def clear(self, skip_shutdown_request=True):
-        for req in list(self.active_requests):
-            if skip_shutdown_request and isinstance(req, ShutdownRequest):
-                continue
-            req.cancel()
+    def clear(self):
+        for request in list(self.active_requests):
+            if request.cancellable:
+                request.cancel()
 
     def _drop_timed_out_requests(self):
         for req in list(self.active_requests):