feat: Реализовал изменение параметров игры и исправил сортировку игр в списке

Author: JustDev-oper

db.py

@@ -129,6 +129,32 @@ def edit_games_category(self, category_id_old, category_id_new):
         finally:
             conn.close()
 
+    def check_category_id_is_valid(self):
+        conn = self.get_connection()
+        cursor = conn.cursor()
+        try:
+            cursor.execute("SELECT id FROM Categories")
+            valid_category_ids = {row[0] for row in cursor.fetchall()}
+
+            cursor.execute(
+                "SELECT id, name, category_id FROM Games WHERE category_id NOT IN ({})".format(
+                    ','.join('?' for _ in valid_category_ids)
+                ), list(valid_category_ids))
+
+            invalid_games = cursor.fetchall()
+
+            for game_id, game_name, old_category_id in invalid_games:
+                cursor.execute(
+                    "UPDATE Games SET category_id = ? WHERE id = ?",
+                    (1, game_id)
+                )
+
+            conn.commit()
+        except Exception as e:
+            print(f"Ошибка при проверке категорий: {e}")
+        finally:
+            conn.close()
+
     def get_categories(self):
         conn = self.get_connection()
         cursor = conn.cursor()
@@ -186,5 +212,20 @@ def get_game(self, name):
         conn.close()
         return row
 
+    def update_game(self, old_name, new_name, category_id):
+        conn = self.get_connection()
+        cursor = conn.cursor()
+        try:
+            cursor.execute(
+                "UPDATE Games SET name = ?, category_id = ? WHERE name = ?",
+                (new_name, category_id, old_name),
+            )
+            conn.commit()
+        except Exception as e:
+            print(str(e))
+
+        finally:
+            conn.close()
+
 
 database = Database()

dialogs.py

@@ -4,6 +4,7 @@
 from ui.add_game_dialog import Ui_Dialog as AddGameUI
 from ui.createCategory import Ui_Dialog as AddCategoryUI
 from ui.deleteCategory import Ui_Dialog as DeleteCategoryUI
+from ui.edit_game_dialog_ui import Ui_Dialog as EditGameUI
 
 
 class AddGameDialog(QDialog, AddGameUI):
@@ -72,6 +73,73 @@ def accept_dialog(self):
                                  f"Не удалось добавить игру: {str(e)}")
 
 
+class EditGameDialog(QDialog, EditGameUI):
+    def __init__(self, game_name):
+        super().__init__()
+        self.orig_game_name = game_name
+        self.setFixedSize(450, 180)
+
+        self.setupUi(self)
+
+        self.buttonBox.accepted.disconnect()
+        self.buttonBox.rejected.disconnect()
+
+        self.get_categories()
+        self.load_game_data()
+
+        self.path_button.setDisabled(True)
+
+        self.buttonBox.accepted.connect(self.accept_dialog)
+        self.buttonBox.rejected.connect(self.reject)
+
+    def get_categories(self):
+        combobox = self.comboBox
+        categories = database.get_categories()
+        for category in categories:
+            combobox.addItem(category[0])
+
+    def load_game_data(self):
+        game_data = database.get_game(self.orig_game_name)
+        if game_data:
+            self.game_name.setText(game_data[1])  # name
+            self.file_path.setText(game_data[2])  # path
+
+            # Устанавливаем правильную категорию
+            category_name = database.get_category_name_by_id(game_data[3])
+            index = self.comboBox.findText(category_name)
+            if index >= 0:
+                self.comboBox.setCurrentIndex(index)
+
+    def accept_dialog(self):
+        new_game_name = self.game_name.text().strip()
+        category_id = database.get_category_id_by_name(
+            self.comboBox.currentText())
+
+        if not new_game_name:
+            QMessageBox.warning(self, "Ошибка", "Введите название игры")
+            return
+
+        if not category_id:
+            category_id = 1
+
+        # Проверяем уникальность имени, только если имя изменилось
+        if new_game_name != self.orig_game_name and not database.check_name_is_unique(
+                new_game_name):
+            QMessageBox.warning(self, "Ошибка",
+                                "Игра с таким именем уже существует")
+            return
+
+        try:
+            database.update_game(self.orig_game_name, new_game_name,
+                                 category_id)
+            self.accept()
+            QMessageBox.information(self, "Успех", "Игра обновлена!")
+
+        except Exception as e:
+            QMessageBox.critical(self, "Ошибка",
+                                 f"Не удалось обновить игру: {str(e)}")
+
+
 class AddCategoryDialog(QDialog, AddCategoryUI):
     def __init__(self):
         super().__init__()

main.py

@@ -11,7 +11,6 @@
 
 
 def resource_path(relative_path: str) -> str:
-    """Корректный путь к файлу для работы из .py и из .exe"""
     if hasattr(sys, "_MEIPASS"):
         return os.path.join(sys._MEIPASS, relative_path)
     return os.path.join(os.path.abspath("."), relative_path)
@@ -30,6 +29,8 @@ def __init__(self):
 
         self.update_menu_bar()
 
+        database.check_category_id_is_valid()
+
         theme_file = resource_path(f"style/{json_editor.get_theme()}.qss")
         with open(theme_file, "r", encoding="utf-8") as qss:
             self.setStyleSheet(qss.read())
@@ -47,6 +48,7 @@ def __init__(self):
         self.delete_category.triggered.connect(
             lambda: self.open_dialog("delete_category")
         )
+        self.edit_game.clicked.connect(lambda: self.open_dialog("edit_game"))
 
     def set_theme(self, theme):
         theme_file = resource_path(f"style/{theme}.qss")
@@ -67,11 +69,15 @@ def update_last_game_list(self):
             self.last_games.addItem(game)
 
     def sort_games(self, mode):
-        games = database.get_games()
-        sorted_games = sorted(games, reverse=(mode == "r"))
+        items = []
+        for i in range(self.list_games.count()):
+            items.append(self.list_games.item(i).text())
+
+        sorted_items = sorted(items, reverse=(mode == "r"))
+
         self.list_games.clear()
-        for game in sorted_games:
-            self.list_games.addItem(game)
+        for game_name in sorted_items:
+            self.list_games.addItem(game_name)
 
     def delete_game_from_list(self):
         current_item = self.list_games.currentItem()
@@ -104,6 +110,13 @@ def open_dialog(self, dialog):
             _dialog = dialogs.DeleteCategoryDialog()
             _dialog.exec()
             self.update_menu_bar()
+        if dialog == "edit_game":
+            current_item = self.list_games.currentItem()
+            if current_item:
+                game_name = current_item.text()
+                _dialog = dialogs.EditGameDialog(game_name)
+                _dialog.exec()
+                self.update_game_list()
 
     def update_menu_bar(self):
         menu = self.menu_3