1.2.0

CompuRacer_Core/src/command_processor.py

@@ -16,12 +16,12 @@
 
 import src.utils as utils
 
-from src.maingui import MainGUI
+from src.connectgui import ConnectGUI
 
-from PyQt5.QtCore import QThread, QObject, pyqtSignal
+from PyQt5.QtCore import QThread, pyqtSignal
 from PyQt5.QtWidgets import QApplication
 
-__version__ = "v1"
+__version__ = "v1.1.0"
 
 class GuiThread(QThread):
     start_gui_signal = pyqtSignal()
@@ -140,7 +140,7 @@ def gui_interpreter(self, state):
         self.print_formatted("Starting GUI " + __version__ + "..", utils.QType.INFORMATION)
         app = QApplication([])
 
-        MainGUI.show_requests_gui(self.racer, app, state, self)
+        ConnectGUI.show_requests_gui(self.racer, app, state, self)
 
     def command_interpreter(self):
         self.welcome_function(self.welcome_function_class)

CompuRacer_Core/src/compu_racer_core.py

@@ -100,7 +100,7 @@ class CompuRacer:
     immediate_batch_name = "Imm"
     progress_bar_width = 100
 
-    def __init__(self, port, proxy, queue, use_only_cli):
+    def __init__(self, port, proxy, queue, cli_check):
         """
         Creates a new CompuRacer instance
         :param queue: the queue to be used when we want to display a filepicker dialog to the user
@@ -110,7 +110,7 @@ def __init__(self, port, proxy, queue, use_only_cli):
         # if the queue is None, we cannot and will not show dialogs
         self.dialog_queue = queue
 
-        self.use_only_cli = use_only_cli
+        self.cli_check = cli_check
 
         # add shutdown hooks
         signal.signal(signal.SIGINT, self.force_shutdown)
@@ -201,7 +201,7 @@ def set_unchanged(self):
         if self.command_processor.is_changed():
             self.command_processor.set_changed(False)
 
-    def start(self, use_only_cli):
+    def start(self, cli_check):
         """
         Starts the CompuRacer
         """
@@ -224,7 +224,7 @@ def start(self, use_only_cli):
         self.print_formatted("Starting command processor..", utils.QType.INFORMATION)
         time.sleep(0.25)
         utils.clear_output()
-        self.command_processor.start(use_only_cli, self, self.state)
+        self.command_processor.start(cli_check, self, self.state)
 
     def comm_general_save(self, do_print=True):
         """
@@ -895,19 +895,19 @@ def comm_requests_remove(self, request_id_first=None, request_id_last=None, ask_
                     self.print_formatted(f"Removal of all requests cancelled.", utils.QType.INFORMATION)
                     return
             elif request_id_last is not None:
-                # remove a range of requests
                 if not ask_confirmation or self.command_processor.accept_yes_no(
                         f"Are you sure you want to remove requests with id between and including {request_id_first} and {request_id_last}?",
                         utils.QType.WARNING):
+                    # remove a range of requests
                     for i, request_id in enumerate(copy.deepcopy(list(self.state['requests'].keys()))):
                         if request_id_first <= request_id <= request_id_last:
                             if self.rem_request(self, request_id, False) == -1:
                                 failed_requests.append(request_id)
                             else:
                                 success_requests.append(request_id)
-                else:
-                    self.print_formatted(f"Removal of range of requests cancelled.", utils.QType.INFORMATION)
-                    return
+                    else:
+                        self.print_formatted(f"Removal of range of requests cancelled.", utils.QType.INFORMATION)
+                        return
             else:
                 # remove one request
                 if self.rem_request(self, request_id_first, True) == -1:
@@ -1062,7 +1062,6 @@ def add_request(self, a_request, used_from_interface=False, print_information=Tr
                         return self.comm_batches_create_new(self, self.immediate_batch_name, False,
                                                                     not used_from_interface,
                                                                     allow_redirects, sync_last_byte, send_timeout)
-
                     immediate_batch = self.state['batches'][self.immediate_batch_name]
                     try:
                         immediate_batch.add(req_id, 0, par, seq, False)
@@ -1107,7 +1106,7 @@ def request_used_in(self, request_id):
         return used_in
 
     @staticmethod  # do not add requests to this list in any other way
-    def rem_request(self, request_id, ask_confirmation=False):
+    def rem_request(self, request_id, ask_confirmation=True):
         with self.requests_list_lock:
             if request_id not in self.state['requests']:
                 self.print_formatted(f"Cannot remove request:\n\t"
@@ -1121,28 +1120,16 @@ def rem_request(self, request_id, ask_confirmation=False):
                                          f"The request with id '{request_id}' is (also) used by the immediate batch!",
                                          utils.QType.ERROR)
                     return -1
-                if not ask_confirmation:
+                if self.cli_check:
                     self.print_formatted(f"The request with id '{request_id}' is used by batches: "
                                          f"{used_in}. It must be removed individually.",
                                          utils.QType.ERROR)
                     return -1
-                # remove request from the batches
-                if not self.command_processor.accept_yes_no(f"The request with id '{request_id}' is used by batches: "
-                                                            f"{used_in}, continue?\n\tIt will be removed from these batches and their results are cleared!!",
-                                                            utils.QType.WARNING):
-                    return -1
-                # remove request from the batches
                 for batch_name in used_in:
                     self.state['batches'][batch_name].remove(request_id)
                 ask_confirmation = False
-
-            if not ask_confirmation or self.command_processor.accept_yes_no(
-                    f"Are you sure you want to remove the request with id '{request_id}'?",
-                    utils.QType.WARNING):
-                self.__change_state('requests', sub_search=request_id, do_delete=True)
-                self.print_formatted(f"Request with id '{request_id}' is removed", utils.QType.INFORMATION)
-            else:
-                self.print_formatted(f"Removal of request cancelled.", utils.QType.INFORMATION)
+            self.__change_state('requests', sub_search=request_id, do_delete=True)
+            self.print_formatted(f"Request with id '{request_id}' is removed", utils.QType.INFORMATION)
 
     # --------------------------------------------------------------------------------------------------- #
     # ------------------------------------- Batch command functions ------------------------------------- #
@@ -1912,21 +1899,23 @@ def comm_curr_remove(self, request_id=None, wait_time=None):
             self.print_formatted(f"Cannot remove a request from current batch: The current batch is empty!",
                                  utils.QType.ERROR)
             return -1
-        if request_id is None:
-            # remove all items from the batch
-            question = "Are you sure you want to remove all requests from the current batch?"
-        elif wait_time is None:
-            # remove all items with a certain ID from the batch
-            question = f"Are you sure you want to remove all requests with id '{request_id}' from the current batch?"
-        else:
-            # remove a specific item with a certain ID and wait_time from the batch
-            question = f"Are you sure you want to remove the request with id '{request_id}' and wait_time '{wait_time}' from the current batch?"
-        if self.command_processor.accept_yes_no(question, utils.QType.WARNING):
-            num_removed = curr_batch.remove(request_id, wait_time)
-            self.print_formatted(f"All matching requests are removed from the current batch.\nNumber: {num_removed}",
-                                 utils.QType.INFORMATION)
-        else:
-            self.print_formatted(f"Removal of current batch requests cancelled.", utils.QType.INFORMATION)
+        if self.cli_check:
+            if request_id is None:
+                # remove all items from the batch
+                question = "Are you sure you want to remove all requests from the current batch?"
+            elif wait_time is None:
+                # remove all items with a certain ID from the batch
+                question = f"Are you sure you want to remove all requests with id '{request_id}' from the current batch?"
+            else:
+                # remove a specific item with a certain ID and wait_time from the batch
+                question = f"Are you sure you want to remove the request with id '{request_id}' and wait_time '{wait_time}' from the current batch?"
+            if self.command_processor.accept_yes_no(question, utils.QType.WARNING):
+                num_removed = curr_batch.remove(request_id, wait_time)
+                self.print_formatted(f"All matching requests are removed from the current batch.\nNumber: {num_removed}",
+                                     utils.QType.INFORMATION)
+        num_removed = curr_batch.remove(request_id, wait_time)
+        self.print_formatted(f"All matching requests are removed from the current batch.\nNumber: {num_removed}",
+                             utils.QType.INFORMATION)
 
     # ------------------------------------------------------------------------------------------------- #
     # ------------------------------------- Main helper functions ------------------------------------- #

CompuRacer_Core/src/maingui.py → CompuRacer_Core/src/connectgui.py

@@ -1,16 +1,16 @@
 import os
 import sys
 
-from src.gui import RequestsGUI
+from src.gui import MainGUI
 
 
-class MainGUI:
+class ConnectGUI:
     def __init__(self, racer):
         super().__init__()
         self.racer = racer
 
     def show_requests_gui(racer, app, state, cmdprocessor):
-        requests_gui = RequestsGUI(racer, state, cmdprocessor)
+        main_gui = MainGUI(racer, state, cmdprocessor)
 
-        requests_gui.show()
+        main_gui.show()
         sys.exit(app.exec_())